brynq-sdk-nmbrs 2.3.1__py3-none-any.whl → 2.3.2.dev0__py3-none-any.whl

brynq_sdk_nmbrs/schemas/employees.py

@@ -1,12 +1,15 @@
 import math
+from typing import Annotated, Optional
+
 import pandas as pd
 import pandera as pa
-from pandera.typing import Series, String, DateTime
 import pandera.extensions as extensions
-from brynq_sdk_functions import BrynQPanderaDataFrameModel
-from typing import Optional, Annotated
+from pandera.typing import DateTime, Series, String
 from pydantic import BaseModel, Field, StringConstraints
 
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
+
+
 # ---------------------------
 # Get Schemas
 # ---------------------------
@@ -14,29 +17,30 @@ 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", 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")
+    employee_number: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee Number", alias="basicInfo.employeeNumber")
+    first_name: Series[String] = pa.Field(coerce=True, nullable=True, description="First Name", alias="basicInfo.firstName")
+    first_name_in_full: Series[String] = pa.Field(coerce=True, nullable=True, description="First Name In Full", alias="basicInfo.firstNameInFull")
+    prefix: Series[String] = pa.Field(coerce=True, nullable=True, description="Prefix", alias="basicInfo.prefix")
+    initials: Series[String] = pa.Field(coerce=True, nullable=True, description="Initials", alias="basicInfo.initials")
+    last_name: Series[String] = pa.Field(coerce=True, description="Last Name", alias="basicInfo.lastName")
+    employee_type: Series[String] = pa.Field(coerce=True, description="Employee Type", alias="basicInfo.employeeType")
+    birth_date: Series[DateTime] = pa.Field(coerce=True, description="Birth Date", alias="birthInfo.birthDate")
+    birth_country_code_iso: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Birth Country Code ISO", alias="birthInfo.birthCountry")
+    birth_country: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Birth Country Code ISO", alias="birthInfo.birthCountry.codeISO")
+    birth_country_description: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Birth Country Code ISO", alias="birthInfo.birthCountry.description")
+    nationality_code_iso: Series[String] = pa.Field(coerce=True, nullable=True, description="Nationality Code ISO", alias="birthInfo.nationality.codeISO")
+    gender: Series[String] = pa.Field(coerce=True, nullable=True, description="Gender", alias="birthInfo.gender")
+    private_email: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Email", alias="contactInfo.privateEmail")
+    business_email: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Email", alias="contactInfo.businessEmail")
+    business_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Phone", alias="contactInfo.businessPhone")
+    business_mobile_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Business Mobile Phone", alias="contactInfo.businessMobilePhone")
+    private_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Phone", alias="contactInfo.privatePhone")
+    private_mobile_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Private Mobile Phone", alias="contactInfo.privateMobilePhone")
+    other_phone: Series[String] = pa.Field(coerce=True, nullable=True, description="Other Phone", alias="contactInfo.otherPhone")
+    partner_prefix: Series[String] = pa.Field(coerce=True, nullable=True, description="Partner Prefix", alias="partnerInfo.partnerPrefix")
+    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,7 +50,7 @@ class EmployeeGet(BrynQPanderaDataFrameModel):
 # Upload Schemas
 # ---------------------------
 class BasicInfo(BaseModel):
-    employee_id: Optional[int] = Field(None, ge=1, example=98072, description="Employee Number", alias="employeeNumber")
+    employee_number: 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")
@@ -61,7 +65,7 @@ class BasicInfo(BaseModel):
     ] = Field(..., example="payroll", description="Employee Type", alias="employeeType")
 
 class BasicInfoUpdate(BaseModel):
-    employee_id: Optional[int] = Field(None, ge=1, example=98072, description="Employee Number", alias="employeeNumber")
+    employee_number: 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")
@@ -79,7 +83,7 @@ class BirthInfo(BaseModel):
             max_length=3
         )
     ]] = Field(None, example="NL", description="Birth Country Code ISO", alias="birthCountryCodeISO")
-    nationality: Optional[Annotated[
+    nationality_code_iso: Optional[Annotated[
         str,
         StringConstraints(
             pattern=r'^[A-Za-z]+$',
@@ -92,16 +96,16 @@ class BirthInfo(BaseModel):
     gender: Optional[Annotated[
         str,
         StringConstraints(
-            pattern=r'^(unspecified|male|female|unknown)$',
+            pattern=r'^(|unspecified|male|female|unknown)$',
             strip_whitespace=True
         )
     ]] = Field(None, example="male", description="Gender", alias="gender")
 
 class ContactInfo(BaseModel):
-    email_private: Optional[str] = Field(None, max_length=100, example="doe@private.com", description="Private Email", alias="privateEmail")
-    email_work: Optional[str] = Field(None, max_length=100, example="doe@business.com", description="Business Email", alias="businessEmail")
-    phone_work: Optional[str] = Field(None, max_length=50, example="+351222222", description="Business Phone", alias="businessPhone")
-    mobile_work: Optional[str] = Field(None, max_length=50, example="+351222222", description="Business Mobile Phone", alias="businessMobilePhone")
+    private_email: Optional[str] = Field(None, max_length=100, example="doe@private.com", description="Private Email", alias="privateEmail")
+    business_email: Optional[str] = Field(None, max_length=100, example="doe@business.com", description="Business Email", alias="businessEmail")
+    business_phone: Optional[str] = Field(None, max_length=50, example="+351222222", description="Business Phone", alias="businessPhone")
+    business_mobile_phone: Optional[str] = Field(None, max_length=50, example="+351222222", description="Business Mobile Phone", alias="businessMobilePhone")
     private_phone: Optional[str] = Field(None, max_length=50, example="+351222222", description="Private Phone", alias="privatePhone")
     private_mobile_phone: Optional[str] = Field(None, max_length=50, example="+351222222", description="Private Mobile Phone", alias="privateMobilePhone")
     other_phone: Optional[str] = Field(None, max_length=50, example="+351222222", description="Other Phone", alias="otherPhone")
@@ -112,12 +116,12 @@ class PartnerInfo(BaseModel):
     ascription_code: Optional[int] = Field(None, ge=0, example=0, description="Ascription Code", alias="ascriptionCode")
 
 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")
+    period_year: int = Field(..., ge=1900, le=2100, example=2021, description="Year", alias="year")
+    period_period: int = Field(..., ge=1, le=53, example=4, description="Period", alias="period")
 
 class AdditionalEmployeeInfo(BaseModel):
-    in_service_date: str = Field(..., example="2019-08-24", description="In Service Date", alias="inServiceDate")
-    default_employee_template: Optional[str] = Field(None, description="Default Employee Template", alias="defaultEmployeeTemplate")
+    in_service_date: Optional[str] = Field(None, example="2019-08-24", description="In Service Date", alias="inServiceDate")
+    default_employee_template: Optional[str] = Field(None, description="Default employee template unique identifier to be only used for employee's of type Payroll", alias="defaultEmployeeTemplate")
 
 class CreateEmployeePersonalInfo(BaseModel):
     basic_info: BasicInfo  = Field(..., alias="basicInfo")
@@ -128,12 +132,10 @@ class CreateEmployeePersonalInfo(BaseModel):
     created_at: Optional[str] = Field(None, example="2021-07-01T10:15:08Z", description="Created At", alias="createdAt")
 
 class EmployeeCreate(BaseModel):
-    company_id: str = Field(..., description="Company identifier", alias="companyId")
     personal_info: CreateEmployeePersonalInfo = Field(..., alias="personalInfo")
     additional_employee_info: AdditionalEmployeeInfo = Field(..., alias="additionalEmployeeInfo")
 
 class EmployeeUpdate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     basic_info: Optional[BasicInfoUpdate] = Field(None, alias="basicInfo")
     birth_info: Optional[BirthInfo] = Field(None, alias="birthInfo")
     contact_info: Optional[ContactInfo] = Field(None, alias="contactInfo")
@@ -151,3 +153,7 @@ class BsnGet(BrynQPanderaDataFrameModel):
 
     class _Annotation:
         primary_key = "employee_id"
+
+class DefaultEmployeeTemplates(BrynQPanderaDataFrameModel):
+    default_employee_template: Series[String] = pa.Field(coerce=True, description="UID of the default employee tempalte", alias="defaultEmployeeTemplateId")
+    description: Series[String] = pa.Field(coerce=True, description="The description of the default employee template ")

brynq_sdk_nmbrs/schemas/employment.py

@@ -1,13 +1,15 @@
+from datetime import datetime
+from typing import Optional
+
 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 pandera import Bool
+from pandera.typing import DateTime, Float, Series, String
+from pydantic import BaseModel, Field
+
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
-from typing import Optional
-from pydantic import BaseModel, Field
-from datetime import datetime
 
 # ---------------------------
 # Get Schemas
@@ -33,16 +35,14 @@ class EmploymentGet(BrynQPanderaDataFrameModel):
 # Upload Schemas
 # ---------------------------
 class EmploymentCreate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     start_date: datetime = Field(..., example="2021-06-07T07:59:11Z", description="Start Date Employment", alias="startDate")
     seniority_date: Optional[datetime] = Field(None, example="2021-06-09T07:59:11Z", description="Seniority Date Employment", alias="seniorityDate")
 
 class EmploymentUpdate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     employment_id: str = Field(..., example="a405f980-1c4c-42c1-8ddb-2d90c58da0b1", description="Employment ID", alias="employmentId")
     seniority_date: Optional[datetime] = Field(None, example="2021-06-07T07:59:11Z", description="Seniority Date Employment", alias="seniorityDate")
-    end_of_service_date: Optional[datetime] = Field(None, example="2021-10-01T00:00:00Z", description="End of Service Date Employment", alias="endOfServiceDate")
-    end_of_contract_reason: Optional[int] = Field(None, ge=0, example=3, description="End of Contract Reason Employment", alias="endOfContractReason")
+    end_date: Optional[datetime] = Field(None, example="2021-10-01T00:00:00Z", description="End of Service Date Employment", alias="endOfServiceDate")
+    end_contract_reason: Optional[int] = Field(None, ge=0, example=3, description="End of Contract Reason Employment", alias="endOfContractReason")
 
 class EmploymentDelete(BaseModel):
-    employment_id: str = Field(..., example="a405f980-1c4c-42c1-8ddb-2d90c58da0b1", description="Employment ID", alias="employmentId")
+    employment_id: str = Field(..., example="a405f980-1c4c-42c1-8ddb-2d90c58da0b1", description="Employment ID", alias="employmentId")

brynq_sdk_nmbrs/schemas/function.py

@@ -1,13 +1,14 @@
 from datetime import datetime
+from typing import Optional
 
 import pandas as pd
 import pandera as pa
-from pandera.typing import Series, String, Float, DateTime
 import pandera.extensions as extensions
+from pandera.typing import DateTime, Float, Series, String
+from pydantic import BaseModel, Field
+
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
-from typing import Optional
-from pydantic import BaseModel, Field
 
 # ---------------------------
 # Get Schemas
@@ -35,16 +36,42 @@ class EmployeeFunctionGet(BrynQPanderaDataFrameModel):
 # Upload Schemas
 # ---------------------------
 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")
+    period_year: int = Field(..., ge=1900, le=2100, example=2021, description="Year", alias="year")
+    period_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 FunctionUpdate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     function_id: str = Field(..., example="5981", description="Function ID", alias="functionId")
     period_details: Period = Field(..., alias="periodDetails")
+
+
+# SOAP Schemas for DebtorService Functions
+class FunctionCreate(BaseModel):
+    """Schema for creating a master function via SOAP API."""
+    code: int = Field(..., example=101, description="Function Code", alias="code")
+    description: str = Field(..., example="Software Developer", description="Function Description", alias="description")
+
+    class Config:
+        populate_by_name = True
+
+
+class FunctionDelete(BaseModel):
+    """Schema for deleting a master function via SOAP API."""
+    function_id: int = Field(..., example=12345, description="Function ID to delete", alias="functionId")
+
+    class Config:
+        populate_by_name = True
+
+
+class FunctionMasterUpdate(BaseModel):
+    """Schema for updating a master function via SOAP API."""
+    function_id: int = Field(..., example=12345, description="Function ID", alias="functionId")
+    code: int = Field(..., example=101, description="Function Code", alias="code")
+    description: str = Field(..., example="Senior Software Developer", description="Function Description", alias="description")
+
+    class Config:
+        populate_by_name = True

brynq_sdk_nmbrs/schemas/hours.py

@@ -76,7 +76,6 @@ class PeriodPost(BaseModel):
     unprotected_mode: Optional[bool] = Field(None, example=False, description="Unprotected Mode", alias="unprotectedMode")
 
 class FixedHoursCreate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     hour_code: int = Field(..., ge=1, example=2100, description="Hour Code", alias="hourCode")
     number_of_hours: float = Field(..., ge=0, le=1000, example=40, description="Hours", alias="hours")
     cost_center_id: Optional[str] = Field(None, example="aa506564-d1db-4fa8-83dc-d68db4cfcd82", description="Cost Center ID", alias="costCenterId")
@@ -87,7 +86,6 @@ class FixedHoursCreate(BaseModel):
     period_details: Optional[PeriodPost] = None
 
 class FixedHoursUpdate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     hour_component_id: str = Field(..., example="ddaae291-47fa-4c67-bb2f-de0e5da9e8a1", description="Hour Component ID", alias="hourComponentId")
     hour_code: Optional[int] = Field(None, ge=1, example=2100, description="Hour Code", alias="hourCode")
     number_of_hours: Optional[float] = Field(None, ge=0, le=1000, example=40, description="Hours", alias="hours")
@@ -99,7 +97,6 @@ class FixedHoursUpdate(BaseModel):
     period_details: Optional[PeriodPost] = None
 
 class VariableHoursCreate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     hour_code: int = Field(..., ge=1, example=2100, description="Hour Code", alias="hourCode")
     number_of_hours: float = Field(..., ge=0, le=1000, example=3.5, description="Hours", alias="hours")
     cost_center_id: Optional[str] = Field(None, example="aa506564-d1db-4fa8-83dc-d68db4cfcd82", description="Cost Center ID", alias="costCenterId")
@@ -108,7 +105,6 @@ class VariableHoursCreate(BaseModel):
     period_details: Optional[PeriodPost] = Field(None, example="Period details", description="Period details", alias="periodDetails")
 
 class VariableHoursUpdate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     hour_component_id: str = Field(..., example="49a69eda-252e-4ccb-a220-38ea90511d4f", description="Hour Component ID", alias="hourComponentId")
     hour_code: Optional[int] = Field(None, ge=1, example=2100, description="Hour Code", alias="hourCode")
     number_of_hours: Optional[float] = Field(None, ge=0, le=1000, example=45.5, description="Hours", alias="hours")

brynq_sdk_nmbrs/schemas/leave.py

@@ -33,7 +33,6 @@ class LeaveGet(BrynQPanderaDataFrameModel):
 
 
 class LeaveCreate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     leave_group_id: str = Field(..., example="49a69eda-252e-4ccb-a220-38ea90511d4f", description="Leave Group ID", alias="leaveGroupId")
     start_date: datetime = Field(..., example="2025-01-01", description="Leave Start Date", alias="startDate")
     end_date: datetime = Field(..., example="2025-01-02", description="Leave End Date", alias="endDate")
@@ -47,6 +46,18 @@ class LeaveDelete(BaseModel):
     leave_request_id: str = Field(..., example="49a69eda-252e-4ccb-a220-38ea90511d4f", description="Leave Request ID", alias="leaveRequestId")
 
 
+class LeaveUpdate(BaseModel):
+    """Schema for updating leave via SOAP API."""
+    employee_id: int = Field(..., example=12345, description="Employee ID", alias="employeeId")
+    leave_id: int = Field(..., example=67890, description="Leave ID", alias="leaveId")
+    start_date: datetime = Field(..., example="2025-01-01T00:00:00", description="Leave Start Date", alias="startDate")
+    end_date: datetime = Field(..., example="2025-01-02T00:00:00", description="Leave End Date", alias="endDate")
+    description: Optional[str] = Field(None, example="Vacation leave", description="Description", alias="description")
+
+    class Config:
+        populate_by_name = True
+
+
 class LeaveBalanceGet(BrynQPanderaDataFrameModel):
     employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     leave_group_id: Series[String] = pa.Field(coerce=True, nullable=True, description="Leave Group ID", alias="leaveGroupId")

brynq_sdk_nmbrs/schemas/manager.py

@@ -102,7 +102,6 @@ class Period(BaseModel):
     period: int = Field(..., ge=1, le=53, example=4, description="Period", alias="period")
 
 class ManagerCreate(BaseModel):
-    debtor_id: str = Field(..., description="Debtor identifier", alias="debtorId")
     number: int = Field(..., ge=1, example=1, description="Manager number", alias="number")
     first_name: str = Field(..., max_length=100, example="John", description="Manager first name", alias="firstName")
     last_name: str = Field(..., max_length=100, example="Doe", description="Manager last name", alias="lastName")
@@ -113,7 +112,6 @@ class ManagerCreate(BaseModel):
     email: Optional[str] = Field(None, max_length=100, example="john.doe@company.com", description="Manager email", alias="email")
 
 class ManagerUpdate(BaseModel):
-    debtor_id: str = Field(..., description="Debtor identifier", alias="debtorId")
     manager_id: str = Field(..., example="2f6aa11c-504a-49a1-903b-e15e79965702", description="Manager ID", alias="managerId")
     period_details: Period = Field(..., alias="periodDetails")
 
@@ -121,6 +119,5 @@ class ManagerDelete(BaseModel):
     manager_id: str = Field(..., example="2f6aa11c-504a-49a1-903b-e15e79965702", description="Manager ID", alias="managerId")
 
 class UpdateEmployeeManager(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     manager_id: str = Field(..., example="2f6aa11c-504a-49a1-903b-e15e79965702", description="Manager ID", alias="managerId")
     period_details: Period = Field(..., alias="periodDetails")

brynq_sdk_nmbrs/schemas/salary.py

@@ -1,14 +1,16 @@
 import math
+from datetime import datetime
+from typing import Annotated, Optional
+
 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 pandera import Bool
+from pandera.typing import DateTime, Float, Series, String
+from pydantic import BaseModel, Field, StringConstraints, model_serializer
+
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
-from typing import Optional, Annotated
-from pydantic import BaseModel, Field, StringConstraints
-from datetime import datetime
 
 # ---------------------------
 # Get Schemas
@@ -16,7 +18,7 @@ from datetime import datetime
 class SalaryGet(BrynQPanderaDataFrameModel):
     employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     salary_id: Series[String] = pa.Field(coerce=True, description="Salary ID", alias="salaryId")
-    start_date: Series[DateTime] = pa.Field(coerce=True, description="Start Date", alias="startDate")
+    start_date_salary: Series[DateTime] = pa.Field(coerce=True, description="Start Date", alias="startDate")
     salary_type: Series[String] = pa.Field(
         coerce=True,
         isin=[
@@ -32,7 +34,7 @@ class SalaryGet(BrynQPanderaDataFrameModel):
         description="Salary Type",
         alias="type"
     )
-    value: Series[Float] = pa.Field(coerce=True, nullable=True, description="Value", alias="value")
+    salary_amount: Series[Float] = pa.Field(coerce=True, nullable=True, description="Value", alias="value")
     created_at: Series[DateTime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
 
     class _Annotation:
@@ -54,7 +56,6 @@ class SalaryTableUpdate(BaseModel):
     step_id: Optional[str] = Field(None, example="c9c6feef-cd69-4773-8602-f70fa3b561e4", description="Step ID", alias="stepId")
 
 class SalaryCreate(BaseModel):
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     start_date_salary: datetime = Field(..., example="2021-08-01T00:00:00Z", description="Start Date", alias="startDate")
     salary_type: Optional[Annotated[
         str,
@@ -64,10 +65,34 @@ class SalaryCreate(BaseModel):
         )
     ]] = Field(None, example="grossFulltimeSalary", description="Salary Type", alias="type")
     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")
-    salary_table_update: Optional[SalaryTableUpdate] = Field(None, description="Salary Table Update", alias="salaryTable")
+    salary_table_update: Optional[SalaryTableUpdate] = Field(default=None, description="Salary Table Update", alias="salaryTable")
+
+    @model_serializer(mode='wrap')
+    def serialize_model(self, serializer, info):
+        data = serializer(self)
+        # Exclude salaryTable if it exists but all its nested fields are None
+        if 'salaryTable' in data and data['salaryTable'] is not None:
+            if isinstance(data['salaryTable'], dict) and all(v is None for v in data['salaryTable'].values()):
+                data.pop('salaryTable')
+        return data
+
+    class Config:
+        populate_by_name = True
+
+
+class SalaryUpdate(BaseModel):
+    """Schema for updating salary via SOAP API (Salary_UpdateCurrent)."""
+    employee_id: int = Field(..., example=12345, description="Employee ID", alias="employeeId")
+    salary_value: float = Field(..., ge=0, example=5000.00, description="Salary value (gross amount)", alias="salaryValue")
+    salary_type: str = Field(
+        "Bruto_Salaris_Fulltime",
+        example="Bruto_Salaris_Fulltime",
+        description="Salary type enum: Bruto_Salaris_Fulltime, Bruto_Salaris_Parttime, Bruto_Uurloon, etc.",
+        alias="salaryType"
+    )
+
+    class Config:
+        populate_by_name = True
 
 class SalaryTableGet(BrynQPanderaDataFrameModel):
     code: Series[String] = pa.Field(coerce=True, description="Salary Code", alias="Code")

brynq_sdk_nmbrs/schemas/schedules.py

@@ -60,7 +60,6 @@ class ScheduleCreate(BaseModel):
     """
     Pydantic model for creating a new schedule
     """
-    employee_id: str = Field(..., description="Employee identifier", alias="employeeId")
     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: Optional[ScheduleHours] = Field(None, description="Week 1 schedule hours", alias="week1")
@@ -94,3 +93,52 @@ class ScheduleCreate(BaseModel):
                 }
             }
         }
+
+
+class ScheduleUpdate(BaseModel):
+    """
+    Pydantic model for updating a schedule via SOAP API
+    """
+    employee_id: int = Field(..., example=12345, description="Employee ID", alias="employeeId")
+    start_date: datetime = Field(..., example="2025-01-01T00:00:00", description="Start date of the schedule", alias="startDate")
+    parttime_percentage: float = Field(..., ge=0, le=100, example=100.0, description="Part-time percentage", alias="parttimePercentage")
+    company_rooster_nr: Optional[int] = Field(0, example=0, description="Company Rooster Number (schedule template)", alias="companyRoosterNr")
+    hours_monday: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Monday", alias="hoursMonday")
+    hours_tuesday: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Tuesday", alias="hoursTuesday")
+    hours_wednesday: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Wednesday", alias="hoursWednesday")
+    hours_thursday: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Thursday", alias="hoursThursday")
+    hours_friday: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Friday", alias="hoursFriday")
+    hours_saturday: Optional[float] = Field(0, ge=0, le=24, example=0.0, description="Hours Saturday", alias="hoursSaturday")
+    hours_sunday: Optional[float] = Field(0, ge=0, le=24, example=0.0, description="Hours Sunday", alias="hoursSunday")
+    hours_monday2: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Monday Week 2", alias="hoursMonday2")
+    hours_tuesday2: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Tuesday Week 2", alias="hoursTuesday2")
+    hours_wednesday2: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Wednesday Week 2", alias="hoursWednesday2")
+    hours_thursday2: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Thursday Week 2", alias="hoursThursday2")
+    hours_friday2: Optional[float] = Field(0, ge=0, le=24, example=8.0, description="Hours Friday Week 2", alias="hoursFriday2")
+    hours_saturday2: Optional[float] = Field(0, ge=0, le=24, example=0.0, description="Hours Saturday Week 2", alias="hoursSaturday2")
+    hours_sunday2: Optional[float] = Field(0, ge=0, le=24, example=0.0, description="Hours Sunday Week 2", alias="hoursSunday2")
+
+    def to_soap_schedule(self, soap_client):
+        """Convert to SOAP Schedule object"""
+        ScheduleType = soap_client.get_type('ns0:Schedule')
+        return ScheduleType(
+            StartDate=self.start_date,
+            ParttimePercentage=self.parttime_percentage,
+            HoursMonday=self.hours_monday or 0,
+            HoursTuesday=self.hours_tuesday or 0,
+            HoursWednesday=self.hours_wednesday or 0,
+            HoursThursday=self.hours_thursday or 0,
+            HoursFriday=self.hours_friday or 0,
+            HoursSaturday=self.hours_saturday or 0,
+            HoursSunday=self.hours_sunday or 0,
+            HoursMonday2=self.hours_monday2 or 0,
+            HoursTuesday2=self.hours_tuesday2 or 0,
+            HoursWednesday2=self.hours_wednesday2 or 0,
+            HoursThursday2=self.hours_thursday2 or 0,
+            HoursFriday2=self.hours_friday2 or 0,
+            HoursSaturday2=self.hours_saturday2 or 0,
+            HoursSunday2=self.hours_sunday2 or 0
+        )
+
+    class Config:
+        populate_by_name = True

brynq_sdk_nmbrs/schemas/social_insurance.py

@@ -1,14 +1,47 @@
-import math
 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 pandera.typing import Series, String, DateTime
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
-from typing import Optional, Annotated
-from pydantic import BaseModel, Field, StringConstraints
-from datetime import datetime
+from typing import Optional
+from pydantic import BaseModel, Field
 
+# ---------------------------
+# Get Schemas
+# ---------------------------
+class SocialInsuranceGet(BrynQPanderaDataFrameModel):
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employee_id")
+    id: Series[String] = pa.Field(coerce=True, description="SVW Settings ID", alias="Id")
+    creation_date: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="Creation Date", alias="CreationDate")
+    start_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Start Period", alias="StartPeriod")
+    start_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Start Year", alias="StartYear")
+    influence_obliged_insurance: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Whether employee influences obligatory insurance status", alias="InfluenceObligedInsurance")
+    wage_cost_benefit: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Eligible for wage cost subsidy (LKV - Loonkostenvoordeel)", alias="WageCostBenefit")
+    cao: Series[String] = pa.Field(coerce=True, nullable=True, description="Collectieve Arbeidsovereenkomst (Collective Labor Agreement)", alias="CAO")
+    wao_wia: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Disability Insurance (WAO/WIA - Wet Arbeidsongeschiktheid)", alias="Wao_Wia")
+    ww: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Unemployment Insurance (WW - Werkloosheidswet)", alias="Ww")
+    zw: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Sickness Benefits (ZW - Ziektewet)", alias="Zw")
+    income_related_contribution_zvw: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Income Related Health Insurance Contribution (ZVW - Zorgverzekeringswet)", alias="IncomeRelatedContributionZvw")
+    code_zvw: Series[String] = pa.Field(coerce=True, nullable=True, description="Health Insurance Code (ZVW)", alias="CodeZvw")
+    risk_group: Series[String] = pa.Field(coerce=True, nullable=True, description="Risk Group for premium calculation", alias="RiskGroup")
+    sector: Series[String] = pa.Field(coerce=True, nullable=True, description="Industry Sector code", alias="Sector")
+    employment_type: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Employment Type", alias="EmploymentType")
+    phase_classification: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Phase Classification", alias="PhaseClassification")
+    employment_sequence_tax_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Employment Sequence Tax ID", alias="EmploymentSequenceTaxId")
+
+    class _Annotation:
+        primary_key = "id"
+        foreign_keys = {
+            "employee_id": {
+                "parent_schema": "EmployeeSchema",
+                "parent_column": "employee_id",
+                "cardinality": "N:1"
+            }
+        }
+
+# ---------------------------
+# Upload Schemas
+# ---------------------------
 class SocialInsuranceUpdate(BaseModel):
     employee_id: int = Field(None, example="1234567890", description="Employee ID", alias="EmployeeId")
     influence_obliged_insurance: Optional[bool] = Field(None, example="1234567890", description="Influence Obliged Insurance", alias="InfluenceObligedInsurance")