brynq-sdk-nmbrs 2.3.1.dev0__py3-none-any.whl → 2.3.3.dev0__py3-none-any.whl

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")

brynq_sdk_nmbrs/schemas/wage_tax.py

@@ -1,16 +1,76 @@
 import math
+from datetime import datetime
+from typing import Annotated, Optional, Union
+
 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, Union
+from pandera import Bool
+from pandera.typing import DateTime, Float, Series, String
 from pydantic import BaseModel, Field, StringConstraints
-from datetime import datetime
+
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
 
+# ---------------------------
+# REST API Get Schema (Wage Tax Settings History)
+# ---------------------------
 class WageTaxSettingsGet(BrynQPanderaDataFrameModel):
+    """Schema for REST API: GET /companies/{companyId}/employees/wagetaxsettings"""
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
+    wage_tax_setting_id: Series[String] = pa.Field(coerce=True, description="Wage Tax Setting ID", alias="wageTaxSettingId")
+    start_date: Series[DateTime] = pa.Field(coerce=True, description="Start Date", alias="startDate")
+    created_at: Series[DateTime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
+    payroll_tax_reduction: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Payroll Tax Reduction", alias="payrollTaxReduction")
+    type_of_income: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Type of Income", alias="typeOfIncome")
+    color_table: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Color Table", alias="colorTable")
+    period_table: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Period Table", alias="periodTable")
+    special_table: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Special Table", alias="specialTable")
+    payroll_tax: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Payroll Tax", alias="payrollTax")
+    benefit_scheme: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Benefit Scheme", alias="benefitScheme")
+    auto_small_jobs: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Auto Small Jobs Regulation", alias="autoSmallJobs")
+    yearly_salary: Series[pd.Float64Dtype] = pa.Field(coerce=True, nullable=True, description="Yearly Salary", alias="yearlySalary")
+    deviation_special_rate: Series[pd.Float64Dtype] = pa.Field(coerce=True, nullable=True, description="Deviation Special Rate Payroll Tax Deduction", alias="deviationSpecialRatePayrollTaxDeduction")
+    code_tax_reduction: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Code Tax Reduction", alias="codeTaxReduction")
+    holiday_vouchers: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Holiday Vouchers", alias="holidayVouchers")
+    code_30_percent_rule: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Code Calculate 30 Percent Rule", alias="codeCalculate30PercentRule")
+
+    class _Annotation:
+        primary_key = "wage_tax_setting_id"
+        foreign_keys = {
+            "employee_id": {
+                "parent_schema": "EmployeeSchema",
+                "parent_column": "employee_id",
+                "cardinality": "N:1"
+            }
+        }
+
+
+class WageTaxSettingsCreate(BaseModel):
+    """Schema for REST API: POST /employees/{employeeId}/wagetaxsetting"""
+    start_date: datetime = Field(..., example="2024-01-01T00:00:00Z", description="Start Date", alias="startDate")
+    payroll_tax_reduction: Optional[bool] = Field(None, example=True, description="Payroll Tax Reduction", alias="payrollTaxReduction")
+    type_of_income: Optional[int] = Field(None, example=15, description="Type of Income", alias="typeOfIncome")
+    color_table: Optional[int] = Field(None, example=1, description="Color Table", alias="colorTable")
+    period_table: Optional[int] = Field(None, example=2, description="Period Table", alias="periodTable")
+    special_table: Optional[int] = Field(None, example=0, description="Special Table", alias="specialTable")
+    payroll_tax: Optional[bool] = Field(None, example=True, description="Payroll Tax", alias="payrollTax")
+    benefit_scheme: Optional[bool] = Field(None, example=True, description="Benefit Scheme", alias="benefitScheme")
+    auto_small_jobs: Optional[bool] = Field(None, example=False, description="Auto Small Jobs Regulation", alias="autoSmallJobs")
+    yearly_salary: Optional[float] = Field(None, example=45000.00, description="Yearly Salary", alias="yearlySalary")
+    deviation_special_rate: Optional[float] = Field(None, example=0.0, description="Deviation Special Rate Payroll Tax Deduction", alias="deviationSpecialRatePayrollTaxDeduction")
+    code_tax_reduction: Optional[int] = Field(None, example=0, description="Code Tax Reduction", alias="codeTaxReduction")
+    holiday_vouchers: Optional[int] = Field(None, example=0, description="Holiday Vouchers", alias="holidayVouchers")
+    code_30_percent_rule: Optional[int] = Field(None, example=0, description="Code Calculate 30 Percent Rule", alias="codeCalculate30PercentRule")
+
+    class Config:
+        populate_by_name = True
+
+
+# ---------------------------
+# SOAP API Get Schema (Company Wage Tax List)
+# ---------------------------
+class CompanyWageTaxGet(BrynQPanderaDataFrameModel):
     wagetax_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Loonaangifte ID", alias="LoonaangifteID")
     serial_number: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Serial Number", alias="SerialNumber")
     payment_reference: Series[String] = pa.Field(coerce=True, description="Payment Reference", alias="PaymentReference")

brynq_sdk_nmbrs/schemas/wage_tax_settings.py

@@ -1,11 +1,10 @@
-from datetime import datetime
 from typing import Optional
 
 import pandas as pd
 import pandera as pa
 from pandera import Bool
 from pandera.typing import DateTime, Float, Series, String
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, model_serializer
 
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
@@ -14,23 +13,23 @@ from brynq_sdk_functions import BrynQPanderaDataFrameModel
 # Get Schemas
 # ---------------------------
 class EmployeeWageTaxSettingsGet(BrynQPanderaDataFrameModel):
-    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
-    wage_tax_settings_id: Series[String] = pa.Field(coerce=True, description="Wage Tax Settings ID", alias="id")
-    start_date: Series[DateTime] = pa.Field(coerce=True, description="Start Date", alias="startDate")
-    end_date: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="End Date", alias="endDate")
-    yearly_salary: Series[Float] = pa.Field(coerce=True, nullable=True, description="Yearly Salary", alias="yearlySalary")
-    deviation_special_rate_payroll_tax_deduction: Series[Float] = pa.Field(coerce=True, nullable=True, description="Deviation Special Rate Payroll Tax Deduction", alias="deviationSpecialRatePayrollTaxDeduction")
-    auto_small_jobs: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Auto Small Jobs Regulation", alias="autoSmallJobsRegulation")
-    payroll_tax_deduction: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Payroll Tax Deduction", alias="payrollTaxDeduction")
-    benefit_scheme: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Benefit Scheme", alias="benefitScheme")
-    payroll_tax: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Payroll Tax", alias="payrollTax")
-    code_tax_reduction: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Code Tax Reduction", alias="codeTaxReduction")
-    color_table: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Color Table", alias="colorTable")
-    type_of_income: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Type of Income", alias="typeOfIncome")
-    special_table: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Special Table", alias="specialTable")
-    period_table: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Period Table", alias="periodTable")
-    holiday_vouchers: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Holiday Vouchers", alias="holidayVouchers")
-    code_calculate_30_percent_rule: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Code Calculate 30% Rule", alias="codeCalculate30PercentRule")
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee unique identifier", alias="employeeId")
+    wage_tax_settings_id: Series[String] = pa.Field(coerce=True, description="Wage Tax Settings ID", alias="wageTaxSettingsId")
+    wage_tax: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Wage Tax", alias="wageTax")
+    wage_tax_rebate: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Loonheffingskorting", alias="wageTaxRebate")
+    single_elderly_discount: Series[Bool] = pa.Field(coerce=True, nullable=True, description="Single Elderly Discount", alias="singleElderlyDiscount")
+    color_table: Series[String] = pa.Field(coerce=True, nullable=True, description="List of available color table values for wage tax settings", alias="colorTable")
+    period_table: Series[String] = pa.Field(coerce=True, nullable=True, description="List of available period table values for wage tax settings", alias="periodTable")
+    income_type: Series[String] = pa.Field(coerce=True, nullable=True, description="Income Type", alias="incomeType")
+    special_annual_salary_rate: Series[Float] = pa.Field(coerce=True, nullable=True, description="Loonheffing BT", alias="specialAnnualSalaryRate")
+    special_table: Series[String] = pa.Field(coerce=True, nullable=True, description="Special Table", alias="specialTable")
+    different_special_rate: Series[String] = pa.Field(coerce=True, nullable=True, description="Afwijkend Bijzonder tarief %", alias="differentSpecialRate")
+    calc_30_percent_ruling: Series[String] = pa.Field(coerce=True, nullable=True, description="List of available 30 Percent Ruling Calculation types", alias="Calc30PercentRuling.Cal30PercentRuling")
+    calc_30_percent_ruling_end_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="30 Percent Ruling End Period", alias="Calc30PercentRuling.endPeriod")
+    calc_30_percent_ruling_end_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="30 Percent Ruling End Year", alias="Calc30PercentRuling.endYear")
+    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Period Year", alias="period.year")
+    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Period Period", alias="period.period")
+    created_at: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="Created At", alias="createdAt")
 
     class _Annotation:
         primary_key = "wage_tax_settings_id"
@@ -49,15 +48,29 @@ class Period(BaseModel):
     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 Calc30PercentRuling(BaseModel):
+    cal_30_percent_ruling: Optional[str] = Field(None, example="None", description="List of available 30 Percent Ruling Calculation types", alias="Cal30PercentRuling")
+    end_period: Optional[int] = Field(None, example=8, description="30 Percent Ruling End Period", alias="endPeriod")
+    end_year: Optional[int] = Field(None, example=2025, description="30 Percent Ruling End Year", alias="endYear")
+
 class EmployeeWageTaxSettingsCreate(BaseModel):
-    wage_tax: Optional[bool] = Field(None, example=True, description="Wage Tax", alias="wageTax")
-    wage_tax_rebate: Optional[bool] = Field(None, example=True, description="Wage Tax Rebate", alias="wageTaxRebate")
-    single_elderly_discount: Optional[bool] = Field(None, example=True, description="Single Elderly Discount", alias="singleElderlyDiscount")
-    color_table: Optional[str] = Field(None, example="White", description="Color Table", alias="colorTable")
-    period_table: Optional[str] = Field(None, example="Month", description="Period Table", alias="periodTable")
-    income_type: Optional[str] = Field(None, description="Income Type", alias="incomeType")
-    special_annual_salary_rate: Optional[float] = Field(None, ge=0, example=0.0, description="Special Annual Salary Rate", alias="specialAnnualSalaryRate")
-    special_table: Optional[str] = Field(None, description="Special Table", alias="specialTable")
-    different_special_rate: Optional[float] = Field(None, example=0.0, description="Different Special Rate", alias="differentSpecialRate")
-    calc_30_percent_ruling: Optional[str] = Field(None, example="None", description="Calculate 30% Ruling", alias="Calc30PercentRuling")
+    wage_tax: bool = Field(..., example=True, description="Wage Tax", alias="wageTax")
+    wage_tax_rebate: bool = Field(..., example=True, description="Loonheffingskorting", alias="wageTaxRebate")
+    single_elderly_discount: bool = Field(..., example=True, description="Single Elderly Discount", alias="singleElderlyDiscount")
+    color_table: str = Field(..., example="White", description="List of available color table values for wage tax settings", alias="colorTable")
+    period_table: str = Field(..., example="Month", description="List of available period table values for wage tax settings", alias="periodTable")
+    income_type: str = Field(..., description="Income Type", alias="incomeType")
+    special_annual_salary_rate: Optional[float] = Field(None, ge=0, example=32000.0, description="Loonheffing BT", alias="specialAnnualSalaryRate")
+    special_table: str = Field(..., description="Special Table", alias="specialTable")
+    different_special_rate: Optional[float] = Field(None, example=0.0, description="Afwijkend Bijzonder tarief %", alias="differentSpecialRate")
+    calc_30_percent_ruling: Optional[Calc30PercentRuling] = Field(None, description="Calc 30 percent ruling", alias="Calc30PercentRuling")
     period: Period = Field(..., description="Period", alias="period")
+
+    @model_serializer(mode='wrap')
+    def serialize_model(self, serializer, info):
+        data = serializer(self)
+        # Exclude Calc30PercentRuling if it exists but all its nested fields are None
+        if 'Calc30PercentRuling' in data and data['Calc30PercentRuling'] is not None:
+            if isinstance(data['Calc30PercentRuling'], dict) and all(v is None for v in data['Calc30PercentRuling'].values()):
+                data.pop('Calc30PercentRuling')
+        return data

brynq_sdk_nmbrs/schemas/wagecomponents.py

@@ -1,11 +1,19 @@
 import math
+from typing import Optional
+
 import pandas as pd
 import pandera as pa
-from pandera.typing import Series, String, Float
-from brynq_sdk_functions import BrynQPanderaDataFrameModel
+from pandera.typing import Float, Series, String
+from pydantic import (
+    BaseModel,
+    Field,
+    confloat,
+    conint,
+    field_validator,
+    model_serializer,
+)
 
-from typing import Optional
-from pydantic import BaseModel, Field, conint, confloat
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
 
 # ---------------------------
@@ -61,8 +69,8 @@ class VariableWageComponentGet(BrynQPanderaDataFrameModel):
 # Upload Schemas
 # ---------------------------
 class PeriodPost(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_details_year: int = Field(..., ge=1900, le=2100, example=2021, description="Year", alias="year")
+    period_details_period: int = Field(..., ge=1, le=53, example=4, description="Period", alias="period")
 
 class FixedWageComponentCreate(BaseModel):
     code: int = Field(..., ge=1, example=1100, description="Wage Component Code", alias="code")
@@ -72,9 +80,36 @@ class FixedWageComponentCreate(BaseModel):
     comment: Optional[str] = Field(None, example="some comment", description="Comment", alias="comment")
     cost_center_id: Optional[str] = Field(None, example="aa506564-d1db-4fa8-83dc-d68db4cfcd82", description="Cost Center ID", alias="costCenterId")
     cost_unit_id: Optional[str] = Field(None, example="d8ac6afb-2ac6-43bf-9880-2d382cdace43", description="Cost Unit ID", alias="costUnitId")
-    period_details: PeriodPost
+    period_details: Optional[PeriodPost] = Field(None, description="Period Details", alias="periodDetails")
     unprotected_mode: Optional[bool] = Field(None, example=True, description="Unprotected Mode", alias="unprotectedMode")
 
+    @field_validator("end_year", "end_period", mode="before")
+    @classmethod
+    def empty_str_to_none(cls, v):
+        """Convert empty strings to None for optional integer fields"""
+        if v == "" or v is None:
+            return None
+        return v
+
+    @field_validator("period_details", mode="before")
+    @classmethod
+    def empty_dict_to_none(cls, v):
+        """Convert empty dicts to None for period_details"""
+        if isinstance(v, dict) and (not v or all(val is None for val in v.values())):
+            return None
+        return v
+
+    @model_serializer(mode='wrap')
+    def serialize_model(self, serializer, info):
+        data = serializer(self)
+        # Exclude periodDetails if it exists but is None or all its nested fields are None
+        if 'periodDetails' in data and data['periodDetails'] is not None:
+            if isinstance(data['periodDetails'], dict) and all(v is None for v in data['periodDetails'].values()):
+                data.pop('periodDetails')
+        elif 'periodDetails' in data and data['periodDetails'] is None:
+            data.pop('periodDetails')
+        return data
+
 class FixedWageComponentUpdate(BaseModel):
     fixed_wage_component_id: str = Field(..., example="643c6b90-57c6-4199-9e4e-ded553572d78", description="Fixed Wage Component ID", alias="fixedWageComponentId")
     code: Optional[int] = Field(None, ge=1, example=1100, description="Wage Component Code", alias="code")
@@ -93,9 +128,28 @@ class VariableWageComponentCreate(BaseModel):
     comment: Optional[str] = Field(None, example="comment", description="Comment", alias="comment")
     cost_center_id: Optional[str] = Field(None, example="aa506564-d1db-4fa8-83dc-d68db4cfcd82", description="Cost Center ID", alias="costCenterId")
     cost_unit_id: Optional[str] = Field(None, example="d8ac6afb-2ac6-43bf-9880-2d382cdace43", description="Cost Unit ID", alias="costUnitId")
-    period_details: PeriodPost
+    period_details: Optional[PeriodPost] = Field(None, description="Period Details", alias="periodDetails")
     unprotected_mode: Optional[bool] = Field(None, example=True, description="Unprotected Mode", alias="unprotectedMode")
 
+    @field_validator("period_details", mode="before")
+    @classmethod
+    def empty_dict_to_none(cls, v):
+        """Convert empty dicts to None for period_details"""
+        if isinstance(v, dict) and (not v or all(val is None for val in v.values())):
+            return None
+        return v
+
+    @model_serializer(mode='wrap')
+    def serialize_model(self, serializer, info):
+        data = serializer(self)
+        # Exclude periodDetails if it exists but is None or all its nested fields are None
+        if 'periodDetails' in data and data['periodDetails'] is not None:
+            if isinstance(data['periodDetails'], dict) and all(v is None for v in data['periodDetails'].values()):
+                data.pop('periodDetails')
+        elif 'periodDetails' in data and data['periodDetails'] is None:
+            data.pop('periodDetails')
+        return data
+
 class VariableWageComponentUpdate(BaseModel):
     variable_wage_component_id: str = Field(..., example="7fc59095-daed-4746-a7f8-a454e38e3683", description="Variable Wage Component ID", alias="variableWageComponentId")
     code: Optional[int] = Field(None, ge=1, example=3045, description="Wage Component Code", alias="code")
@@ -107,4 +161,7 @@ class VariableWageComponentUpdate(BaseModel):
     unprotected_mode: Optional[bool] = Field(None, example=True, description="Unprotected Mode", alias="unprotectedMode")
 
 class WageComponentDelete(BaseModel):
-    wage_component_id: str = Field(..., example="7fc59095-daed-4746-a7f8-a454e38e3683", description="Wage Component ID", alias="wageComponentId")
+    fixed_wage_component_id: str = Field(..., example="7fc59095-daed-4746-a7f8-a454e38e3683", description="Wage Component ID", alias="wageComponentId")
+
+    class Config:
+        populate_by_name = True

brynq_sdk_nmbrs/social_insurance.py

@@ -1,10 +1,9 @@
-from typing import Any, Dict, List, Union, Tuple
+from typing import Any, Dict, Union, Tuple
 import pandas as pd
 
-from .schemas.social_insurance import SocialInsuranceUpdate
+from .schemas.social_insurance import SocialInsuranceUpdate, SocialInsuranceGet
 from zeep.exceptions import Fault
 from zeep.helpers import serialize_object
-# import logging
 from brynq_sdk_functions import Functions
 
 
@@ -13,6 +12,85 @@ class SocialInsurance:
         self.nmbrs = nmbrs
         self.soap_client_employees = nmbrs.soap_client_employees
 
+    def get(self, employee_id: Union[int, str]) -> Tuple[pd.DataFrame, pd.DataFrame]:
+        """
+        Get current social insurance settings for an employee.
+
+        Args:
+            employee_id: The ID of the employee
+
+        Returns:
+            Tuple of (valid_data, invalid_data) DataFrames
+        """
+        if self.nmbrs.mock_mode:
+            return pd.DataFrame(), pd.DataFrame()
+
+        try:
+            response = self.nmbrs.soap_client_employees.service.SVW_GetCurrent(
+                EmployeeId=int(employee_id),
+                _soapheaders={'AuthHeaderWithDomain': self.nmbrs.soap_auth_header_employees}
+            )
+
+            if response:
+                serialized_response = serialize_object(response)
+                if not isinstance(serialized_response, list):
+                    serialized_response = [serialized_response]
+                df = pd.DataFrame(serialized_response)
+                df['employee_id'] = str(employee_id)
+                
+                valid_data, invalid_data = Functions.validate_data(df=df, schema=SocialInsuranceGet, debug=True)
+                return valid_data, invalid_data
+            else:
+                return pd.DataFrame(), pd.DataFrame()
+
+        except Fault as e:
+            raise Exception(f"SOAP request failed: {str(e)}")
+        except Exception as e:
+            raise Exception(f"Failed to get Social Insurance: {str(e)}")
+
+    def get_all_by_company(self, company_id: Union[int, str]) -> Tuple[pd.DataFrame, pd.DataFrame]:
+        """
+        Get all social insurance settings for all employees in a company.
+
+        Args:
+            company_id: The ID of the company
+
+        Returns:
+            Tuple of (valid_data, invalid_data) DataFrames
+        """
+        if self.nmbrs.mock_mode:
+            return pd.DataFrame(), pd.DataFrame()
+
+        try:
+            response = self.nmbrs.soap_client_employees.service.SVW_GetAll_AllEmployeesByCompany(
+                CompanyID=int(company_id),
+                _soapheaders={'AuthHeaderWithDomain': self.nmbrs.soap_auth_header_employees}
+            )
+
+            if response:
+                all_data = []
+                for emp in response:
+                    emp_id = emp.EmployeeId
+                    if emp.EmployeeSVWSettings and emp.EmployeeSVWSettings.EmployeeSVWSettings:
+                        for svw in emp.EmployeeSVWSettings.EmployeeSVWSettings:
+                            svw_data = serialize_object(svw)
+                            svw_data['employee_id'] = str(emp_id)
+                            all_data.append(svw_data)
+                
+                if all_data:
+                    df = pd.DataFrame(all_data)
+                    valid_data, invalid_data = Functions.validate_data(df=df, schema=SocialInsuranceGet, debug=True)
+                    return valid_data, invalid_data
+                else:
+                    return pd.DataFrame(), pd.DataFrame()
+            else:
+                return pd.DataFrame(), pd.DataFrame()
+
+        except Fault as e:
+            raise Exception(f"SOAP request failed: {str(e)}")
+        except Exception as e:
+            raise Exception(f"Failed to get Social Insurance for company: {str(e)}")
+
     def update(self, data: Dict[str, Any]) -> pd.DataFrame:
         try:
             social_insurance_model = SocialInsuranceUpdate(**data)

brynq_sdk_nmbrs/wage_tax.py

@@ -1,14 +1,115 @@
 from typing import Any, Dict, List, Union, Tuple
 import pandas as pd
-from .schemas.wage_tax import WageTaxGet, WageTaxUpdate, WageTaxSettingsGet
+import requests
+from .schemas.wage_tax import (
+    WageTaxGet, WageTaxUpdate, CompanyWageTaxGet,
+    WageTaxSettingsGet, WageTaxSettingsCreate
+)
 from zeep.exceptions import Fault
 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
 
 
+class WageTaxSettings:
+    """Wage Tax Settings History - uses REST API."""
+
+    def __init__(self, nmbrs):
+        self.nmbrs = nmbrs
+
+    def get(self,
+            created_from: str = None,
+            employee_id: str = None) -> Tuple[pd.DataFrame, pd.DataFrame]:
+        """
+        Get wage tax settings history for all employees across all companies.
+
+        Args:
+            created_from: Optional filter to get settings created from a specific date (ISO format)
+            employee_id: Optional filter to get settings for a specific employee
+
+        Returns:
+            Tuple of (valid_settings, invalid_settings) DataFrames
+        """
+        wage_tax_settings = pd.DataFrame()
+        for company in self.nmbrs.company_ids:
+            wage_tax_settings = pd.concat([wage_tax_settings, self._get(company, created_from, employee_id)])
+
+        valid_settings, invalid_settings = Functions.validate_data(
+            df=wage_tax_settings,
+            schema=WageTaxSettingsGet,
+            debug=True
+        )
+
+        return valid_settings, invalid_settings
+
+    def _get(self,
+             company_id: str,
+             created_from: str = None,
+             employee_id: str = None) -> pd.DataFrame:
+        """
+        Get wage tax settings history for a specific company.
+
+        Args:
+            company_id: The ID of the company
+            created_from: Optional filter to get settings created from a specific date
+            employee_id: Optional filter to get settings for a specific employee
+
+        Returns:
+            DataFrame containing wage tax settings history
+        """
+        params = {}
+        if created_from:
+            params['createdFrom'] = created_from
+        if employee_id:
+            params['employeeId'] = employee_id
+
+        request = requests.Request(
+            method='GET',
+            url=f"{self.nmbrs.base_url}companies/{company_id}/employees/wagetaxsettings",
+            params=params
+        )
+
+        data = self.nmbrs.get_paginated_result(request)
+        df = pd.json_normalize(
+            data,
+            record_path='wageTaxSettings',
+            meta=['employeeId']
+        )
+
+        return df
+
+    def create(self, employee_id: str, data: Dict[str, Any]):
+        """
+        Create a new wage tax setting for an employee using Pydantic validation.
+
+        Args:
+            employee_id: The ID of the employee
+            data: Dictionary containing wage tax settings data with fields matching
+                 the EmployeeWageTaxSettingsCreate schema (using camelCase field names)
+
+        Returns:
+            Response from the API
+        """
+        # Validate with Pydantic model
+        nested_data = self.nmbrs.flat_dict_to_nested_dict(data, WageTaxSettingsCreate)
+        wage_tax_model = WageTaxSettingsCreate(**nested_data)
+
+        if self.nmbrs.mock_mode:
+            return wage_tax_model
+
+        # Convert validated model to dict for API payload
+        payload = wage_tax_model.model_dump(exclude_none=True, by_alias=True)
+
+        # Send request
+        resp = self.nmbrs.session.post(
+            url=f"{self.nmbrs.base_url}employees/{employee_id}/wagetaxsetting",
+            json=payload,
+            timeout=self.nmbrs.timeout
+        )
+        return resp
+
+
 class WageTax:
     def __init__(self, nmbrs):
         self.nmbrs = nmbrs
@@ -33,7 +134,7 @@ class WageTax:
                 wagetax_settings_temp['companyId'] = company['number']
                 wagetax_settings = pd.concat([wagetax_settings, wagetax_settings_temp])
 
-        valid_wagetax_settings, invalid_wagetax_settings = Functions.validate_data(df=wagetax_settings, schema=WageTaxSettingsGet, debug=True)
+        valid_wagetax_settings, invalid_wagetax_settings = Functions.validate_data(df=wagetax_settings, schema=CompanyWageTaxGet, debug=True)
 
         # No validation schema for now, but could be added later
         return valid_wagetax_settings, invalid_wagetax_settings