geek-cafe-saas-sdk 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

geek_cafe_saas_sdk/domains/files/services/file_share_service.py

@@ -109,27 +109,8 @@ class FileShareService(DatabaseService[FileShare]):
             share.access_count = 0
             
             # Save to DynamoDB
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"SHARE#{share.share_id}"
-            
-            item = share.to_dictionary()
-            item["pk"] = pk
-            item["sk"] = sk
-            
-            # GSI1: Shares by file
-            item["gsi1_pk"] = f"FILE#{tenant_id}#{file_id}"
-            item["gsi1_sk"] = f"USER#{shared_with_user_id}"
-            
-            # GSI2: Shares with user
-            item["gsi2_pk"] = f"TENANT#{tenant_id}#USER#{shared_with_user_id}"
-            item["gsi2_sk"] = f"FILE#{file_id}#{share.created_utc_ts}"
-            
-            self.dynamodb.save(
-                item=item,
-                table_name=self.table_name
-            )
-            
-            return ServiceResult.success_result(share)
+            share.prep_for_save()
+            return self._save_model(share)
             
         except (ValidationError, AccessDeniedError) as e:
             return ServiceResult.error_result(
@@ -163,23 +144,12 @@ class FileShareService(DatabaseService[FileShare]):
             ServiceResult with FileShare model
         """
         try:
-            if not file_id:
-                raise ValidationError("file_id is required", "file_id")
-            
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"SHARE#{resource_id}"
-            
-            result = self.dynamodb.get(
-                table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
-            )
+            # Use helper method with tenant check
+            share = self._get_model_by_id_with_tenant_check(resource_id, FileShare, tenant_id)
             
-            if not result or 'Item' not in result:
+            if not share:
                 raise NotFoundError(f"Share not found: {resource_id}")
             
-            share = FileShare()
-            share.map(result['Item'])
-            
             # Access control: user must be sharer or sharee
             if share.shared_by != user_id and share.shared_with_user_id != user_id:
                 raise AccessDeniedError("You do not have access to this share")
@@ -256,25 +226,8 @@ class FileShareService(DatabaseService[FileShare]):
             share.updated_utc_ts = dt.datetime.now(dt.UTC).timestamp()
             
             # Save to DynamoDB
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"SHARE#{resource_id}"
-            
-            item = share.to_dictionary()
-            item["pk"] = pk
-            item["sk"] = sk
-            
-            # Preserve GSI keys
-            item["gsi1_pk"] = f"FILE#{tenant_id}#{file_id}"
-            item["gsi1_sk"] = f"USER#{share.shared_with_user_id}"
-            item["gsi2_pk"] = f"TENANT#{tenant_id}#USER#{share.shared_with_user_id}"
-            item["gsi2_sk"] = f"FILE#{file_id}#{share.created_utc_ts}"
-            
-            self.dynamodb.save(
-                item=item,
-                table_name=self.table_name
-            )
-            
-            return ServiceResult.success_result(share)
+            share.prep_for_save()
+            return self._save_model(share)
             
         except (ValidationError, AccessDeniedError) as e:
             return ServiceResult.error_result(
@@ -323,23 +276,11 @@ class FileShareService(DatabaseService[FileShare]):
             share.status = "revoked"
             share.revoked_at = dt.datetime.now(dt.UTC).timestamp()
             
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"SHARE#{resource_id}"
-            
-            item = share.to_dictionary()
-            item["pk"] = pk
-            item["sk"] = sk
+            share.prep_for_save()
+            save_result = self._save_model(share)
             
-            # Preserve GSI keys
-            item["gsi1_pk"] = f"FILE#{tenant_id}#{file_id}"
-            item["gsi1_sk"] = f"USER#{share.shared_with_user_id}"
-            item["gsi2_pk"] = f"TENANT#{tenant_id}#USER#{share.shared_with_user_id}"
-            item["gsi2_sk"] = f"FILE#{file_id}#{share.created_utc_ts}"
-            
-            self.dynamodb.save(
-                item=item,
-                table_name=self.table_name
-            )
+            if not save_result.success:
+                return save_result
             
             return ServiceResult.success_result(True)
             
@@ -383,21 +324,19 @@ class FileShareService(DatabaseService[FileShare]):
                     error_code=ErrorCode.ACCESS_DENIED
                 )
             
-            # Query GSI1
-            gsi1_pk = f"FILE#{tenant_id}#{file_id}"
+            # Use GSI1 to query shares by file
+            temp_share = FileShare()
+            temp_share.file_id = file_id
             
-            results = self.dynamodb.query(
-                key=Key('gsi1_pk').eq(gsi1_pk) & Key('gsi1_sk').begins_with("USER#"),
-                table_name=self.table_name,
-                index_name="gsi1",
-                limit=limit
-            )
+            # Query using helper method
+            query_result = self._query_by_index(temp_share, "gsi1", limit=limit, ascending=False)
             
+            if not query_result.success:
+                return query_result
+            
+            # Filter results
             shares = []
-            for item in results.get('Items', []):
-                share = FileShare()
-                share.map(item)
-                
+            for share in query_result.data:
                 # Include active and expired shares, exclude revoked
                 if share.status != "revoked":
                     shares.append(share)
@@ -429,21 +368,19 @@ class FileShareService(DatabaseService[FileShare]):
             ServiceResult with list of FileShare models
         """
         try:
-            # Query GSI2
-            gsi2_pk = f"TENANT#{tenant_id}#USER#{user_id}"
+            # Use GSI2 to query shares by shared_with_user
+            temp_share = FileShare()
+            temp_share.shared_with_user_id = user_id
             
-            results = self.dynamodb.query(
-                key=Key('gsi2_pk').eq(gsi2_pk) & Key('gsi2_sk').begins_with("FILE#"),
-                table_name=self.table_name,
-                index_name="gsi2",
-                limit=limit
-            )
+            # Query using helper method
+            query_result = self._query_by_index(temp_share, "gsi2", limit=limit, ascending=False)
+            
+            if not query_result.success:
+                return query_result
             
+            # Filter results
             shares = []
-            for item in results.get('Items', []):
-                share = FileShare()
-                share.map(item)
-                
+            for share in query_result.data:
                 # Only include active, non-expired shares
                 if share.is_active:
                     shares.append(share)
@@ -543,20 +480,12 @@ class FileShareService(DatabaseService[FileShare]):
     def _get_file(self, tenant_id: str, file_id: str, user_id: str) -> ServiceResult[File]:
         """Get file with access control."""
         try:
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = "METADATA"
+            # Use helper method with tenant check
+            file = self._get_model_by_id_with_tenant_check(file_id, File, tenant_id)
             
-            result = self.dynamodb.get(
-                table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
-            )
-            
-            if not result or 'Item' not in result:
+            if not file:
                 raise NotFoundError(f"File not found: {file_id}")
             
-            file = File()
-            file.map(result['Item'])
-            
             if file.owner_id != user_id:
                 raise AccessDeniedError("You do not have access to this file")
             
@@ -571,12 +500,14 @@ class FileShareService(DatabaseService[FileShare]):
     def _get_file_any_user(self, tenant_id: str, file_id: str) -> ServiceResult[File]:
         """Get file without access control (for internal use)."""
         try:
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = "METADATA"
+            
+            file = File()
+            file.id = file_id
+            file.tenant_id = tenant_id
             
             result = self.dynamodb.get(
                 table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
+                model=file
             )
             
             if not result or 'Item' not in result:
@@ -601,21 +532,21 @@ class FileShareService(DatabaseService[FileShare]):
     ) -> Optional[FileShare]:
         """Check if share already exists."""
         try:
-            gsi1_pk = f"FILE#{tenant_id}#{file_id}"
-            gsi1_sk = f"USER#{shared_with_user_id}"
+            # Query GSI1 by file_id to get all shares for this file
+            temp_share = FileShare()
+            temp_share.file_id = file_id
             
-            results = self.dynamodb.query(
-                key=Key('gsi1_pk').eq(gsi1_pk) & Key('gsi1_sk').eq(gsi1_sk),
-                table_name=self.table_name,
-                index_name="gsi1",
-                limit=1
-            )
+            result = self._query_by_index(temp_share, "gsi1", limit=100)
             
-            items = results.get('Items', [])
-            if items:
-                share = FileShare()
-                share.map(items[0])
-                return share
+            if not result.success:
+                return None
+            
+            # Filter for matching tenant and user (active shares only)
+            for share in result.data:
+                if (share.tenant_id == tenant_id and 
+                    share.shared_with_user_id == shared_with_user_id and
+                    share.status == "active"):
+                    return share
             
             return None
             
@@ -630,12 +561,14 @@ class FileShareService(DatabaseService[FileShare]):
     ) -> None:
         """Increment share access count."""
         try:
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"SHARE#{share_id}"
+            share = FileShare()
+            share.id = share_id
+            share.tenant_id = tenant_id
+            share.file_id = file_id
             
             result = self.dynamodb.get(
                 table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
+                model=share
             )
             
             if result and 'Item' in result:
@@ -645,19 +578,10 @@ class FileShareService(DatabaseService[FileShare]):
                 share.access_count += 1
                 share.last_accessed_at = dt.datetime.now(dt.UTC).timestamp()
                 
-                item = share.to_dictionary()
-                item["pk"] = pk
-                item["sk"] = sk
-                
-                # Preserve GSI keys
-                item["gsi1_pk"] = result['Item'].get('gsi1_pk')
-                item["gsi1_sk"] = result['Item'].get('gsi1_sk')
-                item["gsi2_pk"] = result['Item'].get('gsi2_pk')
-                item["gsi2_sk"] = result['Item'].get('gsi2_sk')
-                
+                share.prep_for_save()
                 self.dynamodb.save(
-                    item=item,
-                    table_name=self.table_name
+                    table_name=self.table_name,
+                    item=share
                 )
         except Exception:
             pass  # Best effort

geek_cafe_saas_sdk/domains/files/services/file_system_service.py

@@ -174,28 +174,11 @@ class FileSystemService(DatabaseService[File]):
                 )
             
             # Save metadata to DynamoDB
-            pk = f"FILE#{tenant_id}#{file.file_id}"
-            sk = "METADATA"
-            
-            item = file.to_dictionary()
-            item["pk"] = pk
-            item["sk"] = sk
-            
-            # GSI1: Files by directory
-            item["gsi1_pk"] = f"TENANT#{tenant_id}"
-            if directory_id:
-                item["gsi1_sk"] = f"DIRECTORY#{directory_id}#{file_name}"
-            else:
-                item["gsi1_sk"] = f"DIRECTORY#ROOT#{file_name}"
-            
-            # GSI2: Files by owner
-            item["gsi2_pk"] = f"TENANT#{tenant_id}#USER#{user_id}"
-            item["gsi2_sk"] = f"FILE#{file.created_utc_ts}"
+            file.prep_for_save()
+            save_result = self._save_model(file)
             
-            self.dynamodb.save(
-                table_name=self.table_name,
-                item=item
-            )
+            if not save_result.success:
+                return save_result
             
             return ServiceResult.success_result(file)
             
@@ -229,23 +212,13 @@ class FileSystemService(DatabaseService[File]):
             ServiceResult with File model
         """
         try:
-            pk = f"FILE#{tenant_id}#{resource_id}"
-            sk = "METADATA"
-            
-            result = self.dynamodb.get(
-                table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
-            )
+            # Use helper method with tenant check
+            file = self._get_model_by_id_with_tenant_check(resource_id, File, tenant_id)
             
-            # Check if file exists first (before checking ownership)
-            # DynamoDB.get returns {'Item': {...}} or {'ResponseMetadata': {...}}
-            if not result or 'Item' not in result:
+            # Check if file exists
+            if not file:
                 raise NotFoundError(f"File not found: {resource_id}")
             
-            # Convert to File model
-            file = File()
-            file.map(result['Item'])
-            
             # Access control: Check if user is owner or has share access
             if file.owner_id != user_id:
                 # TODO: Check FileShare for access
@@ -316,27 +289,8 @@ class FileSystemService(DatabaseService[File]):
             file.updated_utc_ts = dt.datetime.now(dt.UTC).timestamp()
             
             # Save to DynamoDB
-            pk = f"FILE#{tenant_id}#{resource_id}"
-            sk = "METADATA"
-            
-            item = file.to_dictionary()
-            item["pk"] = pk
-            item["sk"] = sk
-            
-            # Update GSI keys if directory changed
-            if "directory_id" in updates:
-                item["gsi1_pk"] = f"TENANT#{tenant_id}"
-                if updates["directory_id"]:
-                    item["gsi1_sk"] = f"DIRECTORY#{updates['directory_id']}#{file.file_name}"
-                else:
-                    item["gsi1_sk"] = f"DIRECTORY#ROOT#{file.file_name}"
-            
-            self.dynamodb.save(
-                table_name=self.table_name,
-                item=item
-            )
-            
-            return ServiceResult.success_result(file)
+            file.prep_for_save()
+            return self._save_model(file)
             
         except AccessDeniedError as e:
             return ServiceResult.error_result(
@@ -396,11 +350,12 @@ class FileSystemService(DatabaseService[File]):
                         )
                 
                 # Delete from DynamoDB
-                pk = f"FILE#{tenant_id}#{resource_id}"
-                sk = "METADATA"
+                file = File()
+                file.id = resource_id
+                file.tenant_id = tenant_id
                 
                 self.dynamodb.delete(
-                    primary_key={"pk": pk, "sk": sk},
+                    model=file,
                     table_name=self.table_name
                 )
             else:
@@ -409,17 +364,11 @@ class FileSystemService(DatabaseService[File]):
                 file.status = "deleted"
                 file.deleted_utc_ts = dt.datetime.now(dt.UTC).timestamp()
                 
-                pk = f"FILE#{tenant_id}#{resource_id}"
-                sk = "METADATA"
+                file.prep_for_save()
+                save_result = self._save_model(file)
                 
-                item = file.to_dictionary()
-                item["pk"] = pk
-                item["sk"] = sk
-                
-                self.dynamodb.save(
-                    table_name=self.table_name,
-                    item=item
-                )
+                if not save_result.success:
+                    return save_result
             
             return ServiceResult.success_result(True)
             
@@ -507,32 +456,23 @@ class FileSystemService(DatabaseService[File]):
             ServiceResult with list of File models
         """
         try:
-            gsi1_pk = f"TENANT#{tenant_id}"
+            # Use GSI1 to query files by directory
+            temp_file = File()
+            temp_file.tenant_id = tenant_id
+            temp_file.directory_id = directory_id  # None for root files
             
-            if directory_id:
-                gsi1_sk_prefix = f"DIRECTORY#{directory_id}#"
-            else:
-                gsi1_sk_prefix = "DIRECTORY#ROOT#"
-            
-            # Query GSI1
-            results = self.dynamodb.query(
-                key=Key('gsi1_pk').eq(gsi1_pk) & Key('gsi1_sk').begins_with(gsi1_sk_prefix),
-                table_name=self.table_name,
-                index_name="gsi1",
-                limit=limit
-            )
+            # Query using helper method
+            query_result = self._query_by_index(temp_file, "gsi1", limit=limit, ascending=True)
+            
+            if not query_result.success:
+                return query_result
             
+            # Filter results
             files = []
-            for item in results.get('Items', []):
-                file = File()
-                file.map(item)
-                
-                # Filter out deleted files
-                if file.status != "deleted":
-                    # Basic access control: show only owned files or shared files
-                    # TODO: Check FileShare for shared access
-                    if file.owner_id == user_id:
-                        files.append(file)
+            for file in query_result.data:
+                # Filter out deleted files and apply access control
+                if file.status != "deleted" and file.owner_id == user_id:
+                    files.append(file)
             
             return ServiceResult.success_result(files)
             
@@ -567,21 +507,20 @@ class FileSystemService(DatabaseService[File]):
             if owner_id != user_id:
                 raise AccessDeniedError("You can only list your own files")
             
-            gsi2_pk = f"TENANT#{tenant_id}#USER#{owner_id}"
+            # Use GSI2 to query files by owner
+            temp_file = File()
+            temp_file.tenant_id = tenant_id
+            temp_file.owner_id = owner_id
             
-            # Query GSI2
-            results = self.dynamodb.query(
-                key=Key('gsi2_pk').eq(gsi2_pk) & Key('gsi2_sk').begins_with("FILE#"),
-                table_name=self.table_name,
-                index_name="gsi2",
-                limit=limit
-            )
+            # Query using helper method
+            query_result = self._query_by_index(temp_file, "gsi2", limit=limit, ascending=False)
             
+            if not query_result.success:
+                return query_result
+            
+            # Filter results
             files = []
-            for item in results.get('Items', []):
-                file = File()
-                file.map(item)
-                
+            for file in query_result.data:
                 # Filter out deleted files
                 if file.status != "deleted":
                     files.append(file)