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

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/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/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/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:

{geek_cafe_saas_sdk-0.7.1.dist-info → geek_cafe_saas_sdk-0.7.2.dist-info}/METADATA

@@ -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.dist-info → geek_cafe_saas_sdk-0.7.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-geek_cafe_saas_sdk/__init__.py,sha256=cLF_Fa1JQqGWMYk2J8hp9nX4IuMyO4gKR7qmaKV_xcs,187
+geek_cafe_saas_sdk/__init__.py,sha256=6akqUf1q618584Azt24YKOhlq0r6YcNVl0Be6BQjh2A,187
 geek_cafe_saas_sdk/core/__init__.py,sha256=3o3-n1ojO_a_X2bEfzhnxmcjAzuzAU73VTcuRva_f5U,279
 geek_cafe_saas_sdk/core/audit_mixin.py,sha256=hQz0XYUr_Trqpv4JXxywVNxqJJehQwLu79Y1NBpRwzo,1150
 geek_cafe_saas_sdk/core/error_codes.py,sha256=vf82TDaJ0qIQLzgjTu96nK9cAaSWK7pYfnOW8HCvSxE,5010
@@ -86,9 +86,9 @@ geek_cafe_saas_sdk/domains/files/models/file_version.py,sha256=L15TvTfzhEDbs_Lwf
 geek_cafe_saas_sdk/domains/files/services/__init__.py,sha256=tzbye87Sk50h7XZJtcvhFF9uAKQr-HgckPfh0wsYVyk,556
 geek_cafe_saas_sdk/domains/files/services/directory_service.py,sha256=4WKyEB5ho_4dnvljQq0VHY_mSt07p6tyrJvIZRQXpM0,22836
 geek_cafe_saas_sdk/domains/files/services/file_lineage_service.py,sha256=TdYPTu0fun71RtGaFzrnMI0ONSb1Je7NE8qSkBZz0eM,17545
-geek_cafe_saas_sdk/domains/files/services/file_share_service.py,sha256=bkz7A59ZzMRL996fN4laTqn0dUWApALZ7OqSlv2xr2k,20119
-geek_cafe_saas_sdk/domains/files/services/file_system_service.py,sha256=LEC7CjdL04OwP8X3o62-GicQIzjcAG-UcKRLJNjXMeU,19077
-geek_cafe_saas_sdk/domains/files/services/file_version_service.py,sha256=-Ckm3XZVzDFinqSiA5X3bkURde8EMTSuKek1eoMYD7U,23421
+geek_cafe_saas_sdk/domains/files/services/file_share_service.py,sha256=mlw2k5t8VeVJ-6RAqOBgbSuJ3F1vVC4FZpYNnRoALEU,20376
+geek_cafe_saas_sdk/domains/files/services/file_system_service.py,sha256=uoO3RT_FZuGZxA4S3YmpXUIKymj6M8qcnL2DIyoCD9o,19079
+geek_cafe_saas_sdk/domains/files/services/file_version_service.py,sha256=nzGVoQb94QbfZbtt7pvCrTEPnuY0uzwLEGDWS8eQ_No,23498
 geek_cafe_saas_sdk/domains/files/services/s3_file_service.py,sha256=T0lyUK97w-L-PrqzTRhdqxKmiW_w15k2y3BslE6WvQw,16920
 geek_cafe_saas_sdk/domains/messaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geek_cafe_saas_sdk/domains/messaging/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -259,7 +259,7 @@ geek_cafe_saas_sdk/utilities/logging_utility.py,sha256=3VwPGleoRw7c4Bn43_Kujl1CQ
 geek_cafe_saas_sdk/utilities/message_query_helper.py,sha256=8iMuacRPfom_T06-VMhaSp-90D8604q7waM-GVcpPNQ,11500
 geek_cafe_saas_sdk/utilities/response.py,sha256=0sylVbm_ieIsNGsm9mWXSIdLSyOeoACwFZQQUxyim3s,5964
 geek_cafe_saas_sdk/utilities/string_functions.py,sha256=_1F4dGyzuD3fAcV1w7A8bv1e-3p0DbNAv_i6-fsekg8,5973
-geek_cafe_saas_sdk-0.7.1.dist-info/METADATA,sha256=wpZ4YyWHwza7H9saWsOBmuDc9vHwHE4ppkDdRbg3df4,16068
-geek_cafe_saas_sdk-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-geek_cafe_saas_sdk-0.7.1.dist-info/licenses/LICENSE,sha256=EHsHc4GFN0U63LgqDSY2aQRKRupbq6QgixCwopdIU2E,2097
-geek_cafe_saas_sdk-0.7.1.dist-info/RECORD,,
+geek_cafe_saas_sdk-0.7.2.dist-info/METADATA,sha256=2ZK6Bof_jeNVM1sbJyp4ttGPK4HKAOlbPoHZKnE5b2o,16068
+geek_cafe_saas_sdk-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+geek_cafe_saas_sdk-0.7.2.dist-info/licenses/LICENSE,sha256=EHsHc4GFN0U63LgqDSY2aQRKRupbq6QgixCwopdIU2E,2097
+geek_cafe_saas_sdk-0.7.2.dist-info/RECORD,,