geek-cafe-saas-sdk 0.7.1__py3-none-any.whl → 0.7.3__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.3"
 
 # 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,20 +515,12 @@ 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"
+            # Use DatabaseService helper to get file
+            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")
             
@@ -543,21 +535,14 @@ 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}"
+            # Query versions for this file using DatabaseService helper
+            temp_version = FileVersion()
+            temp_version.file_id = file_id
             
-            results = self.dynamodb.query(
-                key=Key('gsi1_pk').eq(gsi1_pk) & Key('gsi1_sk').begins_with("VERSION#"),
-                table_name=self.table_name,
-                index_name="gsi1",
-                limit=1,
-                ascending=False  # Get highest version number
-            )
+            result = self._query_by_index(temp_version, "gsi1", limit=1, ascending=False)
             
-            items = results.get('Items', [])
-            if items:
-                version = FileVersion()
-                version.map(items[0])
-                return version.version_number
+            if result.success and result.data:
+                return result.data[0].version_number
             
             return 0  # No versions yet
             
@@ -572,17 +557,10 @@ class FileVersionService(DatabaseService[FileVersion]):
     ) -> None:
         """Mark a version as not current."""
         try:
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = f"VERSION#{version_id}"
+            # Use DatabaseService helper to get version
+            version = self._get_model_by_id_with_tenant_check(version_id, FileVersion, tenant_id)
             
-            result = self.dynamodb.get(
-                table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
-            )
-            
-            if result and 'Item' in result:
-                version = FileVersion()
-                version.map(result['Item'])
+            if version:
                 version.is_current = False
                 
                 version.prep_for_save()
@@ -599,12 +577,15 @@ class FileVersionService(DatabaseService[FileVersion]):
     ) -> None:
         """Update file record with current version info."""
         try:
-            pk = f"FILE#{tenant_id}#{file_id}"
-            sk = "metadata"
+            file = File()
+            file.id = file_id
+            file.tenant_id = tenant_id
+            
+            key = file.get_key("gsi1")
             
             result = self.dynamodb.get(
                 table_name=self.table_name,
-                key={"pk": pk, "sk": sk}
+                key=key
             )
             
             if result and 'Item' in result:

geek_cafe_saas_sdk/domains/messaging/models/contact_thread.py

@@ -33,13 +33,13 @@ class ContactThread(BaseModel):
         super().__init__()
         self._subject: str | None = None
         self._status: str = "open"  # open, in_progress, resolved, closed
-        self._priority: str = "medium"  # low, medium, high, urgent
+        self._priority: Optional[str] = "medium"  # low, medium, high, urgent
         
         # Sender information (guest or authenticated user)
         self._sender: Dict[str, Any] = {}  # {id, name, email, session_id}
         
         # Assignment and routing
-        self._assigned_to: str | None = None  # Staff user ID
+        self._assigned_to: Optional[str] = None  # Staff user ID
         self._inbox_id: str = "support"  # support, sales, billing, etc.
         
         # Messages embedded in thread (suitable for low volume)
@@ -178,7 +178,7 @@ class ContactThread(BaseModel):
 
     @priority.setter
     def priority(self, value: str | None):
-        valid_priorities = ["low", "medium", "high", "urgent"]
+        valid_priorities = ["low", "medium", "high", "urgent", None]
         if value in valid_priorities:
             self._priority = value
         else:

geek_cafe_saas_sdk/domains/messaging/services/contact_thread_service.py

@@ -245,7 +245,7 @@ class ContactThreadService(DatabaseService[ContactThread]):
                                                 tenant_id=tenant_id, status=status)
 
     def list_by_assigned_user(self, assigned_to: str, tenant_id: str, 
-                              status: str = None, limit: int = 50) -> ServiceResult[List[ContactThread]]:
+                              *, status: str = None, priority: str = None, limit: int = 50) -> ServiceResult[List[ContactThread]]:
         """
         List contact threads assigned to a specific user using GSI3.
         
@@ -263,6 +263,13 @@ class ContactThreadService(DatabaseService[ContactThread]):
             temp_thread.assigned_to = assigned_to
             if status:
                 temp_thread.status = status
+            else:
+                temp_thread.status = None
+            
+            if priority:
+                temp_thread.priority = priority
+            else:
+                temp_thread.priority = None
 
             result = self._query_by_index(
                 temp_thread,

geek_cafe_saas_sdk/services/database_service.py

@@ -2,14 +2,17 @@
 
 from abc import ABC, abstractmethod
 from typing import Generic, TypeVar, Dict, Any, List, Optional
-from boto3_assist.dynamodb.dynamodb import DynamoDB
+from boto3_assist.dynamodb.dynamodb import DynamoDB, DynamoDBIndex
 from ..core.service_result import ServiceResult
 from ..core.service_errors import ValidationError, AccessDeniedError, NotFoundError
 from ..core.error_codes import ErrorCode
 import os
+from aws_lambda_powertools import Logger
 
 T = TypeVar("T")
 
+logger = Logger()
+
 
 class DatabaseService(ABC, Generic[T]):
     """Base service class for database operations."""
@@ -23,6 +26,8 @@ class DatabaseService(ABC, Generic[T]):
         if not self.table_name:
             raise ValueError("Table name is required")
 
+        self.LOG_DYNAMO_DB_QUERY = os.getenv("LOG_DYNAMO_DB_QUERY", False)
+
     @abstractmethod
     def create(self, tenant_id: str, user_id: str, **kwargs) -> ServiceResult[T]:
         """Create a new resource."""
@@ -226,6 +231,26 @@ class DatabaseService(ABC, Generic[T]):
             # Get the key for the specified index from the provided model
             key = model.get_key(index_name).key()
 
+            # key.to_string()
+            # extract_key_values(key_expression) is coming soon from boto3_assist
+            if self.LOG_DYNAMO_DB_QUERY:
+                if hasattr(DynamoDBIndex, 'extract_key_values'):
+                    values = DynamoDBIndex.extract_key_values(key_expression)
+                    logger.info(f"Querying index {index_name} with key {values}")
+                else:
+                    try:
+                        value = {
+                            'pk': key._values[0]._values[1],
+                            'sk': key._values[1]._values[1],
+                            'operator': key._values[1].expression_operator,
+                            'format': key._values[1].expression_format,
+                            'index_name': index_name
+                        }
+                        logger.info(f"Querying index {index_name} with key {value}")
+                    except Exception as e:
+                        logger.error(f"Failed to extract key values: {e}")
+                
+
             # Execute the query
             response = self.dynamodb.query(
                 table_name=self.table_name,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geek_cafe_saas_sdk
-Version: 0.7.1
+Version: 0.7.3
 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.3.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=4M6Pbs_H8QB-sOy-gFdAxI7j6eUOW25SyD0OuAnPN98,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=A5x8Dlo9p07Tnqwumj4JwHoonFg4Jzx4zY2sC7dDtUs,22886
 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
@@ -111,11 +111,11 @@ geek_cafe_saas_sdk/domains/messaging/models/__init__.py,sha256=VtJUxBdtCOxUJzXbD
 geek_cafe_saas_sdk/domains/messaging/models/chat_channel.py,sha256=xrzP3gItEOIlLDaJHIRysFcpMOnAdK84sE-4pakLEkk,10565
 geek_cafe_saas_sdk/domains/messaging/models/chat_channel_member.py,sha256=KyOfP54Ho2oU7upZa5Z-bMDwJfGq8oX5_apFCjxg4fY,6058
 geek_cafe_saas_sdk/domains/messaging/models/chat_message.py,sha256=sFXp4hTQPlI9pTWp_K4H-XUdz7IO3FozX0PphQm0kYs,13273
-geek_cafe_saas_sdk/domains/messaging/models/contact_thread.py,sha256=PTMtwY6OTy002Y1OwQFtvyENIDZIeLzDj88siXZUhrA,12836
+geek_cafe_saas_sdk/domains/messaging/models/contact_thread.py,sha256=v4VzsY7TvuCU2YXouNHd9pMFyPl732jpQ7Hmzr6qPtw,12855
 geek_cafe_saas_sdk/domains/messaging/services/__init__.py,sha256=qTcn7zYppwdcUSWLCCWNNorJhauCizmhlup7pqiAGXs,287
 geek_cafe_saas_sdk/domains/messaging/services/chat_channel_service.py,sha256=ismv9N2ZKwRVErvsSXS9_IBl8kPX-AbRkAvrq4zNywM,26604
 geek_cafe_saas_sdk/domains/messaging/services/chat_message_service.py,sha256=OVG3E-9Xz86s6OeYNY7dShil-rv9N6R6EJO54xNM948,19100
-geek_cafe_saas_sdk/domains/messaging/services/contact_thread_service.py,sha256=Z0B3WvElgzdaEbXOPfh9XT8BSlGe0csQ0-rJCOGZlYI,20685
+geek_cafe_saas_sdk/domains/messaging/services/contact_thread_service.py,sha256=k4-qecEgTB3KTFeWAeEoih8vRQR04gkRf63DefBuruE,20918
 geek_cafe_saas_sdk/domains/notifications/__init__.py,sha256=3T6Y-gVQ9BD-RxgUVnfmk2Ss9NndwLGy2C4rNgDKV3E,424
 geek_cafe_saas_sdk/domains/notifications/handlers/__init__.py,sha256=TV8USs_qzUi7V8IzgthzwJ69hUC-6WCREg3YN6Glhxs,32
 geek_cafe_saas_sdk/domains/notifications/handlers/create_webhook/app.py,sha256=hQZEuj6Zj8005Q1Ix7t8cmtBN25ILJUens13mEMvS74,2087
@@ -241,7 +241,7 @@ geek_cafe_saas_sdk/middleware/validation.py,sha256=0KnHaBDHo72lAkAUIzEqGl-JCgyIm
 geek_cafe_saas_sdk/models/__init__.py,sha256=M9p2n9YvwVMw9DMgMJaS-DcmmTJ7EfCmuuIFDF4wnUc,655
 geek_cafe_saas_sdk/models/base_model.py,sha256=H-t7ZQEUwmkvV9xPyd0jVbbieAUwu9n5MCtjvqFwtYw,7353
 geek_cafe_saas_sdk/services/__init__.py,sha256=guO3SxaTEy7NAWNG0orrsjRaUT25XvP0pY7W3lRwePY,614
-geek_cafe_saas_sdk/services/database_service.py,sha256=Ej0TO_dDERDsxPguMypiUhd9U5MNAOOKo3PTRDyX-QQ,16979
+geek_cafe_saas_sdk/services/database_service.py,sha256=LMYhlNox8Ab-2eIbmBm6AW0EQ1fy9gWi6HP_pOFeCfs,18159
 geek_cafe_saas_sdk/utilities/__init__.py,sha256=g8voZ8KYeFJQ6HKYhrp5q6mMHgP-AV0ezmouXRiGbDU,2064
 geek_cafe_saas_sdk/utilities/cognito_utility.py,sha256=S36jAwtJAgeBMN6bL7WKjfLU97f78lRptzpISAQb1kQ,20208
 geek_cafe_saas_sdk/utilities/custom_exceptions.py,sha256=Yc5Kg2kYXeYZEzuX1u48WczT9jtBZYUiWyTv7NsNDPs,5173
@@ -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.3.dist-info/METADATA,sha256=Zo81XcADCmBMrVZh8AhEAdeFoiul4WJJ2ypnfiePmkM,16068
+geek_cafe_saas_sdk-0.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+geek_cafe_saas_sdk-0.7.3.dist-info/licenses/LICENSE,sha256=EHsHc4GFN0U63LgqDSY2aQRKRupbq6QgixCwopdIU2E,2097
+geek_cafe_saas_sdk-0.7.3.dist-info/RECORD,,