munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat (person): add check nick flow, and add nik validation

Browse Source
This commit is contained in:
dpurbosakti
2025-09-03 13:06:37 +07:00
parent a631f33248
commit 3d98e5508d
11 changed files with 134 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/nurse/dto.go
+7
View File
@@ -3,11 +3,13 @@ package nurse
import (
ecore "simrs-vx/internal/domain/base-entities/core"
ee "simrs-vx/internal/domain/main-entities/employee"
eu "simrs-vx/internal/domain/main-entities/unit"
)
type CreateDto struct {
Employee_Id *uint `json:"employee_id"`
IHS_Number *string `json:"ihs_number"`
Unit_Id *uint16 `json:"unit_id"`
}
type ReadListDto struct {
@@ -19,6 +21,7 @@ type ReadListDto struct {
type FilterDto struct {
Employee_Id *uint `json:"employee_id"`
IHS_Number *string `json:"ihs_number"`
Unit_Id *uint16 `json:"unit_id"`
Page int `json:"page"`
PageSize int `json:"page_size"`
@@ -50,6 +53,8 @@ type ResponseDto struct {
Employee_Id *uint `json:"employee_id"`
Employee *ee.Employee `json:"employee,omitempty"`
IHS_Number *string `json:"ihs_number"`
Unit_Id *uint16 `json:"unit_id"`
Unit *eu.Unit `json:"unit,omitempty"`
}
func (d Nurse) ToResponse() ResponseDto {
@@ -57,6 +62,8 @@ func (d Nurse) ToResponse() ResponseDto {
Employee_Id: d.Employee_Id,
Employee: d.Employee,
IHS_Number: d.IHS_Number,
Unit_Id: d.Unit_Id,
Unit: d.Unit,
}
resp.Main = d.Main
return resp
internal/domain/main-entities/patient/dto.go
-1
View File
@@ -19,7 +19,6 @@ type CreateDto struct {
PersonRelatives []epr.UpdateDto `json:"personRelatives"`
RegisteredAt *time.Time `json:"registeredAt"`
Status_Code erc.ActiveStatusCode `json:"status_code"`
Number *string `json:"number"`
}
type ReadListDto struct {
internal/domain/main-entities/person-relative/dto.go
+1 -1
View File
@@ -16,7 +16,7 @@ type CreateDto struct {
PhoneNumber *string `json:"phoneNumber"`
Education_Code *erp.EducationCode `json:"education_code"`
Occupation_Code *erp.OcupationCode `json:"occupation_code"`
Occupation_Name *string `json:"occupation_name"`
Occupation_Name *string `json:"occupation_name" validate:"maxLength=50"`
}
type ReadListDto struct {
internal/domain/main-entities/person/dto.go
+4 -2
View File
@@ -17,13 +17,13 @@ type CreateDto struct {
BirthDate *time.Time `json:"birthDate,omitempty"`
BirthRegency_Code *string `json:"birthRegency_code"`
Gender_Code *erp.GenderCode `json:"gender_code"`
ResidentIdentityNumber *string `json:"residentIdentityNumber"`
ResidentIdentityNumber *string `json:"residentIdentityNumber" validate:"nik"`
PassportNumber *string `json:"passportNumber"`
DrivingLicenseNumber *string `json:"drivingLicenseNumber"`
Religion_Code *erp.ReligionCode `json:"religion_code"`
Education_Code *erp.EducationCode `json:"education_code"`
Ocupation_Code *erp.OcupationCode `json:"occupation_code"`
Ocupation_Name *string `json:"occupation_name"`
Ocupation_Name *string `json:"occupation_name" validate:"maxLength=50"`
Ethnic_Code *string `json:"ethnic_code"`
Language_Code *string `json:"language_code"`
}
@@ -60,6 +60,8 @@ type ReadDetailDto struct {
Id uint `json:"id"`
Name *string `json:"name"`
ResidentIdentityNumber *string `json:"residentIdentityNumber"`
PassportNumber *string `json:"passportNumber"`
DrivingLicenseNumber *string `json:"drivingLicenseNumber"`
}
type UpdateDto struct {
internal/domain/main-entities/person/entity.go
+7
View File
@@ -35,3 +35,10 @@ type Person struct {
Language_Code *string `json:"language_code" gorm:"size:10"`
Language *el.Language `json:"language,omitempty" gorm:"foreignKey:Language_Code;references:Code"`
}
func (d Person) IsSameResidentIdentityNumber(input *string) bool {
if input == nil {
return false
}
return d.ResidentIdentityNumber == input
}
internal/interface/main-handler/helper/validation/validation.go
+9
View File
@@ -0,0 +1,9 @@
package validation
import (
s "github.com/karincake/serabi"
)
func RegisterValidation() {
s.AddTagForRegex("nik", "^(1[1-9]|21|[37][1-6]|5[1-3]|6[1-5]|[89][12])\\d{2}\\d{2}([04][1-9]|[1256][0-9]|[37][01])(0[1-9]|1[0-2])\\d{2}\\d{4}$", "must be a valid nik format")
}
internal/interface/main-handler/main-handler.go
+2
View File
@@ -69,6 +69,7 @@ import (
village "simrs-vx/internal/interface/main-handler/village"
///// Internal
validation "simrs-vx/internal/interface/main-handler/helper/validation"
"simrs-vx/internal/interface/main-handler/home"
)
@@ -79,6 +80,7 @@ func SetRoutes() http.Handler {
a.RegisterExtCall(zlc.Adjust)
a.RegisterExtCall(ssdb.Init)
a.RegisterExtCall(lh.Populate)
a.RegisterExtCall(validation.RegisterValidation)
r := http.NewServeMux()
internal/use-case/main-use-case/nurse/helper.go
+1
View File
@@ -19,4 +19,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Nurse) {
data.Employee_Id = inputSrc.Employee_Id
data.IHS_Number = inputSrc.IHS_Number
data.Unit_Id = inputSrc.Unit_Id
}
internal/use-case/main-use-case/patient/helper.go
+56 -38
View File
@@ -5,19 +5,14 @@ Any functions that are used internally by the use-case
package patient
import (
"errors"
"fmt"
e "simrs-vx/internal/domain/main-entities/patient"
ep "simrs-vx/internal/domain/main-entities/person"
"strconv"
up "simrs-vx/internal/use-case/main-use-case/person"
pl "simrs-vx/pkg/logger"
"gorm.io/gorm"
dg "github.com/karincake/apem/db-gorm-pg"
)
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Patient) {
func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Patient) error {
var inputSrc *e.CreateDto
if inputT, ok := any(input).(*e.CreateDto); ok {
inputSrc = inputT
@@ -26,40 +21,63 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Patient) {
inputSrc = &inputTemp.CreateDto
}
data.Person_Id = inputSrc.Person_Id
data.RegisteredAt = inputSrc.RegisteredAt
data.Status_Code = inputSrc.Status_Code
data.Number = inputSrc.Number
}
func createOrUpdatePerson(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
if input.Person.Id == 0 {
person, err := up.CreateData(input.Person.CreateDto, event, tx)
if data.Id == 0 {
medRecNum, err := GenerateNextMedicalRecordNumber()
if err != nil {
return err
}
input.Person_Id = &person.Id
return nil
data.Number = &medRecNum
}
person, err := up.ReadDetailData(ep.ReadDetailDto{Id: input.Person.Id}, event, tx)
if err != nil {
return err
}
if person == nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-notFound",
Detail: "person with ID " + strconv.Itoa(int(*input.Person_Id)) + " not found",
Raw: errors.New("person with ID " + strconv.Itoa(int(*input.Person_Id)) + " not found"),
}
return pl.SetLogError(event, input)
}
if err := up.UpdateData(ep.UpdateDto{CreateDto: input.Person.CreateDto}, person, event, tx); err != nil {
return err
}
input.Person_Id = &person.Id
data.Person_Id = inputSrc.Person_Id
data.RegisteredAt = inputSrc.RegisteredAt
data.Status_Code = inputSrc.Status_Code
return nil
}
func GenerateNextMedicalRecordNumber() (string, error) {
var last string
err := dg.I.
Table("\"Patient\"").
Select("\"Number\"").
Where("\"Number\" IS NOT NULL AND \"Number\" ~ '^[0-9]+$'"). // Only numeric strings
Order("\"Number\"::bigint DESC").
Limit(1).
Scan(&last).Error
if err != nil {
return "", err
}
var nextInt int64
var format string
if last == "" {
// No existing records, start with 10 digits
nextInt = 1
format = "%010d"
} else {
n, err := strconv.ParseInt(last, 10, 64)
if err != nil {
return "", err
}
nextInt = n + 1
// Dynamically determine format based on existing number
digitCount := len(last)
// If the incremented number needs more digits, expand format
nextStr := strconv.FormatInt(nextInt, 10)
if len(nextStr) > digitCount {
digitCount = len(nextStr)
}
// Ensure minimum 10 digits as per requirement
if digitCount < 10 {
digitCount = 10
}
format = fmt.Sprintf("%%0%dd", digitCount)
}
return fmt.Sprintf(format, nextInt), nil
}
internal/use-case/main-use-case/patient/lib.go
+6 -2
View File
@@ -15,7 +15,9 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Patient
pl.SetLogInfo(event, nil, "started", "DBCreate")
data := e.Patient{}
setData(&input, &data)
if err := setData(&input, &data); err != nil {
return nil, err
}
var tx *gorm.DB
if len(dbx) > 0 {
@@ -114,7 +116,9 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
func UpdateData(input e.UpdateDto, data *e.Patient, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBUpdate")
setData(&input, data)
if err := setData(&input, data); err != nil {
return err
}
var tx *gorm.DB
if len(dbx) > 0 {
internal/use-case/main-use-case/person/lib.go
+41 -4
View File
@@ -8,6 +8,7 @@ import (
"strconv"
dg "github.com/karincake/apem/db-gorm-pg"
d "github.com/karincake/dodol"
gh "github.com/karincake/getuk"
"gorm.io/gorm"
)
@@ -100,7 +101,21 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
tx = tx.Preload("Contacts").
Preload("Addresses")
if err := tx.First(&data, input.Id).Error; err != nil {
if input.ResidentIdentityNumber != nil {
tx = tx.Where("\"ResidentIdentityNumber\" = ?", *input.ResidentIdentityNumber)
}
if input.PassportNumber != nil {
tx = tx.Where("\"PassportNumber\" = ?", *input.PassportNumber)
}
if input.DrivingLicenseNumber != nil {
tx = tx.Where("\"DrivingLicenseNumber\" = ?", *input.DrivingLicenseNumber)
}
if input.Id != 0 {
tx = tx.Where("\"Id\" = ?", input.Id)
}
if err := tx.First(&data).Error; err != nil {
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
@@ -159,6 +174,7 @@ func DeleteData(data *e.Person, event *pl.Event, dbx ...*gorm.DB) error {
}
func CreateOrUpdatePerson(input *e.UpdateDto, event *pl.Event, tx *gorm.DB) (*uint, error) {
inputCreateData := input.CreateDto
if input.Id == 0 {
person, err := CreateData(input.CreateDto, event, tx)
if err != nil {
@@ -183,9 +199,30 @@ func CreateOrUpdatePerson(input *e.UpdateDto, event *pl.Event, tx *gorm.DB) (*ui
return nil, pl.SetLogError(event, input)
}
// check nik jika sama ok; jika tidak sama cari person dengan nik tersebut [yg idnya bukan id orang tersebut]
// jika ketemu return erroor nik sudah digunakan; jika tidak ketemu berarti update nik
if err := UpdateData(e.UpdateDto{CreateDto: input.CreateDto}, person, event, tx); err != nil {
if person.IsSameResidentIdentityNumber(input.ResidentIdentityNumber) {
if err := UpdateData(e.UpdateDto{CreateDto: input.CreateDto}, person, event, tx); err != nil {
return nil, err
}
return &person.Id, nil
}
dup, err := ReadDetailData(e.ReadDetailDto{ResidentIdentityNumber: input.ResidentIdentityNumber}, event, tx)
if err != nil {
if fieldErr, ok := err.(d.FieldError); ok && fieldErr.Code == "data-notFound" {
} else {
return nil, err
}
} else if dup != nil && dup.Id != person.Id {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-duplicate",
Detail: "person with ResidentIdentityNumber " + *input.ResidentIdentityNumber + " already exists",
Raw: errors.New("person with ResidentIdentityNumber " + *input.ResidentIdentityNumber + " already exists"),
}
return nil, pl.SetLogError(event, input)
}
if err := UpdateData(e.UpdateDto{CreateDto: inputCreateData}, person, event, tx); err != nil {
return nil, err
}