brynq-sdk-nmbrs 2.0.0__tar.gz → 2.0.1__tar.gz

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_nmbrs
-Version: 2.0.0
+Version: 2.0.1
 Summary: Nmbrs wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/companies.py

@@ -49,10 +49,12 @@ class Companies:
             if response:
                 # Convert Zeep objects to Python dictionaries
                 serialized_response = serialize_object(response)
-                
+
+                # TODO: add validation here
                 # Convert to DataFrame
                 df = pd.DataFrame(serialized_response)
-                
+                df = self.nmbrs._rename_camel_columns_to_snake_case(df)
+
                 return df
             else:
                 return pd.DataFrame()

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/debtors.py

@@ -1,25 +1,25 @@
 import pandas as pd
 import requests
-from .costcenter import Costcenter
-from .costunit import Costunit
+from brynq_sdk_functions import Functions
 from .department import Departments
-from .hours import Hours
-from .bank import Bank
-from .function import Functions
+from .function import Functions as NmbrsFunctions
+from .schemas.debtor import DebtorsGet
 
 
 class Debtors:
     def __init__(self, nmbrs):
         self.nmbrs = nmbrs
         self.departments = Departments(nmbrs)
-        self.functions = Functions(nmbrs)
+        self.functions = NmbrsFunctions(nmbrs)
 
 
-    def get(self) -> pd.DataFrame:
+    def get(self) -> (pd.DataFrame, pd.DataFrame):
         request = requests.Request(method='GET',
                                    url=f"{self.nmbrs.base_url}debtors")
         data = self.nmbrs.get_paginated_result(request)
 
         df = pd.DataFrame(data)
 
-        return df
+        valid_debtors, invalid_debtors = Functions.validate_data(df=df, schema=DebtorsGet, debug=True)
+
+        return valid_debtors, invalid_debtors

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/department.py

@@ -2,7 +2,7 @@ import math
 import pandas as pd
 import requests
 from typing import Dict, Any
-from .schemas.department import DepartmentCreate, DepartmentUpdate, DepartmentDelete, Period, DepartmentGet
+from .schemas.department import DepartmentCreate, DepartmentUpdate, DepartmentDelete, Period, EmployeeDepartmentGet, DepartmentGet
 from brynq_sdk_functions import Functions
 
 
@@ -17,7 +17,7 @@ class EmployeeDepartment:
         for company in self.nmbrs.company_ids:
             departments = pd.concat([departments, self._get(company, created_from, employee_id)])
 
-        valid_departments, invalid_departments = Functions.validate_data(df=departments, schema=DepartmentGet, debug=True)
+        valid_departments, invalid_departments = Functions.validate_data(df=departments, schema=EmployeeDepartmentGet, debug=True)
 
         return valid_departments, invalid_departments
 
@@ -114,5 +114,6 @@ class Departments:
 
         data = self.nmbrs.get_paginated_result(request)
         df = pd.DataFrame(data)
+        valid_departments, invalid_departments = Functions.validate_data(df=df, schema=DepartmentGet, debug=True)
 
         return df

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/employees.py

@@ -67,7 +67,7 @@ class Employees:
             record_path='info',
             meta=['employeeId']
         )
-        df['company_id'] = company_id
+        df['companyId'] = company_id
 
         df['createdAt'] = pd.to_datetime(df['createdAt'])
         df = df.loc[df.groupby('employeeId')['createdAt'].idxmax()]
@@ -108,7 +108,7 @@ class Employees:
             return employee_model
 
         # Convert validated model to dict for API payload
-        payload = employee_model.dict(exclude_none=True)
+        payload = employee_model.model_dump(exclude_none=True, by_alias=True)
 
         # Send request
         resp = self.nmbrs.session.post(

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/function.py

@@ -3,7 +3,7 @@ import requests
 from brynq_sdk_functions import Functions as BrynQFunctions
 import math
 from typing import Dict, Any
-from .schemas.function import FunctionGet, FunctionCreate, FunctionUpdate, FunctionDelete
+from .schemas.function import EmployeeFunctionGet, FunctionCreate, FunctionUpdate, FunctionDelete, FunctionGet
 
 
 class EmployeeFunction:
@@ -16,7 +16,7 @@ class EmployeeFunction:
         for company in self.nmbrs.company_ids:
             functions = pd.concat([functions, self._get(company, created_from)])
 
-        valid_functions, invalid_functions = BrynQFunctions.validate_data(df=functions, schema=FunctionGet, debug=True)
+        valid_functions, invalid_functions = BrynQFunctions.validate_data(df=functions, schema=EmployeeFunctionGet, debug=True)
 
         return valid_functions, invalid_functions
 
@@ -102,14 +102,16 @@ class Functions:
     def __init__(self, nmbrs):
         self.nmbrs = nmbrs
 
-    def get(self, debtor_id: str) -> pd.DataFrame:
+    def get(self, debtor_id: str) -> (pd.DataFrame, pd.DataFrame):
         try:
             request = requests.Request(method='GET',
                                        url=f"{self.nmbrs.base_url}debtors/{debtor_id}/functions")
 
             data = self.nmbrs.get_paginated_result(request)
             df = pd.DataFrame(data)
+            valid_functions, invalid_functions = BrynQFunctions.validate_data(df=df, schema=FunctionGet, debug=True)
+
         except requests.HTTPError as e:
             df = pd.DataFrame()
 
-        return df
+        return valid_functions, invalid_functions

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/hours.py

@@ -46,7 +46,7 @@ class VariableHours:
 
         df = pd.DataFrame(data)
         
-        df['employee_id'] = employee_id  # Add employee_id for tracking
+        df['employeeId'] = employee_id  # Add employee_id for tracking
 
         # Validate data using the schema
         valid_hours, invalid_hours = Functions.validate_data(df=df, schema=VariableHoursGet, debug=True)

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/salary_tables.py

@@ -5,7 +5,8 @@ from zeep.ns import WSDL, SOAP_ENV_11
 from zeep.xsd import ComplexType, Element, String
 from zeep.helpers import serialize_object
 # import logging
-
+from brynq_sdk_functions import Functions
+from .schemas.salary import SalaryTableGet, SalaryScalesGet, SalaryStepsGet
 
 
 class SalaryTables:
@@ -13,7 +14,7 @@ class SalaryTables:
         self.nmbrs = nmbrs
         self.soap_client = nmbrs.soap_client
 
-    def get(self, period: int, year: int) -> pd.DataFrame:
+    def get(self, period: int, year: int) -> (pd.DataFrame, pd.DataFrame):
         """
         Get salary tables for all companies for a specific period and year.
         
@@ -28,11 +29,13 @@ class SalaryTables:
         for company in self.nmbrs.soap_company_ids.to_dict(orient='records'):
             salary_table_temp = self._get(company['i_d'], period, year)
             if not salary_table_temp.empty:
-                salary_table_temp['company_id'] = company['number']
+                salary_table_temp['companyId'] = company['number']
                 salary_tables = pd.concat([salary_tables, salary_table_temp])
-            
+
+        valid_salary_tables, invalid_salary_tables = Functions.validate_data(df=salary_tables, schema=SalaryTableGet, debug=True)
+
         # No validation schema for now, but could be added later
-        return salary_tables
+        return valid_salary_tables, invalid_salary_tables
 
     def _get(self, company_id: int, period: int, year: int) -> pd.DataFrame:
         """
@@ -85,7 +88,7 @@ class SalaryScales:
         self.nmbrs = nmbrs
         self.soap_client = nmbrs.soap_client
 
-    def get(self, period: int, year: int) -> pd.DataFrame:
+    def get(self, period: int, year: int) -> (pd.DataFrame, pd.DataFrame):
         """
         Get salary scales for all companies for a specific period and year.
         
@@ -100,11 +103,12 @@ class SalaryScales:
         for company in self.nmbrs.soap_company_ids.to_dict(orient='records'):
             salary_scale_temp = self._get(company['i_d'], period, year)
             if not salary_scale_temp.empty:
-                salary_scale_temp['company_id'] = company['number']
+                salary_scale_temp['companyId'] = company['number']
                 salary_scales = pd.concat([salary_scales, salary_scale_temp])
-            
-        # No validation schema for now, but could be added later
-        return salary_scales
+
+        valid_salary_scales, invalid_salary_scales = Functions.validate_data(df=salary_scales, schema=SalaryScalesGet, debug=True)
+
+        return valid_salary_scales, invalid_salary_scales
 
     def _get(self, company_id: int, period: int, year: int) -> pd.DataFrame:
         """
@@ -157,7 +161,7 @@ class SalarySteps:
         self.nmbrs = nmbrs
         self.soap_client = nmbrs.soap_client
 
-    def get(self, period: int, year: int, scale: dict) -> pd.DataFrame:
+    def get(self, period: int, year: int, scale: dict) -> (pd.DataFrame, pd.DataFrame):
         """
         Get salary steps for all companies for a specific period, year and scale.
         
@@ -178,11 +182,12 @@ class SalarySteps:
         for company in self.nmbrs.soap_company_ids.to_dict(orient='records'):
             salary_steps_temp = self._get(company['i_d'], period, year, scale)
             if not salary_steps_temp.empty:
-                salary_steps_temp['company_id'] = company['number']
+                salary_steps_temp['companyId'] = company['number']
                 salary_steps = pd.concat([salary_steps, salary_steps_temp])
-            
-        # No validation schema for now, but could be added later
-        return salary_steps
+
+        valid_salary_steps, invalid_salary_steps = Functions.validate_data(df=salary_steps, schema=SalaryStepsGet, debug=True)
+
+        return valid_salary_steps, invalid_salary_steps
 
     def _get(self, company_id: int, period: int, year: int, scale: dict) -> pd.DataFrame:
         """

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schedules.py

@@ -68,10 +68,10 @@ class Schedule:
             schedule_data["startDate"] = data["start_date_schedule"]
 
         # Optional field
-        if "weekly_hours" in data:
+        if "hours_per_week" in data:
             # Handle NaN values
-            if not isinstance(data["weekly_hours"], float) or not math.isnan(data["weekly_hours"]):
-                schedule_data["hoursPerWeek"] = data["weekly_hours"]
+            if not isinstance(data["hours_per_week"], float) or not math.isnan(data["hours_per_week"]):
+                schedule_data["hoursPerWeek"] = data["hours_per_week"]
 
         # Create week1 and week2 data
         week1_data = {}

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/__init__.py

@@ -5,7 +5,7 @@ DATEFORMAT = '%Y%m%d'
 from .address import AddressGet, AddressCreate, AddressUpdate, AddressDelete
 from .bank import BankGet, BankCreate, BankUpdate, BankDelete
 from .contracts import ContractGet, ContractCreate, ContractUpdate, ContractDelete
-from .department import DepartmentGet, DepartmentCreate, DepartmentUpdate, DepartmentDelete
+from .department import EmployeeDepartmentGet, DepartmentCreate, DepartmentUpdate, DepartmentDelete, DepartmentGet
 from .employees import EmployeeGet, EmployeeCreate, EmployeeUpdate, EmployeeDelete
 from .employment import EmploymentGet, EmploymentCreate, EmploymentUpdate, EmploymentDelete
 from .function import FunctionGet, FunctionCreate, FunctionUpdate, FunctionDelete
@@ -19,7 +19,7 @@ __all__ = [
     'AddressGet', 'AddressCreate', 'AddressUpdate', 'AddressDelete',
     'BankGet', 'BankCreate', 'BankUpdate', 'BankDelete',
     'ContractGet', 'ContractCreate', 'ContractUpdate', 'ContractDelete',
-    'DepartmentGet', 'DepartmentCreate', 'DepartmentUpdate', 'DepartmentDelete',
+    'EmployeeDepartmentGet', 'DepartmentCreate', 'DepartmentUpdate', 'DepartmentDelete', 'DepartmentGet',
     'EmployeeGet', 'EmployeeCreate', 'EmployeeUpdate', 'EmployeeDelete',
     'EmploymentGet', 'EmploymentCreate', 'EmploymentUpdate', 'EmploymentDelete',
     'FunctionGet', 'FunctionCreate', 'FunctionUpdate', 'FunctionDelete',

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/address.py

@@ -27,8 +27,8 @@ class AddressGet(BrynQPanderaDataFrameModel):
     city: Series[String] = pa.Field(coerce=True, description="City", alias="city")
     state_province: Series[String] = pa.Field(coerce=True, nullable=True, description="State or Province", alias="stateProvince")
     country_i_s_o_code: Series[String] = pa.Field(coerce=True, nullable=True, description="Country ISO code", alias="countryISOCode")
-    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Year", alias="periodYear")
-    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Period", alias="periodPeriod")
+    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Year", alias="period.year")
+    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Period", alias="period.period")
 
     class _Annotation:
         primary_key = "address_id"
@@ -64,11 +64,11 @@ class AddressCreate(BaseModel):
     city: str = Field(..., min_length=1, max_length=100, example="Amsterdam", description="City", alias="city")
     state_province: Optional[str] = Field(None, max_length=100, example="Noord-Holland", description="State or Province", alias="stateProvince")
     country_iso_code: Annotated[
-        str, 
+        str,
         StringConstraints(
-            pattern=r'^[A-Za-z]+$', 
+            pattern=r'^[A-Za-z]+$',
             strip_whitespace=True,
-            min_length=2, 
+            min_length=2,
             max_length=3
         )
     ] = Field(..., example="NL", description="Country ISO Code", alias="countryISOCode")
@@ -91,15 +91,15 @@ class AddressUpdate(BaseModel):
     city: str = Field(..., min_length=1, max_length=100, example="Amsterdam", description="City", alias="city")
     state_province: Optional[str] = Field(None, max_length=100, example="Noord-Holland", description="State or Province", alias="stateProvince")
     country_iso_code: Annotated[
-        str, 
+        str,
         StringConstraints(
-            pattern=r'^[A-Za-z]+$', 
+            pattern=r'^[A-Za-z]+$',
             strip_whitespace=True,
-            min_length=2, 
+            min_length=2,
             max_length=3
         )
     ] = Field(..., example="NL")
     period_details: Period
 
 class AddressDelete(BaseModel):
-    address_id: str = Field(..., description="Address ID", example="cc3449f5-9941-4209-be36-187a16267394", alias="addressId")
+    address_id: str = Field(..., description="Address ID", example="cc3449f5-9941-4209-be36-187a16267394", alias="addressId")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/bank.py

@@ -28,7 +28,7 @@ class BankGet(BrynQPanderaDataFrameModel):
     bank_account_id: Series[String] = pa.Field(coerce=True, nullable=True, description="Bank Account ID", alias="bankAccountId")
     number: Series[String] = pa.Field(coerce=True, nullable=True, description="Bank Account Number", alias="number")
     description: Series[String] = pa.Field(coerce=True, nullable=True, description="Bank Account Description", alias="description")
-    i_b_a_n: Series[String] = pa.Field(coerce=True, nullable=True, description="IBAN", alias="iban")
+    iban: Series[String] = pa.Field(coerce=True, nullable=True, description="IBAN", alias="IBAN")
     city: Series[String] = pa.Field(coerce=True, nullable=True, description="City Bank", alias="city")
     name: Series[String] = pa.Field(coerce=True, nullable=True, description="Name Bank", alias="name")
     bank_account_type: Series[String] = pa.Field(

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/contracts.py

@@ -19,7 +19,7 @@ class ContractGet(BrynQPanderaDataFrameModel):
     end_date: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="End Date Contract", alias="endDate")
     indefinite: Series[Bool] = pa.Field(coerce=True, description="Indefinite Contract", alias="indefinite")
     written_contract: Series[Bool] = pa.Field(coerce=True, description="Written Contract", alias="writtenContract")
-    hours_per_week: Series[Float] = pa.Field(coerce=True, nullable=True, description="Contract Hours per Week", alias="hoursPerWeek")
+    weekly_hours: Series[Float] = pa.Field(coerce=True, nullable=True, description="Contract Hours per Week", alias="hoursPerWeek")
     created_at: Series[DateTime] = pa.Field(coerce=True, description="Contract Created At", alias="createdAt")
 
     class _Annotation:
@@ -36,12 +36,12 @@ class ContractGet(BrynQPanderaDataFrameModel):
 # Upload Schemas
 # ---------------------------
 class ContractCreate(BaseModel):
-    start_date: datetime = Field(..., example="2021-01-01T09:29:18Z", description="Start Date Contract", alias="startDate")
+    start_date_contract: datetime = Field(..., example="2021-01-01T09:29:18Z", description="Start Date Contract", alias="startDate")
     trial_period: Optional[datetime] = Field(None, example="2021-02-01T00:00:00Z", description="Trial Period Contract", alias="trialPeriod")
-    end_date: Optional[datetime] = Field(None, example="2021-08-24T14:15:22Z", description="End Date Contract", alias="endDate")
-    indefinite: bool = Field(..., example=True, description="Indefinite Contract", alias="indefinite")
+    end_date_contract: Optional[datetime] = Field(None, example="2021-08-24T14:15:22Z", description="End Date Contract", alias="endDate")
+    indefinite_contract: bool = Field(..., example=True, description="Indefinite Contract", alias="indefinite")
     written_contract: Optional[bool] = Field(None, example=True, description="Written Contract", alias="writtenContract")
-    hours_per_week: Optional[float] = Field(None, ge=0, le=168, example=40, description="Contract Hours per Week", alias="hoursPerWeek")
+    weekly_hours: Optional[float] = Field(None, ge=0, le=168, example=40, description="Contract Hours per Week", alias="hoursPerWeek")
 
 class ContractUpdate(BaseModel):
     contract_id: str = Field(..., example="e35e343b-55a3-4e44-bc4b-f41c3b93bcf5", description="Contract ID", alias="contractId")
@@ -49,7 +49,7 @@ class ContractUpdate(BaseModel):
     end_date: Optional[datetime] = Field(None, example="2021-12-31T00:00:00Z", description="End Date Contract", alias="endDate")
     indefinite: bool = Field(..., example=True, description="Indefinite Contract", alias="indefinite")
     written_contract: Optional[bool] = Field(None, example=True, description="Written Contract", alias="writtenContract")
-    hours_per_week: Optional[float] = Field(None, ge=0, le=168, example=20, description="Contract Hours per Week", alias="hoursPerWeek")
+    weekly_hours: Optional[float] = Field(None, ge=0, le=168, example=20, description="Contract Hours per Week", alias="hoursPerWeek")
 
     class Config:
         primary_key = "contractId"

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/costcenter.py

@@ -11,19 +11,19 @@ from datetime import datetime
 # ---------------------------
 # Get Schemas
 # ---------------------------
-class EmployeeCostcenterGet(pa.DataFrameModel):
+class EmployeeCostcenterGet(BrynQPanderaDataFrameModel):
     employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     employee_cost_center_id: Series[String] = pa.Field(coerce=True, description="Employee Cost Center ID", alias="employeeCostCenterId")
-    cost_centers_cost_center_id: Series[String] = pa.Field(coerce=True, description="Cost Center ID", alias="costCentersCostCenterId")
-    cost_centers_code: Series[String] = pa.Field(coerce=True, description="Cost Centers Code", alias="costCentersCode")
-    cost_centers_description: Series[String] = pa.Field(coerce=True, description="Cost Centers Description", alias="costCentersDescription")
-    cost_units_cost_unit_id: Series[String] = pa.Field(coerce=True, description="Cost Unit ID", alias="costUnitsCostUnitId")
-    cost_units_code: Series[String] = pa.Field(coerce=True, description="Cost Unit Code", alias="costUnitsCode")
-    cost_units_description: Series[String] = pa.Field(coerce=True, description="Cost Unit Description", alias="costUnitsDescription")
+    cost_centers_cost_center_id: Series[String] = pa.Field(coerce=True, description="Cost Center ID", alias="costCenters.costCenterId")
+    cost_centers_code: Series[String] = pa.Field(coerce=True, description="Cost Centers Code", alias="costCenters.code")
+    cost_centers_description: Series[String] = pa.Field(coerce=True, description="Cost Centers Description", alias="costCenters.description")
+    cost_units_cost_unit_id: Series[String] = pa.Field(coerce=True, description="Cost Unit ID", alias="costUnits.costUnitId")
+    cost_units_code: Series[String] = pa.Field(coerce=True, description="Cost Unit Code", alias="costUnits.code")
+    cost_units_description: Series[String] = pa.Field(coerce=True, description="Cost Unit Description", alias="costUnits.description")
     percentage: Series[Float] = pa.Field(coerce=True, description="Percentage", alias="percentage")
     default: Series[Bool] = pa.Field(coerce=True, description="Default", alias="default")
-    period_year: Series[int] = pa.Field(coerce=True, description="Year", alias="periodYear")
-    period_period: Series[int] = pa.Field(coerce=True, description="Period", alias="periodPeriod")
+    period_year: Series[int] = pa.Field(coerce=True, description="Year", alias="period.year")
+    period_period: Series[int] = pa.Field(coerce=True, description="Period", alias="period.period")
     created_at: Series[DateTime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
 
     class _Annotation:
@@ -36,7 +36,7 @@ class EmployeeCostcenterGet(pa.DataFrameModel):
             }
         }
 
-class CostcenterGet(pa.DataFrameModel):
+class CostcenterGet(BrynQPanderaDataFrameModel):
     cost_center_id: Series[String] = pa.Field(coerce=True, description="Cost Center ID", alias="costCenterId")
     code: Series[String] = pa.Field(coerce=True, description="Code", alias="code")
     description: Series[String] = pa.Field(coerce=True, description="Description", alias="description")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/costunit.py

@@ -11,7 +11,7 @@ from datetime import datetime
 # ---------------------------
 # Get Schemas
 # ---------------------------
-class CostunitGet(pa.DataFrameModel):
+class CostunitGet(BrynQPanderaDataFrameModel):
     cost_unit_id: Series[String] = pa.Field(coerce=True, description="Cost Unit ID", alias="costUnitId")
     code: Series[String] = pa.Field(coerce=True, description="Cost Unit Code", alias="code")
     description: Series[String] = pa.Field(coerce=True, description="Cost Unit Description", alias="description")

brynq_sdk_nmbrs-2.0.1/brynq_sdk_nmbrs/schemas/debtor.py

@@ -0,0 +1,16 @@
+import pandas as pd
+import pandera as pa
+from pandera import Bool
+from pandera.typing import Series, String, Float, DateTime
+import pandera.extensions as extensions
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
+from typing import Optional, Annotated
+from pydantic import BaseModel, Field, StringConstraints
+
+# ---------------------------
+# Get Schemas
+# ---------------------------
+class DebtorsGet(BrynQPanderaDataFrameModel):
+    debtor_id: Series[String] = pa.Field(coerce=True, description="Debtor ID", alias="debtorId")
+    number: Series[String] = pa.Field(coerce=True, description="Debtor number", alias="number")
+    name: Series[Bool] = pa.Field(coerce=True, description="Debtor name", alias="name")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/department.py

@@ -10,14 +10,14 @@ from pydantic import BaseModel, Field
 # ---------------------------
 # Get Schemas
 # ---------------------------
-class DepartmentGet(BrynQPanderaDataFrameModel):
+class EmployeeDepartmentGet(BrynQPanderaDataFrameModel):
     employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     department_id: Series[String] = pa.Field(coerce=True, description="Department ID", alias="departmentId")
     code: Series[String] = pa.Field(coerce=True, description="Department Code", alias="code")
     description: Series[String] = pa.Field(coerce=True, description="Department Description", alias="description")
     created_at: Series[DateTime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
-    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="periodPeriod")
-    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="periodYear")
+    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="period.period")
+    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="period.year")
 
     class _Annotation:
         primary_key = "department_id"
@@ -36,6 +36,16 @@ class Period(BaseModel):
     year: int = Field(..., ge=1900, le=2100, example=2021, description="Year", alias="year")
     period: int = Field(..., ge=1, le=53, example=4, description="Period", alias="period")
 
+class DepartmentGet(BrynQPanderaDataFrameModel):
+    department_id: Series[String] = pa.Field(coerce=True, description="Department ID", alias="departmentId")
+    code: Series[String] = pa.Field(coerce=True, description="Department Code", alias="code")
+    description: Series[String] = pa.Field(coerce=True, description="Department Description", alias="description")
+    created_at: Series[DateTime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
+    manager_id: Series[String] = pa.Field(coerce=True, description="Manager ID", alias="managers.managerId")
+    first_name: Optional[Series[String]] = pa.Field(nullable=True, coerce=True, description="Departmentmanager firstname", alias="managers.firstName")
+    last_name: Optional[Series[String]] = pa.Field(nullable=True, coerce=True, description="Departmentmanager lastname", alias="managers.lastName")
+    email: Optional[Series[String]] = pa.Field(nullable=True, coerce=True, description="Departmentmanager email", alias="managers.email")
+
 class DepartmentCreate(BaseModel):
     code: int = Field(..., ge=1, example=2, description="Department Code", alias="code")
     description: str = Field(..., min_length=1, max_length=200, example="Sales", description="Department Description", alias="description")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/employees.py

@@ -13,30 +13,30 @@ from pydantic import BaseModel, Field, StringConstraints
 class EmployeeGet(BrynQPanderaDataFrameModel):
     employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     personal_info_id: Series[String] = pa.Field(coerce=True, description="Personal Info ID", alias="personalInfoId")
-    created_at: Series[DateTime] = pa.Field(coerce=True, description="Employee Created At", alias="createdAt")
-    basic_info_employee_number: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee Number", alias="employeeNumber")
-    basic_info_first_name: Series[String] = pa.Field(coerce=True, nullable=True, description="First Name", alias="firstName")
-    basic_info_first_name_in_full: Series[String] = pa.Field(coerce=True, nullable=True, description="First Name In Full", alias="firstNameInFull")
-    basic_info_prefix: Series[String] = pa.Field(coerce=True, nullable=True, description="Prefix", alias="prefix")
-    basic_info_initials: Series[String] = pa.Field(coerce=True, nullable=True, description="Initials", alias="initials")
-    basic_info_last_name: Series[String] = pa.Field(coerce=True, description="Last Name", alias="lastName")
-    basic_info_employee_type: Series[String] = pa.Field(coerce=True, description="Employee Type", alias="employeeType")
-    birth_info_birth_date: Series[DateTime] = pa.Field(coerce=True, description="Birth Date", alias="birthDate")
-    birth_info_birth_country_code_i_s_o: Series[String] = pa.Field(coerce=True, nullable=True, description="Birth Country Code ISO", alias="birthCountryCodeISO")
-    birth_info_nationality_code_i_s_o: Series[String] = pa.Field(coerce=True, nullable=True, description="Nationality Code ISO", alias="nationalityCodeISO")
-    birth_info_gender: Series[String] = pa.Field(coerce=True, nullable=True, description="Gender", alias="gender")
-    contact_info_private_email: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Email", alias="privateEmail")
-    contact_info_business_email: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Email", alias="businessEmail")
-    contact_info_business_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Phone", alias="businessPhone")
-    contact_info_business_mobile_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Mobile Phone", alias="businessMobilePhone")
-    contact_info_private_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Phone", alias="privatePhone")
-    contact_info_private_mobile_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Mobile Phone", alias="privateMobilePhone")
-    contact_info_other_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Other Phone", alias="otherPhone")
-    partner_info_partner_prefix: Series[String] = pa.Field(coerce=True, nullable=True, description="Partner Prefix", alias="partnerPrefix")
-    partner_info_partner_name: Series[String] = pa.Field(coerce=True, nullable=True, description="Partner Name", alias="partnerName")
-    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="periodYear")
-    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="periodPeriod")
-    birth_info_birth_country: Series[String] = pa.Field(coerce=True, nullable=True, description="Birth Country", alias="birthCountry")
+    created_at: Series[DateTime] = pa.Field(coerce=True, description="Employee Created At", alias="createdAt", nullable=True)
+    basic_info_employee_number: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee Number", alias="basicInfo.employeeNumber")
+    basic_info_first_name: Series[String] = pa.Field(coerce=True, nullable=True, description="First Name", alias="basicInfo.firstName")
+    basic_info_first_name_in_full: Series[String] = pa.Field(coerce=True, nullable=True, description="First Name In Full", alias="basicInfo.firstNameInFull")
+    basic_info_prefix: Series[String] = pa.Field(coerce=True, nullable=True, description="Prefix", alias="basicInfo.prefix")
+    basic_info_initials: Series[String] = pa.Field(coerce=True, nullable=True, description="Initials", alias="basicInfo.initials")
+    basic_info_last_name: Series[String] = pa.Field(coerce=True, description="Last Name", alias="basicInfo.lastName")
+    basic_info_employee_type: Series[String] = pa.Field(coerce=True, description="Employee Type", alias="basicInfo.employeeType")
+    birth_info_birth_date: Series[DateTime] = pa.Field(coerce=True, description="Birth Date", alias="birthInfo.birthDate")
+    birth_info_birth_country_code_iso: Series[String] = pa.Field(coerce=True, nullable=True, description="Birth Country Code ISO", alias="birthInfo.birthCountry.codeISO")
+    birth_info_nationality_code_iso: Series[String] = pa.Field(coerce=True, nullable=True, description="Nationality Code ISO", alias="birthInfo.nationality.codeISO")
+    birth_info_gender: Series[String] = pa.Field(coerce=True, nullable=True, description="Gender", alias="birthInfo.gender")
+    contact_info_private_email: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Email", alias="contactInfo.privateEmail")
+    contact_info_business_email: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Email", alias="contactInfo.businessEmail")
+    contact_info_business_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Phone", alias="contactInfo.businessPhone")
+    contact_info_business_mobile_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Mobile Phone", alias="contactInfo.businessMobilePhone")
+    contact_info_private_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Phone", alias="contactInfo.privatePhone")
+    contact_info_private_mobile_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Mobile Phone", alias="contactInfo.privateMobilePhone")
+    contact_info_other_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Other Phone", alias="contactInfo.otherPhone")
+    partner_info_partner_prefix: Series[String] = pa.Field(coerce=True, nullable=True, description="Partner Prefix", alias="partnerInfo.partnerPrefix")
+    partner_info_partner_name: Series[String] = pa.Field(coerce=True, nullable=True, description="Partner Name", alias="partnerInfo.partnerName")
+    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="period.year")
+    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="period.period")
+    birth_info_birth_country: Series[String] = pa.Field(coerce=True, nullable=True, description="Birth Country", alias="birthInfo.birthCountry")
     company_id: Series[String] = pa.Field(coerce=True, description="Company ID", alias="companyId")
 
     class _Annotation:
@@ -46,14 +46,14 @@ class EmployeeGet(BrynQPanderaDataFrameModel):
 # Upload Schemas
 # ---------------------------
 class BasicInfo(BaseModel):
-    employee_number: Optional[int] = Field(None, ge=1, example=98072, description="Employee Number", alias="employeeNumber")
+    employee_id: Optional[int] = Field(None, ge=1, example=98072, description="Employee Number", alias="employeeNumber")
     first_name: Optional[str] = Field(None, max_length=50, example="John", description="First Name", alias="firstName")
     first_name_in_full: Optional[str] = Field(None, max_length=100, example="John in Full", description="First Name In Full", alias="firstNameInFull")
     prefix: Optional[str] = Field(None, max_length=50, example="van der", description="Prefix", alias="prefix")
     initials: Optional[str] = Field(None, max_length=50, example="J.D.", description="Initials", alias="initials")
     last_name: str = Field(..., max_length=100, example="Doe", description="Last Name", alias="lastName")
     employee_type: Annotated[
-        str, 
+        str,
         StringConstraints(
             pattern=r'^(applicant|newHire|payroll|formerPayroll|external|formerExternal|rejectedApplicant)$',
             strip_whitespace=True
@@ -63,26 +63,26 @@ class BasicInfo(BaseModel):
 class BirthInfo(BaseModel):
     birth_date: Optional[str] = Field(None, example="1980-02-27", description="Birth Date", alias="birthDate")
     birth_country_code_iso: Optional[Annotated[
-        str, 
+        str,
         StringConstraints(
             pattern=r'^[A-Za-z]+$',
             strip_whitespace=True,
-            min_length=2, 
+            min_length=2,
             max_length=3
         )
     ]] = Field(None, example="NL", description="Birth Country Code ISO", alias="birthCountryCodeISO")
     nationality_code_iso: Optional[Annotated[
-        str, 
+        str,
         StringConstraints(
             pattern=r'^[A-Za-z]+$',
             strip_whitespace=True,
-            min_length=2, 
+            min_length=2,
             max_length=3
         )
     ]] = Field(None, example="PT", description="Nationality Code ISO", alias="nationalityCodeISO")
     deceased_on: Optional[str] = Field(None, example="1980-02-27", description="Deceased On", alias="deceasedOn")
     gender: Optional[Annotated[
-        str, 
+        str,
         StringConstraints(
             pattern=r'^(unspecified|male|female|unknown)$',
             strip_whitespace=True
@@ -112,27 +112,27 @@ class AdditionalEmployeeInfo(BaseModel):
     default_employee_template: Optional[str] = Field(None, description="Default Employee Template", alias="defaultEmployeeTemplate")
 
 class CreateEmployeePersonalInfo(BaseModel):
-    basic_info: BasicInfo
-    birth_info: BirthInfo
-    contact_info: ContactInfo
-    partner_info: PartnerInfo
-    period: Period
+    basic_info: BasicInfo  = Field(..., alias="basicInfo")
+    birth_info: BirthInfo = Field(..., alias="birthInfo")
+    contact_info: ContactInfo = Field(..., alias="contactInfo")
+    partner_info: PartnerInfo = Field(..., alias="partnerInfo")
+    period: Period = Field(..., alias="period")
     created_at: Optional[str] = Field(None, example="2021-07-01T10:15:08Z", description="Created At", alias="createdAt")
 
 class EmployeeCreate(BaseModel):
-    personal_info: CreateEmployeePersonalInfo
-    additional_employee_info: AdditionalEmployeeInfo
+    personal_info: CreateEmployeePersonalInfo = Field(..., alias="personalInfo")
+    additional_employee_info: AdditionalEmployeeInfo = Field(..., alias="additionalEmployeeInfo")
 
 class UpdateEmployeePersonalInfo(BaseModel):
-    basic_info: Optional[BasicInfo] = None
-    birth_info: Optional[BirthInfo] = None
-    contact_info: Optional[ContactInfo] = None
-    partner_info: Optional[PartnerInfo] = None
-    period: Period
+    basic_info: Optional[BasicInfo] = Field(None, alias="basicInfo")
+    birth_info: Optional[BirthInfo] = Field(None, alias="birthInfo")
+    contact_info: Optional[ContactInfo] = Field(None, alias="contactInfo")
+    partner_info: Optional[PartnerInfo] = Field(None, alias="partnerInfo")
+    period: Period = Field(..., alias="period")
 
 class EmployeeUpdate(BaseModel):
     employee_id: str = Field(..., example="d30ec597-bd29-453e-9613-7786297eedcc", description="Employee ID", alias="employeeId")
-    personal_info: UpdateEmployeePersonalInfo
+    personal_info: UpdateEmployeePersonalInfo = Field(..., alias="personalInfo")
 
 class EmployeeDelete(BaseModel):
-    employee_id: str = Field(..., example="3054d4cf-b449-489d-8d2e-5dd30e5ab994", description="Employee ID", alias="employeeId")
+    employee_id: str = Field(..., example="3054d4cf-b449-489d-8d2e-5dd30e5ab994", description="Employee ID", alias="employeeId")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/function.py

@@ -12,14 +12,14 @@ from pydantic import BaseModel, Field
 # ---------------------------
 # Get Schemas
 # ---------------------------
-class FunctionGet(BrynQPanderaDataFrameModel):
+class EmployeeFunctionGet(BrynQPanderaDataFrameModel):
     employee_id: Series[pa.String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     function_id: Series[pa.String] = pa.Field(coerce=True, description="Function ID", alias="functionId")
     code: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Function Code", alias="code")
     description: Series[pa.String] = pa.Field(coerce=True, description="Function Description", alias="description")
     created_at: Series[datetime] = pa.Field(coerce=True, description="Function Created At", alias="createdAt")
-    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="periodPeriod")
-    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="periodYear")
+    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="period.period")
+    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="period.year")
 
     class _Annotation:
         primary_key = "function_id"
@@ -38,6 +38,12 @@ class Period(BaseModel):
     year: int = Field(..., ge=1900, le=2100, example=2021, description="Year", alias="year")
     period: int = Field(..., ge=1, le=53, example=4, description="Period", alias="period")
 
+class FunctionGet(BrynQPanderaDataFrameModel):
+    function_id: Series[pa.String] = pa.Field(coerce=True, description="Function ID", alias="functionId")
+    code: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Function Code", alias="code")
+    description: Series[pa.String] = pa.Field(coerce=True, description="Function Description", alias="description")
+    created_at: Series[datetime] = pa.Field(coerce=True, description="Function Created At", alias="createdAt")
+
 class FunctionCreate(BaseModel):
     code: int = Field(..., ge=1, example=1, description="Function Code", alias="code")
     description: str = Field(..., max_length=200, example="Sales Lead", description="Function Description", alias="description")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/salary.py

@@ -57,7 +57,7 @@ class SalaryCreate(BaseModel):
             strip_whitespace=True
         )
     ]] = Field(None, example="grossFulltimeSalary", description="Salary Type", alias="type")
-    value: Optional[float] = Field(None, ge=0, example=3480.95, description="Value", alias="value")
+    salary_amount: Optional[float] = Field(None, ge=0, example=3480.95, description="Value", alias="value")
     salary_table_id: Optional[str] = Field(None, example="e17a06f1-ae4c-4098-92a6-87976ea7dc9a", description="Salary Table ID", alias="salaryTableId")
     scale_id: Optional[str] = Field(None, example="d5f761c0-20e7-490b-b756-644739fa6120", description="Scale ID", alias="scaleId")
     step_id: Optional[str] = Field(None, example="c9c6feef-cd69-4773-8602-f70fa3b561e4", description="Step ID", alias="stepId")
@@ -74,4 +74,26 @@ class SalaryUpdate(BaseModel):
     value: Optional[float] = Field(None, ge=0, example=4000.5, description="Value", alias="value")
 
 class SalaryDelete(BaseModel):
-    salary_id: str = Field(..., example="77985371-e121-489e-8ec8-c0b1b03963ce", description="Salary ID", alias="salaryId")
+    salary_id: str = Field(..., example="77985371-e121-489e-8ec8-c0b1b03963ce", description="Salary ID", alias="salaryId")
+
+class SalaryTableGet(BrynQPanderaDataFrameModel):
+    code: Series[String] = pa.Field(coerce=True, description="Salary Code", alias="Code")
+    description: Series[String] = pa.Field(coerce=True, description="Salary Description", alias="Description")
+    guid_salary_table: Series[String] = pa.Field(coerce=True, description="GUID Salary table", alias="GuidSalaryTable")
+    company_id: Series[String] = pa.Field(coerce=True, description="Company ID", alias="companyId")
+
+class SalaryScalesGet(BrynQPanderaDataFrameModel):
+    scale: Series[String] = pa.Field(coerce=True, description="Salary Scale", alias="Scale")
+    description: Series[String] = pa.Field(coerce=True, description="Salary Scale Description", alias="SchaalDescription")
+    scale_value: Series[String] = pa.Field(coerce=True, description="Salary Scale Value", alias="ScaleValue")
+    scale_percentage_max: Series[String] = pa.Field(coerce=True, description="Salary Scale Max Percentage", alias="ScalePercentageMax")
+    scale_percentage_min: Series[String] = pa.Field(coerce=True, description="Salary Scale Min Percentage", alias="ScalePercentageMin")
+    guid_salary_table_scale: Series[String] = pa.Field(coerce=True, description="GUID Salary table scale", alias="GuidSalaryTableScale")
+    company_id: Series[String] = pa.Field(coerce=True, description="Company ID", alias="companyId")
+
+class SalaryStepsGet(BrynQPanderaDataFrameModel):
+    step: Series[String] = pa.Field(coerce=True, description="Salary Step", alias="Step")
+    step_description: Series[String] = pa.Field(coerce=True, description="Salary Step Description", alias="StepDescription")
+    step_value: Series[String] = pa.Field(coerce=True, description="Salary Step Value", alias="StepValue")
+    guid_salary_table_step: Series[String] = pa.Field(coerce=True, description="GUID Salary Step table", alias="GuidSalaryTableStep")
+    company_id: Series[String] = pa.Field(coerce=True, description="Company ID", alias="companyId")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs/schemas/schedules.py

@@ -11,28 +11,37 @@ from pydantic import BaseModel, Field
 # ---------------------------
 # Get Schemas
 # ---------------------------
-class ScheduleGet(pa.DataFrameModel):
+class ScheduleGet(BrynQPanderaDataFrameModel):
     schedule_id: Series[String] = pa.Field(coerce=True, description="Schedule ID", alias="scheduleId")
     start_date: Series[datetime] = pa.Field(coerce=True, description="Start Date", alias="startDate")
     parttime_percentage: Series[Float] = pa.Field(coerce=True, description="Part-Time Percentage", alias="parttimePercentage")
-    week1_hours_monday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Monday", alias="week1HoursMonday")
-    week1_hours_tuesday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Tuesday", alias="week1HoursTuesday")
-    week1_hours_wednesday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Wednesday", alias="week1HoursWednesday")
-    week1_hours_thursday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Thursday", alias="week1HoursThursday")
-    week1_hours_friday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Friday", alias="week1HoursFriday")
-    week1_hours_saturday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Saturday", alias="week1HoursSaturday")
-    week1_hours_sunday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Sunday", alias="week1HoursSunday")
-    week2_hours_monday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Monday", alias="week2HoursMonday")
-    week2_hours_tuesday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Tuesday", alias="week2HoursTuesday")
-    week2_hours_wednesday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Wednesday", alias="week2HoursWednesday")
-    week2_hours_thursday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Thursday", alias="week2HoursThursday")
-    week2_hours_friday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Friday", alias="week2HoursFriday")
-    week2_hours_saturday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Saturday", alias="week2HoursSaturday")
-    week2_hours_sunday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Sunday", alias="week2HoursSunday")
+    week1_hours_monday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Monday", alias="week1.hoursMonday")
+    week1_hours_tuesday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Tuesday", alias="week1.hoursTuesday")
+    week1_hours_wednesday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Wednesday", alias="week1.hoursWednesday")
+    week1_hours_thursday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Thursday", alias="week1.hoursThursday")
+    week1_hours_friday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Friday", alias="week1.hoursFriday")
+    week1_hours_saturday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Saturday", alias="week1.hoursSaturday")
+    week1_hours_sunday: Series[Float] = pa.Field(coerce=True, description="Week 1 Hours Sunday", alias="week1.hoursSunday")
+    week2_hours_monday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Monday", alias="week2.hoursMonday")
+    week2_hours_tuesday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Tuesday", alias="week2.hoursTuesday")
+    week2_hours_wednesday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Wednesday", alias="week2.hoursWednesday")
+    week2_hours_thursday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Thursday", alias="week2.hoursThursday")
+    week2_hours_friday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Friday", alias="week2.hoursFriday")
+    week2_hours_saturday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Saturday", alias="week2.hoursSaturday")
+    week2_hours_sunday: Series[Float] = pa.Field(coerce=True, description="Week 2 Hours Sunday", alias="week2.hoursSunday")
     created_at: Series[datetime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
 
     class _Annotation:
         primary_key = "schedule_id"
+        foreign_keys = {
+            "employee_id": {
+                "parent_schema": "EmployeeSchema",
+                "parent_column": "employee_id",
+                "cardinality": "N:1"
+            }
+        }
+
 
 # ---------------------------
 # Upload Schemas
@@ -51,7 +60,7 @@ class ScheduleCreate(BaseModel):
     """
     Pydantic model for creating a new schedule
     """
-    start_date: datetime = Field(..., description="Start date of the schedule", example="2021-01-01T09:29:18Z", alias="startDate")
+    start_date_schedule: datetime = Field(..., description="Start date of the schedule", example="2021-01-01T09:29:18Z", alias="startDate")
     hours_per_week: Optional[float] = Field(None, description="Hours per week", example=40, alias="hoursPerWeek")
     week1: ScheduleHours = Field(..., description="Week 1 schedule hours", alias="week1")
     week2: ScheduleHours = Field(..., description="Week 2 schedule hours", alias="week2")

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-nmbrs
-Version: 2.0.0
+Version: 2.0.1
 Summary: Nmbrs wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/brynq_sdk_nmbrs.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ brynq_sdk_nmbrs/schemas/bank.py
 brynq_sdk_nmbrs/schemas/contracts.py
 brynq_sdk_nmbrs/schemas/costcenter.py
 brynq_sdk_nmbrs/schemas/costunit.py
+brynq_sdk_nmbrs/schemas/debtor.py
 brynq_sdk_nmbrs/schemas/department.py
 brynq_sdk_nmbrs/schemas/employees.py
 brynq_sdk_nmbrs/schemas/employment.py

{brynq_sdk_nmbrs-2.0.0 → brynq_sdk_nmbrs-2.0.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_nmbrs',
-    version='2.0.0',
+    version='2.0.1',
     description='Nmbrs wrapper from BrynQ',
     long_description='Nmbrs wrapper from BrynQ',
     author='BrynQ',