wip

cmd/main-migration/migrations/20251019093915.sql

@@ -1,15 +1,15 @@
--- Rename a column from "Position_Code" to "ContractPosition_Code"
+-- -- Rename a column from "Position_Code" to "ContractPosition_Code"
-ALTER TABLE "public"."User" RENAME COLUMN "Position_Code" TO "ContractPosition_Code";
+-- ALTER TABLE "public"."User" RENAME COLUMN "Position_Code" TO "ContractPosition_Code";
--- Create "Intern" table
+-- -- Create "Intern" table
-CREATE TABLE "public"."Intern" (
+-- CREATE TABLE "public"."Intern" (
-  "Id" bigserial NOT NULL,
+--   "Id" bigserial NOT NULL,
-  "CreatedAt" timestamptz NULL,
+--   "CreatedAt" timestamptz NULL,
-  "UpdatedAt" timestamptz NULL,
+--   "UpdatedAt" timestamptz NULL,
-  "DeletedAt" timestamptz NULL,
+--   "DeletedAt" timestamptz NULL,
-  "Person_Id" bigint NULL,
+--   "Person_Id" bigint NULL,
-  "Position_Code" character varying(20) NULL,
+--   "Position_Code" character varying(20) NULL,
-  "User_Id" bigint NULL,
+--   "User_Id" bigint NULL,
-  PRIMARY KEY ("Id"),
+--   PRIMARY KEY ("Id"),
-  CONSTRAINT "fk_Intern_Person" FOREIGN KEY ("Person_Id") REFERENCES "public"."Person" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION,
+--   CONSTRAINT "fk_Intern_Person" FOREIGN KEY ("Person_Id") REFERENCES "public"."Person" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION,
-  CONSTRAINT "fk_Intern_User" FOREIGN KEY ("User_Id") REFERENCES "public"."User" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION
+--   CONSTRAINT "fk_Intern_User" FOREIGN KEY ("User_Id") REFERENCES "public"."User" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION
-);
+-- );

cmd/main-migration/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:5zzKM5mZWg7boY0OYotYXr6yCVyHsJYrwx+WHnYZ25A=
+h1:nkA4yHX6MSnA6zb6xACKXMBMwaAu4BRoT1Cs4DW3z80=
 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -49,7 +49,9 @@ h1:5zzKM5mZWg7boY0OYotYXr6yCVyHsJYrwx+WHnYZ25A=
 20251016062912.sql h1:ACNn0fe+EMqUt3hoY+Dr3uqAV/QICBa1+mIW7fUc9Fk=
 20251017060617.sql h1:4T3t9ifWrEQTPMSM0XJ98pF7Qdt+UfgtMui17bhrnWI=
 20251017082207.sql h1:8vLG1l/saRRMHXkyA4nelJyjaSddhZd6r7R+Uo4JS/c=
-20251019093915.sql h1:vWqTEc9bZpnAj53DLNKaTYbEoiSqdQJ9Mx4Qv9zmXU8=
+20251018032635.sql h1:2xey5gnO3y2XSOrU8MLlIfoylPKbRGDRtHDD07B3MbQ=
-20251020062553.sql h1:TMlFzG+6P/rqIDzF6y8OLrWy4vusEDonVHhfRwRhrqw=
+20251018040322.sql h1:k/pdNiSoT8zFPqNQ/avOD0vYkNh3BTD64IlHrfVXr7I=
-20251021041042.sql h1:jeEBAgnfPZpkfe5wDE7oG37JpF74IXAeYCbAx7zzRro=
+20251019093915.sql h1:hFcQE0y+p5dZiVwePGsRGto9m/q6kJNiUZbVDd5Rnjk=
-20251021075552.sql h1:vokB4CkMSWJ3eexhYRfuX0PQZ4AYU5Yc3bFM+2R0Wuk=
+20251020062553.sql h1:Iw7hulcm5iRQlfW+ygA4iTPxLqkxx6h9vXMXEwUAHKs=
+20251021041042.sql h1:wMgSivBV2A0NDcsLmKGIp0kMcVh2IODSG9b4dgzCaOM=
+20251021075552.sql h1:8gfSMAglflNO6L0sSzxFNEubYN8/O4thT7OQT+WH+3M=

internal/domain/main-entities/employee/dto.go

@@ -5,6 +5,7 @@ import (
 	ed "simrs-vx/internal/domain/main-entities/division"
 	ep "simrs-vx/internal/domain/main-entities/person"
 	eu "simrs-vx/internal/domain/main-entities/user"
+	erg "simrs-vx/internal/domain/references/organization"
 
 	erc "simrs-vx/internal/domain/references/common"
 )
@@ -27,6 +28,7 @@ type FilterDto struct {
 	User_Id       *uint                `json:"user-id"`
 	Person_Id     *uint                `json:"person-id"`
 	Division_Code *string              `json:"division-code"`
+	Position_Code *string              `json:"position-code"`
 	Number        *string              `json:"number"`
 	Status_Code   erc.ActiveStatusCode `json:"status-code"`
 }
@@ -55,14 +57,15 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.Main
-	User_Id       *uint                `json:"user_id"`
+	User_Id       *uint                       `json:"user_id"`
-	User          *eu.User             `json:"user,omitempty"`
+	User          *eu.User                    `json:"user,omitempty"`
-	Person_Id     *uint                `json:"person_id"`
+	Person_Id     *uint                       `json:"person_id"`
-	Person        *ep.Person           `json:"person,omitempty"`
+	Person        *ep.Person                  `json:"person,omitempty"`
-	Division_Code *string              `json:"division_code"`
+	Division_Code *string                     `json:"division_code"`
-	Division      *ed.Division         `json:"division,omitempty"`
+	Division      *ed.Division                `json:"division,omitempty"`
-	Number        *string              `json:"number"`
+	Position_Code *erg.EmployeePosisitionCode `json:"position_code"`
-	Status_Code   erc.ActiveStatusCode `json:"status_code"`
+	Number        *string                     `json:"number"`
+	Status_Code   erc.ActiveStatusCode        `json:"status_code"`
 }
 
 func (d Employee) ToResponse() ResponseDto {

internal/domain/main-entities/user/dto.go

@@ -89,7 +89,7 @@ type EmployeUpdateDto struct {
 	Person_Id     *uint                      `json:"-"`
 	Division_Code *string                    `json:"division_code"`
 	Number        *string                    `json:"number" validate:"maxLength=20"`
-	Position_Code erg.EmployeePosisitionCode `json:"status_code" validate:"maxLength=10"`
+	Position_Code erg.EmployeePosisitionCode `json:"position_code" validate:"maxLength=20"`
 	Status_Code   erc.ActiveStatusCode       `json:"status_code" validate:"maxLength=10"`
 }
 

internal/use-case/main-use-case/encounter/helper.go

@@ -80,7 +80,7 @@ func setDataUpdate(src e.UpdateDto, dst *e.Encounter) {
 }
 
 func setDataDischarge(src e.DischargeDto, dst *e.Encounter) {
-	dst.Discharge_Method_Code = src.Discharge_Method_Code
+	dst.Discharge_Method_Code = src.DischargeMethod_Code
 	dst.EarlyEducation = src.EarlyEducation
 	dst.MedicalDischargeEducation = src.MedicalDischargeEducation
 	dst.AdmDischargeEducation = src.AdmDischargeEducation