Clear generete structur bpjsAll

internal/models/models.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-// NullableInt32 is a custom type to replace sql.NullInt32 for swagger compatibility
+// NullableInt32 - your existing implementation
 type NullableInt32 struct {
 	Int32 int32 `json:"int32,omitempty"`
 	Valid bool  `json:"valid"`
@@ -31,6 +31,56 @@ func (n NullableInt32) Value() (driver.Value, error) {
 	return n.Int32, nil
 }
 
+// NullableString provides consistent nullable string handling
+type NullableString struct {
+	String string `json:"string,omitempty"`
+	Valid  bool   `json:"valid"`
+}
+
+// Scan implements the sql.Scanner interface for NullableString
+func (n *NullableString) Scan(value interface{}) error {
+	var ns sql.NullString
+	if err := ns.Scan(value); err != nil {
+		return err
+	}
+	n.String = ns.String
+	n.Valid = ns.Valid
+	return nil
+}
+
+// Value implements the driver.Valuer interface for NullableString
+func (n NullableString) Value() (driver.Value, error) {
+	if !n.Valid {
+		return nil, nil
+	}
+	return n.String, nil
+}
+
+// NullableTime provides consistent nullable time handling
+type NullableTime struct {
+	Time  time.Time `json:"time,omitempty"`
+	Valid bool      `json:"valid"`
+}
+
+// Scan implements the sql.Scanner interface for NullableTime
+func (n *NullableTime) Scan(value interface{}) error {
+	var nt sql.NullTime
+	if err := nt.Scan(value); err != nil {
+		return err
+	}
+	n.Time = nt.Time
+	n.Valid = nt.Valid
+	return nil
+}
+
+// Value implements the driver.Valuer interface for NullableTime
+func (n NullableTime) Value() (driver.Value, error) {
+	if !n.Valid {
+		return nil, nil
+	}
+	return n.Time, nil
+}
+
 // Metadata untuk pagination - dioptimalkan
 type MetaResponse struct {
 	Limit       int  `json:"limit"`

internal/models/retribusi/retribusi.go

@@ -1,8 +1,7 @@
-package models
+package retribusi
 
 import (
 	"api-service/internal/models"
-	"database/sql"
 	"encoding/json"
 	"time"
 )
@@ -10,27 +9,27 @@ import (
 // Retribusi represents the data structure for the retribusi table
 // with proper null handling and optimized JSON marshaling
 type Retribusi struct {
-	ID             string               `json:"id" db:"id"`
-	Status         string               `json:"status" db:"status"`
-	Sort           models.NullableInt32 `json:"sort,omitempty" db:"sort"`
-	UserCreated    sql.NullString       `json:"user_created,omitempty" db:"user_created"`
-	DateCreated    sql.NullTime         `json:"date_created,omitempty" db:"date_created"`
-	UserUpdated    sql.NullString       `json:"user_updated,omitempty" db:"user_updated"`
-	DateUpdated    sql.NullTime         `json:"date_updated,omitempty" db:"date_updated"`
-	Jenis          sql.NullString       `json:"jenis,omitempty" db:"Jenis"`
-	Pelayanan      sql.NullString       `json:"pelayanan,omitempty" db:"Pelayanan"`
-	Dinas          sql.NullString       `json:"dinas,omitempty" db:"Dinas"`
-	KelompokObyek  sql.NullString       `json:"kelompok_obyek,omitempty" db:"Kelompok_obyek"`
-	KodeTarif      sql.NullString       `json:"kode_tarif,omitempty" db:"Kode_tarif"`
-	Tarif          sql.NullString       `json:"tarif,omitempty" db:"Tarif"`
-	Satuan         sql.NullString       `json:"satuan,omitempty" db:"Satuan"`
-	TarifOvertime  sql.NullString       `json:"tarif_overtime,omitempty" db:"Tarif_overtime"`
-	SatuanOvertime sql.NullString       `json:"satuan_overtime,omitempty" db:"Satuan_overtime"`
-	RekeningPokok  sql.NullString       `json:"rekening_pokok,omitempty" db:"Rekening_pokok"`
-	RekeningDenda  sql.NullString       `json:"rekening_denda,omitempty" db:"Rekening_denda"`
-	Uraian1        sql.NullString       `json:"uraian_1,omitempty" db:"Uraian_1"`
-	Uraian2        sql.NullString       `json:"uraian_2,omitempty" db:"Uraian_2"`
-	Uraian3        sql.NullString       `json:"uraian_3,omitempty" db:"Uraian_3"`
+	ID             string                `json:"id" db:"id"`
+	Status         string                `json:"status" db:"status"`
+	Sort           models.NullableInt32  `json:"sort,omitempty" db:"sort"`
+	UserCreated    models.NullableString `json:"user_created,omitempty" db:"user_created"`
+	DateCreated    models.NullableTime   `json:"date_created,omitempty" db:"date_created"`
+	UserUpdated    models.NullableString `json:"user_updated,omitempty" db:"user_updated"`
+	DateUpdated    models.NullableTime   `json:"date_updated,omitempty" db:"date_updated"`
+	Jenis          models.NullableString `json:"jenis,omitempty" db:"Jenis"`
+	Pelayanan      models.NullableString `json:"pelayanan,omitempty" db:"Pelayanan"`
+	Dinas          models.NullableString `json:"dinas,omitempty" db:"Dinas"`
+	KelompokObyek  models.NullableString `json:"kelompok_obyek,omitempty" db:"Kelompok_obyek"`
+	KodeTarif      models.NullableString `json:"kode_tarif,omitempty" db:"Kode_tarif"`
+	Tarif          models.NullableString `json:"tarif,omitempty" db:"Tarif"`
+	Satuan         models.NullableString `json:"satuan,omitempty" db:"Satuan"`
+	TarifOvertime  models.NullableString `json:"tarif_overtime,omitempty" db:"Tarif_overtime"`
+	SatuanOvertime models.NullableString `json:"satuan_overtime,omitempty" db:"Satuan_overtime"`
+	RekeningPokok  models.NullableString `json:"rekening_pokok,omitempty" db:"Rekening_pokok"`
+	RekeningDenda  models.NullableString `json:"rekening_denda,omitempty" db:"Rekening_denda"`
+	Uraian1        models.NullableString `json:"uraian_1,omitempty" db:"Uraian_1"`
+	Uraian2        models.NullableString `json:"uraian_2,omitempty" db:"Uraian_2"`
+	Uraian3        models.NullableString `json:"uraian_3,omitempty" db:"Uraian_3"`
 }
 
 // Custom JSON marshaling untuk Retribusi agar NULL values tidak muncul di response

internal/models/vclaim/rujukan/rujukan.go

@@ -17,7 +17,7 @@ type RujukanData struct {
 	Keluhan      string          `json:"keluhan"`
 	NoKunjungan  string          `json:"noKunjungan"`
 	Pelayanan    PelayananData   `json:"pelayanan"`
-	Peserta      PesertaData     `json:"peserta"`
+	Peserta      DataPeserta     `json:"peserta"`
 	PoliRujukan  PoliRujukanData `json:"poliRujukan"`
 	ProvPerujuk  ProvPerujukData `json:"provPerujuk"`
 	TglKunjungan string          `json:"tglKunjungan"`
@@ -43,7 +43,7 @@ type ProvPerujukData struct {
 	Nama string `json:"nama"`
 }
 
-type PesertaData struct {
+type DataPeserta struct {
 	NoKartu       string `json:"noKartu"`
 	NIK           string `json:"nik"`
 	Nama          string `json:"nama"`