feat(ommsync): improve user and device handling

A ommclient2 update allows deleting users which resolves conflicts plus some general improvements

Author: TilCreator

services/dect-wip-ommsync/dect-wip-ommsync.py

@@ -19,68 +19,64 @@
 
 @app.route('/connect/', methods=['POST'])
 def connect():
-
-    print('obtaining lock')
     with lock:
-        print('lock obtained')
-
         req_json = request.get_json()
 
         user_extension = requests.get(f"http://{config.dect_wip_internal_ip}:{config.dect_wip_port}/api/v1/GetUserExtensionByToken/{req_json['token']}").json()
 
         extension = user_extension['extension']
         password = user_extension['password']
         displayname = user_extension['name']
-    
+
+        # TODO get temp_extension from omm
         temp_extenison = requests.get(f"http://{config.dect_wip_internal_ip}:{config.dect_wip_port}/api/v1/GetTempExtensionByCallerid/{req_json['callerid']}").json()
-    
-        ppn = temp_extenison['ppn']
-        uid = temp_extenison['uid']
-    
-        print(ppn)
-        print(uid)
-    
-        client.detach_user_device(uid,ppn)
-    
-        newuser = client.create_user(extension)
-        client.set_user_sipauth(newuser.uid, extension, password)
-        client.set_user_name(newuser.uid, displayname)
-        
-        print(client.attach_user_device(int(newuser.uid), ppn))
-        # no implemented in current ommclient ...
-        #client.delete_user(uid)
-    
+
+        # deletes existing users with the same extension
+        # this also detaches the (dynamically linked) device
+        for user in client.find_users(lambda user: user.num == extension):
+            print(f"deleting uid {user.uid} (duplicate of extension {extension})")
+            client.delete_user(user.uid)
+
+        new_user = client.create_user(extension)
+        client.set_user_sipauth(new_user.uid, extension, password)
+        client.set_user_name(new_user.uid, displayname)
+
+        print(f"detaching ppn {temp_extenison['ppn']} from uid {temp_extenison['uid']}")
+        client.detach_user_device(temp_extenison['uid'], temp_extenison['ppn'])
+
+        print(f"deleting uid {temp_extenison['uid']}")
+        client.delete_user(temp_extenison['uid'])
+
+        print(f"attaching ppn {temp_extenison['ppn']} to uid {new_user.uid}, extension {extension}")
+        client.attach_user_device(int(new_user.uid), temp_extenison['ppn'])
+
         response = make_response(jsonify( {"message": "extension added"}), 200)
     return response
 
 @scheduler.task('interval', id='makeTemps', seconds=5, next_run_time=datetime.now(), max_instances=1)
 def makeTemps():
-    print("lets go")
-
-    print('obtaining lock')
     with lock:
-        print('lock obtained')
-    
         for device in list(client.find_devices(lambda d: d.relType == mitel_ommclient2.types.PPRelTypeType("Unbound"))):
             extension = 't_' + namegenerator.generate_name() + utilities.getRandomNumber(4)
             password = utilities.getRandomStr(20)
-    
+
             newuser = client.create_user(extension)
             client.set_user_sipauth(newuser.uid, extension, password)
             client.set_user_name(newuser.uid, extension[2:21])
             client.attach_user_device(int(newuser.uid), int(device.ppn))
-    
+
             data = {
                 "extension": extension,
                 "password": password,
                 "uid": newuser.uid,
                 "ppn": device.ppn
             }
 
-            print(data)
-    
+            print("new temp extension created", data)
+
             response = requests.post(f"http://{config.dect_wip_internal_ip}:{config.dect_wip_port}/api/v1/AddTempExtensionToDB", json=data)
-            print(response.text)
+            if response.status_code != 200:
+                raise RuntimeError(f"adding temp extension to db failed: {response.status_code} {response.text}")
 
 def init(config_path):