sharedkernel 2.2.1__tar.gz → 2.2.3__tar.gz

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.2.1
+Version: 2.2.3
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -29,6 +29,11 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.3
+- add paginate to mongo repository
+### Version 2.2.2
+- update on audit logging queries
+- added is_audit to update_one parameters
 ### Version 2.2.1
 - fixbug requirements
 ### Version 2.2.0

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/README.md

@@ -2,6 +2,11 @@
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.3
+- add paginate to mongo repository
+### Version 2.2.2
+- update on audit logging queries
+- added is_audit to update_one parameters
 ### Version 2.2.1
 - fixbug requirements
 ### Version 2.2.0

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/setup.py

@@ -34,10 +34,10 @@ setup(
         "mammoth",
         "markdown",
         "beautifulsoup4",
-        "deepdiff"
+        "deepdiff",
     ],
     # *strongly* suggested for sharing
-    version="2.2.1",
+    version="2.2.3",
     description="sharekernel is a shared package between all python projects",
     long_description=long_description,
     long_description_content_type="text/markdown",

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/sharedkernel/database/__init__.py

@@ -1,3 +1,4 @@
 from .mongo_generic_repository import MongoGenericRepository
 from .mongo_generic_audit_repository import MongoGenericAuditRepository
-from .audit_model import AuditLog, AuditOperation
+from .audit_model import AuditLog, AuditOperation
+from .pagination_response_dto import PaginationResponseDto

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/sharedkernel/database/mongo_generic_audit_repository.py

@@ -4,6 +4,7 @@ from pymongo import MongoClient
 from pydantic.v1 import BaseModel
 
 from sharedkernel.database.audit_model import AuditLog
+from sharedkernel.enum.sort_order import SortOrder
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -35,7 +36,13 @@ class MongoGenericAuditRepository():
         operation: str | None = None,
         collection_name: str | None  = None,
         field_name: str | None  = None,
+        page_number=1,
+        page_size=10,
+        sort_order: SortOrder = SortOrder.Descending,
     ) -> List[AuditLog]:
+        sort_order = -1 if sort_order == SortOrder.Descending else 1
+
+        skip_count = (page_number - 1) * page_size
 
         query = {}
 
@@ -52,6 +59,39 @@ class MongoGenericAuditRepository():
                 {f"modified.{field_name}": {"$exists": True}},
             ]
 
+        results = self.collection.find(query).sort("_id", sort_order).skip(skip_count).limit(page_size)
+        return [self._map_to_model(bot) for bot in results]
+    
+    def find_by_value(
+        self,
+        field_name: str,
+        field_value: str,
+        document_id: str | None = None,
+        operation: str | None = None,
+        collection_name: str | None = None,
+        find_in_originals: bool | None = False,
+        find_in_modifies: bool | None = False,
+    ) -> list[AuditLog]:
+
+        query = {}
+
+        if document_id:
+            query["document_id"] = document_id
+        if operation:
+            query["operation"] = operation
+        if collection_name:
+            query["collection_name"] = collection_name
+
+        if find_in_originals and find_in_modifies:
+            query["$or"] = [
+                {f"original.{field_name}": field_value},
+                {f"modified.{field_name}": field_value},
+            ]
+        elif find_in_originals:
+            query[f"original.{field_name}"] = field_value
+        elif find_in_modifies:
+            query[f"modified.{field_name}"] = field_value
+
         results = self.collection.find(query)
         return [self._map_to_model(bot) for bot in results]
     

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/sharedkernel/database/mongo_generic_repository.py

@@ -1,8 +1,10 @@
 from bson import ObjectId
 from typing import Generic, TypeVar, List, Type
+from math import ceil
+from contextlib import suppress
+
 from pydantic.v1 import BaseModel
 from pymongo import MongoClient, ReturnDocument
-from contextlib import suppress
 
 from sharedkernel.objects.user_info import current_user_info
 from sharedkernel.string_extentions import camel_to_snake
@@ -13,6 +15,7 @@ from sharedkernel.database.audit_model import (
     AuditOperation
 )
 from sharedkernel.diff_utils import generate_clean_diff
+from sharedkernel.database.pagination_response_dto import PaginationResponseDto
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -79,7 +82,7 @@ class MongoGenericRepository(Generic[T]):
 
         return [str(id_) for id_ in result.inserted_ids]
 
-    def update_one(self, id: str, data: T) -> int:
+    def update_one(self, id: str, data: T, is_audit = True) -> int:
         delattr(data, "id")
 
         query = {"_id": ObjectId(id)}
@@ -89,24 +92,25 @@ class MongoGenericRepository(Generic[T]):
             return_document=ReturnDocument.BEFORE
         )
 
-        before_model = self.model(**before_dict)
-
         # For Audit log
-        with suppress(Exception):
-            diff_data = generate_clean_diff(before_model, data)
-            old_data, new_data = diff_data["original"], diff_data["modified"]
-
-            if isinstance(data, BaseAuditDocument) and new_data:
-                document = AuditLog(
-                    user_id=current_user_info.get().nameid,
-                    collection_name=self.__collection_name,
-                    document_id=id,
-                    operation=AuditOperation.UPDATE,
-                    original=old_data,
-                    modified=new_data,
-                )
+        if isinstance(data, BaseAuditDocument) and is_audit:
+            with suppress(Exception):
+                before_model = self.model(**before_dict)
                 
-                self.audit_collection.insert_one(document)
+                diff_data = generate_clean_diff(before_model, data)
+                old_data, new_data = diff_data["original"], diff_data["modified"]
+
+                if new_data:
+                    document = AuditLog(
+                        user_id=current_user_info.get().nameid,
+                        collection_name=self.__collection_name,
+                        document_id=id,
+                        operation=AuditOperation.UPDATE,
+                        original=old_data,
+                        modified=new_data,
+                    )
+                    
+                    self.audit_collection.insert_one(document)
 
         return 1
 
@@ -120,3 +124,32 @@ class MongoGenericRepository(Generic[T]):
         query = {"is_deleted": False}
         result = self.collection.find(query).skip(skip_count).limit(page_size)
         return [self._map_to_model(doc) for doc in result]
+
+    def paginate(
+        self,
+        query: dict,
+        page_number: int,
+        page_size: int,
+        sort_field: str = "_id",
+        sort_order: int = -1,
+    ) -> PaginationResponseDto:
+        
+        skip_count = (page_number - 1) * page_size
+        total_items = self.collection.count_documents(query)
+
+        cursor = (
+            self.collection.find(query)
+            .sort(sort_field, sort_order)
+            .skip(skip_count)
+            .limit(page_size)
+        )
+
+        return PaginationResponseDto(
+            data=[self._map_to_model(doc) for doc in cursor],
+            total_items=total_items,
+            page_size=page_size,
+            current_page=page_number,
+            total_pages=ceil(total_items / page_size) if page_size else 1,
+            has_next=(page_number * page_size) < total_items,
+            has_prev=page_number > 1,
+        )

sharedkernel-2.2.3/sharedkernel/database/pagination_response_dto.py

@@ -0,0 +1,16 @@
+from typing import List, TypeVar, Generic
+
+from pydantic import BaseModel
+# from pydantic.generics import GenericModel
+
+T = TypeVar("T", bound=BaseModel)
+
+class PaginationResponseDto(BaseModel, Generic[T]):
+    data: List[T]
+    total_items: int
+    page_size: int
+    current_page: int
+    total_pages: int
+    has_next: bool
+    has_prev: bool
+

sharedkernel-2.2.3/sharedkernel/enum/sort_order.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class SortOrder(str, Enum):
+    Descending = "desc"
+    Ascending = "asc"

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sharedkernel
-Version: 2.2.1
+Version: 2.2.3
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -29,6 +29,11 @@ Dynamic: summary
 this is a shared kernel package
 
 # Change Log
+### Version 2.2.3
+- add paginate to mongo repository
+### Version 2.2.2
+- update on audit logging queries
+- added is_audit to update_one parameters
 ### Version 2.2.1
 - fixbug requirements
 ### Version 2.2.0

{sharedkernel-2.2.1 → sharedkernel-2.2.3}/sharedkernel.egg-info/SOURCES.txt

@@ -17,8 +17,10 @@ sharedkernel/database/__init__.py
 sharedkernel/database/audit_model.py
 sharedkernel/database/mongo_generic_audit_repository.py
 sharedkernel/database/mongo_generic_repository.py
+sharedkernel/database/pagination_response_dto.py
 sharedkernel/enum/__init__.py
 sharedkernel/enum/error_code.py
+sharedkernel/enum/sort_order.py
 sharedkernel/exception/__init__.py
 sharedkernel/exception/exception.py
 sharedkernel/exception/exception_handlers.py