geek-cafe-saas-sdk 0.7.1__tar.gz → 0.7.2__tar.gz

{geek_cafe_saas_sdk-0.7.1 → geek_cafe_saas_sdk-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geek_cafe_saas_sdk
-Version: 0.7.1
+Version: 0.7.2
 Summary: Base Reusable Services for SaaS
 Project-URL: Homepage, https://github.com/geekcafe/geek-cafe-services
 Project-URL: Documentation, https://github.com/geekcafe/geek-cafe-services/blob/main/README.md

{geek_cafe_saas_sdk-0.7.1 → geek_cafe_saas_sdk-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "geek_cafe_saas_sdk"
-version = "0.7.1"
+version = "0.7.2"
 description = "Base Reusable Services for SaaS"
 authors = [{ name = "Eric Wilson", email = "eric.wilson@geekcafe.com" }]
 requires-python = ">=3.8"

{geek_cafe_saas_sdk-0.7.1 → geek_cafe_saas_sdk-0.7.2}/src/geek_cafe_saas_sdk/__init__.py

@@ -3,7 +3,7 @@ Geek Cafe Services - Base Reusable Services for SaaS
 
 Version 0.6.0 adds File System Service
 """
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 
 # Import main modules for easier access
 from . import services

{geek_cafe_saas_sdk-0.7.1 → geek_cafe_saas_sdk-0.7.2}/src/geek_cafe_saas_sdk/domains/files/services/file_share_service.py

@@ -500,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:
@@ -530,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
             
@@ -559,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:
@@ -575,6 +579,9 @@ class FileShareService(DatabaseService[FileShare]):
                 share.last_accessed_at = dt.datetime.now(dt.UTC).timestamp()
                 
                 share.prep_for_save()
-                self._save_model(share)
+                self.dynamodb.save(
+                    table_name=self.table_name,
+                    item=share
+                )
         except Exception:
             pass  # Best effort

{geek_cafe_saas_sdk-0.7.1 → geek_cafe_saas_sdk-0.7.2}/src/geek_cafe_saas_sdk/domains/files/services/file_system_service.py

@@ -350,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:

{geek_cafe_saas_sdk-0.7.1 → geek_cafe_saas_sdk-0.7.2}/src/geek_cafe_saas_sdk/domains/files/services/file_version_service.py

@@ -515,12 +515,13 @@ class FileVersionService(DatabaseService[FileVersion]):
     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"
+            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:
@@ -543,10 +544,13 @@ class FileVersionService(DatabaseService[FileVersion]):
     def _get_latest_version_number(self, tenant_id: str, file_id: str) -> int:
         """Get the latest version number for a file."""
         try:
-            gsi1_pk = f"FILE#{tenant_id}#{file_id}"
+            file = File()
+            file.id = file_id
+            file.tenant_id = tenant_id
             
+            key = file.get_key("gsi1")
             results = self.dynamodb.query(
-                key=Key('gsi1_pk').eq(gsi1_pk) & Key('gsi1_sk').begins_with("VERSION#"),
+                key=key,
                 table_name=self.table_name,
                 index_name="gsi1",
                 limit=1,
@@ -572,12 +576,14 @@ class FileVersionService(DatabaseService[FileVersion]):
     ) -> None:
         """Mark a version as not current."""
         try:
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"VERSION#{version_id}"
+            version = FileVersion()
+            version.id = version_id
+            version.tenant_id = tenant_id
+            version.file_id = file_id
             
             result = self.dynamodb.get(
                 table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
+                model=version
             )
             
             if result and 'Item' in result: