maleo-foundation 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -36,9 +36,9 @@ class Settings(BaseSettings):
     GOOGLE_CREDENTIALS_PATH:str = Field("credentials/maleo-google-service-account.json", description="Internal credential's file path")
     STATIC_CONFIGURATIONS_PATH:str = Field("configs/static.yaml", description="Maleo's static configurations path")
     RUNTIME_CONFIGURATIONS_PATH:str = Field("configs/runtime.yaml", description="Service's runtime configurations path")
-    TOKEN_MANAGER_URL:str = Field(..., description="Maleo Token's manager")
 
 class MaleoCredentials(BaseModel):
+    id:int = Field(..., description="ID")
     username:str = Field(..., description="Username")
     email:str = Field(..., description="Email")
     password:str = Field(..., description="Password")
@@ -176,10 +176,12 @@ class ServiceManager:
         return self._cloud_storage
 
     def _load_maleo_credentials(self) -> None:
+        environment = BaseEnums.EnvironmentType.STAGING if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL else self._settings.ENVIRONMENT
+        id = int(self._secret_manager.get(f"maleo-service-account-id-{environment}"))
         email = self._secret_manager.get("maleo-service-account-email")
         username = self._secret_manager.get("maleo-service-account-username")
         password = self._secret_manager.get("maleo-service-account-password")
-        self._maleo_credentials = MaleoCredentials(username=username, email=email, password=password)
+        self._maleo_credentials = MaleoCredentials(id=id, username=username, email=email, password=password)
 
     @property
     def maleo_credentials(self) -> MaleoCredentials:
@@ -262,7 +264,7 @@ class ServiceManager:
     def token(self) -> str:
         payload = MaleoFoundationTokenGeneralTransfers.BaseEncodePayload(
             iss=None,
-            sub=None,
+            sub=str(self._maleo_credentials.id),
             sr="administrator",
             u_u=self._maleo_credentials.username,
             u_e=self._maleo_credentials.email,

maleo_foundation/models/transfers/results/client/service.py

@@ -20,10 +20,11 @@ class BaseClientServiceResultsTransfers:
         def calculate_pagination_component(cls, values: dict) -> dict:
             """Extracts pagination components (page, limit, total_data) before validation."""
             pagination = values.get("pagination")
-
-            if isinstance(pagination, BaseGeneralSchemas.ExtendedPagination):
-                values["page"] = pagination.page
-                values["limit"] = pagination.limit
-                values["total_data"] = pagination.total_data
+            if pagination is None:
+                raise ValueError("Pagination field did not exists")
+            pagination = BaseGeneralSchemas.ExtendedPagination.model_validate(pagination)
+            values["page"] = pagination.page
+            values["limit"] = pagination.limit
+            values["total_data"] = pagination.total_data
 
             return values

{maleo_foundation-0.2.3.dist-info → maleo_foundation-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.2.3
+Version: 0.2.5
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.2.3.dist-info → maleo_foundation-0.2.5.dist-info}/RECORD

@@ -32,7 +32,7 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=MuhB_DGrjnsl4t96W4pKuCt
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=Pn5EZ-c1Hy6-BihN7KokHJWmBIt3Ty96fZ0zF-srtF4,5208
 maleo_foundation/managers/middleware.py,sha256=ODIQU1Hpu-Xempjjo_VRbVtxiD5oi74mNuoWuDawRh0,4250
-maleo_foundation/managers/service.py,sha256=B2wPRfqPyaZBHiRa5zv5PhxzHZpmWdCEM_Kvgjejxmc,16001
+maleo_foundation/managers/service.py,sha256=VggsQUS_i80_fGZYrErBALYXLLFx1JnE4prGJ0L6HjU,16240
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=5z9l2GN4QASF0-Lft8o5QQ3SRPXqeNZNT1S1CgaE764,4384
 maleo_foundation/managers/client/maleo.py,sha256=iCM47TLL-RSQ2FkTmHVPdsb2JCd1LebMx6OJvIr4vCQ,2035
@@ -80,7 +80,7 @@ maleo_foundation/models/transfers/results/key.py,sha256=H5U8LBodcpCCJmPRw7zkO6sD
 maleo_foundation/models/transfers/results/signature.py,sha256=lj89dDcQNotM0uWqkz_uXUplGoKXgE4NbaXJfN2m0GI,663
 maleo_foundation/models/transfers/results/token.py,sha256=4V3UjfrKY1CnCMGlJgwLW-7brHb1_5I7ndY3k0zuL7o,629
 maleo_foundation/models/transfers/results/client/__init__.py,sha256=xBRuY0NUIPpQEGQ2qoBnqLZGX4W1YSrQ0VnDf5OYJBo,290
-maleo_foundation/models/transfers/results/client/service.py,sha256=cRGf2wcMTfvhlEAxtbDayx_pcXFRJPhy29dnVugKGlg,1162
+maleo_foundation/models/transfers/results/client/service.py,sha256=d5fDb9Agnb_szdxZliT8Nbj_uPMoJidQBGpyg-JG6ik,1264
 maleo_foundation/models/transfers/results/client/controllers/__init__.py,sha256=x5pcJ33rsG8SqecwL1g762DFoySisTLbZqOqKqKoaKU,173
 maleo_foundation/models/transfers/results/client/controllers/http.py,sha256=vhjfjchvlTq347mLY2mcE84n_xYMpLkALi_ecQNOAGY,1499
 maleo_foundation/models/transfers/results/encryption/__init__.py,sha256=Uo8lKBcjlvtCjgPk4sz44GY_fjG3QooatbVYBDFwF8g,307
@@ -107,7 +107,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=deksZXT5wPhEsSMHbZ3x05WHXxCjLDt76Ns-1Tmhp7g,948
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.3.dist-info/METADATA,sha256=jy6MN-Z2m-UMu6siPDessr81cXuXwfSuXTATJQVqHik,3418
-maleo_foundation-0.2.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-maleo_foundation-0.2.3.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.3.dist-info/RECORD,,
+maleo_foundation-0.2.5.dist-info/METADATA,sha256=pV3QopFDva0YAQo7fJjcA6x1ndS-EsLiw1Y-ulqSw2A,3418
+maleo_foundation-0.2.5.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+maleo_foundation-0.2.5.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.5.dist-info/RECORD,,