Merge pull request #25 from kang2453/master

refactor: remove project_id references and update workspace handling

src/spaceone/file_manager/interface/rest/file.py

@@ -229,14 +229,14 @@ def get_download_url(self, response: dict ) -> str:
         elif resource_group == "DOMAIN":
             domain_id = response["domain_id"]
             download_url = "/files/domain/" + domain_id + "/" + file_id
-        elif resource_group == "WORKSPACE":
+        elif resource_group == "WORKSPACE" or resource_group == "PROJECT":
             domain_id = response["domain_id"]
             workspace_id = response["workspace_id"]
             download_url = "/files/domain/" + domain_id + "/workspace/" + workspace_id + "/" + file_id
-        elif resource_group == "PROJECT":
-            domain_id = response["domain_id"]
-            project_id = response["project_id"]
-            download_url = "/files/domain/" + domain_id + "/project/"+ project_id + "/" +  file_id
+        # elif resource_group == "PROJECT":
+        #     domain_id = response["domain_id"]
+        #     project_id = response["project_id"]
+        #     download_url = "/files/domain/" + domain_id + "/workspace/" + workspace_id + "/project/"+ project_id + "/" +  file_id
         else:
             raise ERROR_NOT_SUPPORTED_RESOURCE_GROUP(resource_group=resource_group)
 

src/spaceone/file_manager/manager/file_manager.py

@@ -42,7 +42,6 @@ def get_file(
         file_id: str,
         domain_id: str = None,
         workspace_id: str = None,
-        project_id: str = None,
     ) -> File:
         conditions = {"file_id": file_id}
 
@@ -52,9 +51,6 @@ def get_file(
         if workspace_id:
             conditions["workspace_id"] = workspace_id
 
-        if project_id:
-            conditions["project_id"] = project_id
-
         return self.file_model.get(**conditions)
 
     def filter_files(self, **conditions) -> QuerySet:

src/spaceone/file_manager/manager/identity_manager.py

@@ -22,13 +22,13 @@ def check_workspace(self, workspace_id, domain_id):
             token=system_token,
         )
 
-    def check_project(self, project_id, domain_id):
-        system_token = config.get_global("TOKEN")
-        return self.identity_connector.dispatch(
-            "Project.check",
-            {"project_id": project_id, "domain_id": domain_id},
-            token=system_token,
-        )
+    # def check_project(self, project_id, domain_id):
+    #     system_token = config.get_global("TOKEN")
+    #     return self.identity_connector.dispatch(
+    #         "Project.check",
+    #         {"project_id": project_id, "domain_id": domain_id},
+    #         token=system_token,
+    #     )
 
     # def check_user(self, user_id, domain_id):
     #     system_token = config.get_global("TOKEN")

src/spaceone/file_manager/model/file/database.py

@@ -16,6 +16,7 @@ def to_dict(self):
 
 class File(MongoModel):
     file_id = StringField(max_length=40, generate_id="file", unique=True)
+    file_type = StringField(max_length=40, null=True, default=None)
     name = StringField(max_length=255, required=True)
     download_url = StringField(null=True, default=None)
     tags = DictField()
@@ -25,7 +26,6 @@ class File(MongoModel):
     )
     workspace_id = StringField(max_length=40, null=True, default=None)
     domain_id = StringField(max_length=40, null=True, default=None)
-    project_id =   StringField(max_length=40, null=True, default=None)
     created_at = DateTimeField(auto_now_add=True)
 
     meta = {
@@ -37,7 +37,6 @@ class File(MongoModel):
             "resource_group",
             "workspace_id",
             "domain_id",
-            "project_id",
         ],
         "change_query_keys": {
             "resource_type": "reference.resource_type",
@@ -50,7 +49,6 @@ class File(MongoModel):
             "reference.resource_id",
             "resource_group",
             "workspace_id",
-            "project_id",
             "domain_id",
         ],
     }

src/spaceone/file_manager/model/file/request.py

@@ -21,7 +21,6 @@ class FileAddRequest(BaseModel):
     resource_group: ResourceGroup
     domain_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
-    project_id: Union[str, None] = None
 
 
 class FileUpdateRequest(BaseModel):
@@ -30,22 +29,19 @@ class FileUpdateRequest(BaseModel):
     tags: Union[dict, None] = None
     domain_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
-    project_id: Union[str, None] = None
     download_url: Union[str, None] = None
 
 
 class FileDeleteRequest(BaseModel):
     file_id: str
     domain_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
-    project_id: Union[str, None] = None
 
 
 class FileGetRequest(BaseModel):
     file_id: str
     domain_id: Union[list, str, None] = None
     workspace_id: Union[list, str, None] = None
-    project_id: Union[list, str, None] = None
 
 
 class FileSearchQueryRequest(BaseModel):
@@ -56,11 +52,9 @@ class FileSearchQueryRequest(BaseModel):
     resource_id: Union[str, None] = None
     domain_id: Union[list, str, None] = None
     workspace_id: Union[list, str, None] = None
-    project_id: Union[list, str, None] = None
 
 
 class FileStatQueryRequest(BaseModel):
     query: dict
     domain_id: Union[list, str, None] = None
     workspace_id: Union[list, str, None] = None
-    project_id: Union[list, str, None] = None

src/spaceone/file_manager/model/file/response.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 from typing import Union, List
+
 from pydantic import BaseModel
 
 from spaceone.core import utils
@@ -10,14 +11,14 @@
 
 class FileResponse(BaseModel):
     file_id: Union[str, None] = None
+    file_type: Union[str, None] = None
     name: Union[str, None] = None
     download_url: Union[str, None] = None
     reference: Union[dict, None] = None
     tags: Union[dict, None] = None
     resource_group: Union[ResourceGroup, None] = None
     domain_id: Union[str, None] = None
     workspace_id: Union[str, None] = None
-    project_id: Union[str, None] = None
     created_at: Union[datetime, None] = None
 
     def dict(self, *args, **kwargs):

src/spaceone/file_manager/service/file_service.py

@@ -45,7 +45,6 @@ def add(self, params: FileAddRequest) -> Union[FileResponse, dict]:
                 'name': 'str',              # required
                 'reference': 'dict',
                 'tags': 'dict',
-                'project_id': 'str',
                 'workspace_id': 'str',      # injected from auth
                 'domain_id': 'str'          # injected from auth
             }
@@ -108,7 +107,6 @@ def update(self, params: FileUpdateRequest) -> Union[FileResponse, dict]:
             params.file_id,
             params.domain_id,
             params.workspace_id,
-            params.project_id,
         )
 
         file_vo = self.file_mgr.update_file_by_vo(
@@ -133,7 +131,6 @@ def delete(self, params: FileDeleteRequest) -> None:
         Args:
             params (FileDeleteRequest): {
                 'file_id': 'str',           # required
-                'project_id': 'str',
                 'workspace_id': 'str',      # injected from auth
                 'domain_id': 'str'          # injected from auth
             }
@@ -146,7 +143,6 @@ def delete(self, params: FileDeleteRequest) -> None:
             params.file_id,
             params.domain_id,
             params.workspace_id,
-            params.project_id,
         )
         try:
 
@@ -187,7 +183,6 @@ def get(self, params: FileGetRequest) -> Union[FileResponse, dict]:
             params.file_id,
             params.domain_id,
             params.workspace_id,
-            params.project_id,
         )
 
         return FileResponse(**file_vo.to_dict())
@@ -211,7 +206,6 @@ def get(self, params: FileGetRequest) -> Union[FileResponse, dict]:
             "resource_id",
             "domain_id",
             "workspace_id",
-            "project_id",
         ]
     )
     @append_keyword_filter(["file_id", "name"])