sysnet-pyutils 1.1.1__py3-none-any.whl → 1.1.3__py3-none-any.whl

sysnet_pyutils/models/general.py

@@ -6,6 +6,7 @@ from uuid import UUID
 from pydantic import BaseModel, Field, EmailStr
 
 from sysnet_pyutils.utils import local_now
+from utils import is_valid_unid, is_valid_pid, is_valid_uuid
 
 
 class ApiError(Exception):
@@ -236,20 +237,30 @@ class LocationType(BaseModel):
     wgs: Optional[GeoPointType] = Field(default=None, description='WGS84')
     jtsk: Optional[GeoPointJtskType] = Field(default=None, description='JTSK')
 
-
-class PersonBaseType(BaseModel):
-    # Osoba z Registru osob
-    unid: Optional[str] = Field(default=None, description='Domino universal ID', examples=['3005277CB984B7FFC12587890060E2BF'])
-    pid: Optional[str] = Field(default=None, description='Unique identifier', examples=['MBOA7HNBDJTR'])
-    uuid: Optional[UUID] = Field(default=None, description='Unique identifier')
+class PersonCoreType(BaseModel):
     ico: Optional[str] = Field(default=None, description='IČO osoby')
     name: Optional[str] = Field(default=None, description='Název osoby', examples=['B.A.R. Reptofilia'])
     email: Optional[EmailStr] = Field(default=None, description='Email osoby')
     address: Optional[str] = Field(default=None, description='Adresa osoby', examples=['Ulice Závodu Míru 2\n87423 Otrokovice'])
     country: Optional[CodeValueType] = Field(default=None, description='Země adresy osoby')
+
+class PersonBaseType(PersonCoreType):
+    # Osoba z Registru osob
+    identifier: Optional[str] = Field(default=None, description='Hlavní jednoznačný identifikátor')
+    unid: Optional[str] = Field(default=None, description='Domino universal ID', examples=['3005277CB984B7FFC12587890060E2BF'])
+    pid: Optional[str] = Field(default=None, description='Unique identifier', examples=['MBOA7HNBDJTR'])
+    uuid: Optional[UUID] = Field(default=None, description='Unique identifier (UUID)')
     main_person: Optional[LinkedType] = Field(default=None, description='Odkaz na hlavní osobu do registru')
     linked_persons: Optional[list[LinkedType]] = Field(default=None, description='Odkaz na další osoby do registru')
 
+    def make_identifier(self) -> Optional[str]:
+        if is_valid_unid(self.unid):
+            self.identifier = self.unid
+        if is_valid_pid(self.pid):
+            self.identifier = self.pid
+        if is_valid_uuid(self.uuid):
+            self.identifier = str(self.uuid)
+        return self.identifier
 
 class WorkflowType(BaseModel):
     # Položka životního cyklu

{sysnet_pyutils-1.1.1.dist-info → sysnet_pyutils-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sysnet-pyutils
-Version: 1.1.1
+Version: 1.1.3
 Summary: Python Utilities
 Author-email: Data Developer <info@sysnet.cz>
 Project-URL: Homepage, https://github.com/SYSNET-CZ/pyutils
@@ -332,12 +332,18 @@ Kontrola validity emailové adresy
 Datový slovník je vytvořen pomocí pydantic a je plně kompatibilní s FastAPI. 
 Obsahuje základní datové typy, které se používají ve všech aplikacích SYSNET. 
 
+--------------------------------------------------------------------------------------------------------------------------------
+
+### verze 1.1.3
+
+Třída **PersonBaseType** rozšířena o atribut **identifier** (hlavní identifikátor) a metodu **make_identifier()**, 
+která naplní atribut **identifier** z unid, pid nebo uuid. 
 
 
 ## Systémové proměnné
 
 * **TZ**: Časová zóna. Implicitně 'Europe/Prague'
-* **DEBUG**: Debug mode. Implictně `True`
+* **DEBUG**: Debug mode. Implicitně `True`
 * **LOG_FORMAT**: Formát logování. Implicitně `'%(asctime)s - %(levelname)s in %(module)s: %(message)s'`
 * **LOG_DATE_FORMAT**: Formát data pro logování. Implicitně `'%d.%m.%Y %H:%M:%S'`
 * **PID_PREFIX**: PID prefix. Implicitně `'SNT'`

{sysnet_pyutils-1.1.1.dist-info → sysnet_pyutils-1.1.3.dist-info}/RECORD

@@ -9,9 +9,9 @@ sysnet_pyutils/ses.py,sha256=WJzs0y2QnF4XGDGjls_W0p0v6DJ4fZ4_97m3XbzpaFw,2713
 sysnet_pyutils/tools.py,sha256=ZioHvUIufrhuJyZLdPnuMUD8Li5LTljSMSCxqRnKIi4,377
 sysnet_pyutils/utils.py,sha256=Y95MyEuZlSlTVsQ2rOArdkTN7xqcGsCA7RA6VoBHSSk,23257
 sysnet_pyutils/models/__init__.py,sha256=oozOr_DKhenkM9BDaPOmtbLXhP5vtMUCjBPEjZDW4GQ,167
-sysnet_pyutils/models/general.py,sha256=jqvPoKa6jKXfPLubNSSJZpSpIUG5Sw8A_zwDRlEp8VQ,14706
-sysnet_pyutils-1.1.1.dist-info/LICENSE,sha256=bx5iLIKjgAdYQ7sISn7DsfHRKkoCUm1154sJJKhgqnU,35184
-sysnet_pyutils-1.1.1.dist-info/METADATA,sha256=lj6VZ1NHlDcVLQSoOBr11_XSOVULaF3DTA4IotTnHeY,14744
-sysnet_pyutils-1.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-sysnet_pyutils-1.1.1.dist-info/top_level.txt,sha256=ZKTltQWbLlWBXw4oovo1w7ui-JQ1WoyECqMSWdBj6XE,15
-sysnet_pyutils-1.1.1.dist-info/RECORD,,
+sysnet_pyutils/models/general.py,sha256=pj8JJwjqJvakmWYYhQJ2DgF9JcnBIBAeDiuExq-Bb5Q,15228
+sysnet_pyutils-1.1.3.dist-info/LICENSE,sha256=bx5iLIKjgAdYQ7sISn7DsfHRKkoCUm1154sJJKhgqnU,35184
+sysnet_pyutils-1.1.3.dist-info/METADATA,sha256=RJLnd-qB1Vu9_1sFYo6xZ8OTO13cWOVZiq_T9c5Dz74,15083
+sysnet_pyutils-1.1.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+sysnet_pyutils-1.1.3.dist-info/top_level.txt,sha256=ZKTltQWbLlWBXw4oovo1w7ui-JQ1WoyECqMSWdBj6XE,15
+sysnet_pyutils-1.1.3.dist-info/RECORD,,