.

bot/services/mikopbx_service.py

@@ -45,39 +45,23 @@ class MikoPBXService:
         session = await self._get_session()
         url = f"{self.host}{endpoint}"
         headers = self._get_auth_headers()
+        method = method.upper()
 
         logger.info(f"\n{'='*70}")
-        logger.info(f">>> REQUEST: {method.upper()} {url}")
+        logger.info(f">>> REQUEST: {method} {url}")
         if params:
             logger.info(f">>> PARAMS: {params}")
         if json_data:
             logger.info(f">>> BODY:\n{json.dumps(json_data, indent=2, ensure_ascii=False)}")
 
         try:
-            if method.upper() == "GET":
-                async with session.get(url, params=params, headers=headers) as resp:
-                    text = await resp.text()
-                    logger.info(f"<<< RESPONSE [{resp.status}]:\n{text[:3000]}")
-                    try:
-                        return await resp.json()
-                    except:
-                        return {"result": False, "raw": text}
-            elif method.upper() == "DELETE":
-                async with session.delete(url, headers=headers) as resp:
-                    text = await resp.text()
-                    logger.info(f"<<< RESPONSE [{resp.status}]:\n{text[:3000]}")
-                    try:
-                        return await resp.json()
-                    except:
-                        return {"result": False, "raw": text}
-            else:
-                async with session.post(url, json=json_data, headers=headers) as resp:
-                    text = await resp.text()
-                    logger.info(f"<<< RESPONSE [{resp.status}]:\n{text[:3000]}")
-                    try:
-                        return await resp.json()
-                    except:
-                        return {"result": False, "raw": text}
+            async with session.request(method, url, params=params, json=json_data, headers=headers) as resp:
+                text = await resp.text()
+                logger.info(f"<<< RESPONSE [{resp.status}]:\n{text[:3000]}")
+                try:
+                    return await resp.json()
+                except:
+                    return {"result": False, "raw": text}
         except Exception as e:
             logger.error(f"!!! REQUEST ERROR: {e}")
             return {"result": False, "messages": [str(e)]}
@@ -91,6 +75,14 @@ class MikoPBXService:
         """
         logger.info(f"\n>>> Creating employee/extension {number} via /v3/employees ...")
 
+        # Check if number already exists in MikoPBX
+        existing = await self.get_employee_by_number(number)
+        if existing:
+            return {
+                "success": False,
+                "error": [f"Internal number {number} is already occupied"]
+            }
+
         payload = {
             "number": number,
             "user_username": username or f"User {number}",
@@ -129,6 +121,13 @@ class MikoPBXService:
                 "error": error
             }
 
+    def _extract_employee_id(self, employee: Dict) -> Optional[str]:
+        """Extract and validate employee ID for URL usage (v3 expects string id)."""
+        emp_id = employee.get("id")
+        if emp_id is None or emp_id == "":
+            return None
+        return str(emp_id)
+
     async def get_employee_by_number(self, number: str) -> Optional[Dict]:
         """Get employee record by extension number (returns full record with real 'id')"""
         # Get list and search by number
@@ -146,12 +145,29 @@ class MikoPBXService:
         """Get employee by number"""
         return await self.get_employee_by_number(number)
 
+    async def get_full_employee(self, employee_id) -> Optional[Dict]:
+        """Get full employee record by ID (used for PUT updates)"""
+        response = await self._make_request("GET", f"/pbxcore/api/v3/employees/{employee_id}")
+        if response.get("result") and response.get("data"):
+            data = response.get("data")
+            if isinstance(data, dict):
+                return data
+        return None
+
     async def set_extension_secret(self, number: str, new_secret: str) -> Dict[str, Any]:
         current = await self.get_employee_by_number(number)
         if not current:
             return {"success": False, "error": "Extension not found"}
 
-        real_id = current.get("id")
+        real_id = self._extract_employee_id(current)
+        if not real_id:
+            return {"success": False, "error": "Employee ID is missing"}
+
+        # Try to get full employee record to avoid overwriting fields
+        full_current = await self.get_full_employee(real_id)
+        if full_current:
+            current = full_current
+
         current["sip_secret"] = new_secret
 
         response = await self._make_request(
@@ -161,13 +177,55 @@ class MikoPBXService:
         )
         return {"success": response.get("result", False), "messages": response.get("messages", [])}
 
+    async def change_extension_number(self, old_number: str, new_number: str) -> Dict[str, Any]:
+        """
+        Change employee extension number in MikoPBX.
+        Finds the employee by old number, updates the number field and sends PUT.
+        """
+        current = await self.get_employee_by_number(old_number)
+        if not current:
+            return {"success": False, "error": f"Extension {old_number} not found in MikoPBX"}
+
+        # Check if the new number is already occupied
+        existing_new = await self.get_employee_by_number(new_number)
+        if existing_new:
+            return {"success": False, "error": f"Number {new_number} is already occupied in MikoPBX"}
+
+        real_id = self._extract_employee_id(current)
+        if not real_id:
+            return {"success": False, "error": "Employee ID is missing"}
+
+        # Try to get full employee record to avoid overwriting fields
+        full_current = await self.get_full_employee(real_id)
+        if full_current:
+            current = full_current
+
+        current["number"] = new_number
+
+        response = await self._make_request(
+            "PUT",
+            f"/pbxcore/api/v3/employees/{real_id}",
+            json_data=current
+        )
+
+        if response.get("result"):
+            logger.info(f">>> SUCCESS: Number changed from {old_number} to {new_number}")
+            return {"success": True, "data": response.get("data", {})}
+        else:
+            error = response.get("messages") or response.get("error") or ["Unknown error"]
+            logger.error(f">>> Failed to change number: {error}")
+            return {"success": False, "error": error}
+
     async def delete_extension(self, number: str) -> Dict[str, Any]:
         """Delete employee by extension number (finds real ID first)"""
         employee = await self.get_employee_by_number(number)
         if not employee:
             return {"success": False, "error": "Employee not found"}
 
-        real_id = employee.get("id")
+        real_id = self._extract_employee_id(employee)
+        if not real_id:
+            return {"success": False, "error": "Employee ID is missing"}
+
         logger.info(f">>> Deleting employee with real ID: {real_id}")
 
         response = await self._make_request(