add manage domain function

backend/app/tests/conftest.py

@@ -43,7 +43,7 @@ def test_client(test_db):
         yield test_client
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture(scope="session")
 def test_user(test_db):
     password ="test"
     user = models.User(
@@ -131,6 +131,11 @@ def test_domain(test_db,login_user_id):
         ownerid = login_user_id
     )
     test_db.add(domain)
+    test_db.flush()
+    user_domain = models.UserDomain(userid = login_user_id, domainid = domain.id ,createuserid = login_user_id,updateuserid = login_user_id)
+    test_db.add(user_domain)
+    manage_domain = models.ManageDomain(userid = login_user_id, domainid = domain.id ,createuserid = login_user_id,updateuserid = login_user_id)
+    test_db.add(manage_domain)
     test_db.commit()
     test_db.refresh(domain)
     return domain

backend/app/tests/test_domain.py

@@ -20,8 +20,9 @@ def test_create_domain(test_client, login_user,login_user_id):
                     "is_active": True,
                 }
     response = test_client.post("/api/domain", json=create_domain,headers={"Authorization": "Bearer " + login_user})
-    assert response.status_code == 200
     data = response.json()
+    logging.error(data)
+    assert response.status_code == 200
     assert "data" in data
     assert data["data"] is not None
     assert data["data"]["name"] == create_domain["name"]
@@ -29,8 +30,63 @@ def test_create_domain(test_client, login_user,login_user_id):
     assert data["data"]["kintoneuser"] == create_domain["kintoneuser"]
     assert data["data"]["is_active"] == create_domain["is_active"]
     assert data["data"]["owner"]["id"] == login_user_id
-    
-def test_delete_domain(test_client, login_user):
+
+
+def test_get_managedomainuser(test_client,test_domain,login_user,login_user_id):
+    response = test_client.get("/api/managedomainuser/" + str(test_domain.id),headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)  
+    assert response.status_code == 200
+    assert "data" in data
+    assert len(data["data"]) == 1
+    assert data["data"][0]["id"] == login_user_id
+
+
+def test_add_delete_userdomain(test_client,test_domain,test_user,login_user,login_user_id):
+    userdomain ={
+        "userid":test_user["id"],
+        "domainid":test_domain.id
+    }
+    response = test_client.post("/api/userdomain" , json=userdomain,headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)  
+    assert response.status_code == 200
+    assert "data" in data
+    assert data["data"] is not None
+    assert data["data"]["name"] == test_domain.name
+    assert data["data"]["url"] == test_domain.url
+    response = test_client.delete(f"/api/domain/{test_domain.id}/{test_user["id"]}" , headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)
+    assert "data" in data
+    assert data["data"] is not None
+    assert data["data"]["name"] == test_domain.name
+    assert data["data"]["url"] == test_domain.url
+
+
+def test_add_delete_managedomain(test_client,test_domain,test_user,login_user,login_user_id):
+    userdomain ={
+        "userid":test_user["id"],
+        "domainid":test_domain.id
+    }
+    response = test_client.post("/api/managedomain" , json=userdomain,headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)  
+    assert response.status_code == 200
+    assert "data" in data
+    assert data["data"] is not None
+    assert data["data"]["name"] == test_domain.name
+    assert data["data"]["url"] == test_domain.url
+    response = test_client.delete(f"/api/managedomain/{test_domain.id}/{test_user["id"]}" , headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)
+    assert "data" in data
+    assert data["data"] is not None
+    assert data["data"]["name"] == test_domain.name
+    assert data["data"]["url"] == test_domain.url
+
+
+def test_delete_domain(test_client, login_user,login_user_id):
     delete_domain ={
                     "id": 0,
                     "tenantid": "1",
@@ -41,15 +97,22 @@ def test_delete_domain(test_client, login_user):
                     "is_active": True,
                 }
     response = test_client.post("/api/domain", json=delete_domain,headers={"Authorization": "Bearer " + login_user})
-    assert response.status_code == 200
     data = response.json()
+    assert response.status_code == 200
     assert "data" in data
     assert data["data"] is not None
     id =  data["data"]["id"]
-    response = test_client.delete("/api/domain/"+ str(id),headers={"Authorization": "Bearer " + login_user})
+
+    response = test_client.delete(f"/api/domain/{id}/{login_user_id}",headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)
+
+    response = test_client.delete(f"/api/domain/{id}",headers={"Authorization": "Bearer " + login_user})
+    data = response.json()
+    logging.error(data)
     assert response.status_code == 200
     assert response.json()["data"]["name"] == delete_domain["name"]
-    response = test_client.get("/api/domain/"+ str(id), headers={"Authorization": "Bearer " + login_user})
+    response = test_client.get(f"/api/domain/{id}", headers={"Authorization": "Bearer " + login_user})
     assert response.status_code == 200
     assert "data" not in response.json()
 
@@ -83,8 +146,9 @@ def test_get_defaultuserdomain(test_client, test_domain,login_user):
 
 def test_get_domainshareduser(test_client, test_domain,login_user,login_user_id):
     response = test_client.get("/api/domainshareduser/"+str(test_domain.id), headers={"Authorization": "Bearer " + login_user})
-    assert response.status_code == 200
     data = response.json()
+    logging.error(data)
+    assert response.status_code == 200
     assert "data" in data
     assert data["data"] is not None
     assert len(data["data"]) == 1

backend/app/tests/test_user.py

@@ -16,7 +16,7 @@ def test_users_list_for_admin(test_client,login_admin):
 
 def test_user_create(test_client,login_user):
     user_data = {
-        "email": "newuser@example.com",
+        "email": "newuser1@example.com",
         "password": "password123",
         "first_name": "New",
         "last_name": "User",
@@ -37,7 +37,7 @@ def test_user_create(test_client,login_user):
    
 def test_admin_create(test_client,login_user):
     user_data = {
-        "email": "newuser@example.com",
+        "email": "newuser2@example.com",
         "password": "password123",
         "first_name": "New",
         "last_name": "User",