diff --git a/internal/domain/antrian_operasi/request.go b/internal/domain/antrian_operasi/request.go index 2612bee..02c4823 100644 --- a/internal/domain/antrian_operasi/request.go +++ b/internal/domain/antrian_operasi/request.go @@ -5,10 +5,10 @@ import ( ) type FormDataRequest struct { - NoRekamMedis string `json:"noRekamMedis"` - NoKtp *string `json:"noKtp"` - NamaPasien *string `json:"namaPasien"` - JenisKelamin *string `json:"jenisKelamin"` + NoRekamMedis string `json:"noRekamMedis" binding:"required"` + NoKtp string `json:"noKtp" binding:"required"` + NamaPasien string `json:"namaPasien" binding:"required"` + JenisKelamin string `json:"jenisKelamin" binding:"required,oneof=L P"` TglLahir *string `json:"tanggalLahir"` Umur *string `json:"umur"` Alamat *string `json:"alamat"` @@ -48,7 +48,7 @@ type DokterPelaksanaItemRequest struct { type StatusPasienRequest struct { TglSelesai *time.Time `json:"tanggalSelesai"` - StatusOperasi string `json:"statusOperasi"` + StatusOperasi string `json:"statusOperasi" binding:"required,oneof=1 2 3 4"` KeteranganStatus *string `json:"keteranganStatus"` } diff --git a/internal/domain/antrian_operasi/response.go b/internal/domain/antrian_operasi/response.go index 9f0f2b5..40377f6 100644 --- a/internal/domain/antrian_operasi/response.go +++ b/internal/domain/antrian_operasi/response.go @@ -39,9 +39,9 @@ func (model DetailPasienOperasiResultQuery) MapToResponse() DetailPasienOperasiR } result.FormData = FormDataRequest{ NoRekamMedis: handleStringPointer(model.ResultMain.NoRekamMedis), - NoKtp: model.ResultMain.NoKtp, - NamaPasien: model.ResultMain.NamaPasien, - JenisKelamin: model.ResultMain.JenisKelamin, + NoKtp: *model.ResultMain.NoKtp, + NamaPasien: *model.ResultMain.NamaPasien, + JenisKelamin: *model.ResultMain.JenisKelamin, TglLahir: &tglLahir, Umur: model.ResultMain.Umur, Alamat: model.ResultMain.Alamat, diff --git a/internal/shared/validationError.go b/internal/shared/validationError.go index c1b85f2..f60b53e 100644 --- a/internal/shared/validationError.go +++ b/internal/shared/validationError.go @@ -31,6 +31,10 @@ func errorMessage(fe validator.FieldError) string { errorInfo = "tidak boleh kosong" case "min": errorInfo = "harus diisi minimal " + fe.Param() + case "max": + errorInfo = "harus diisi maksimal " + fe.Param() + case "oneof": + errorInfo = "hanya bisa diisi dengan : " + fe.Param() default: errorInfo = "tidak valid" }