feat (patient): rework search

internal/use-case/main-use-case/patient/case.go

@@ -352,18 +352,18 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 
 }
 
-func Search(input e.SearchDto) (*d.Data, error) {
+func SearchByResidentIdentityNumber(input e.SearchDto) (*d.Data, error) {
 	var data *e.Patient
 	var err error
 
 	event := pl.Event{
-		Feature: "Search",
+		Feature: "Search By Resident Identity Number",
 		Source:  source,
 	}
 
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "search")
-	if data, err = SearchData(input, &event); err != nil {
+	if data, err = SearchDataByRIN(input, &event); err != nil {
 		return nil, err
 	}
 
@@ -377,6 +377,46 @@ func Search(input e.SearchDto) (*d.Data, error) {
 	}, nil
 }
 
+func Search(input e.SearchDto) (*d.Data, error) {
+	var dataList []e.Patient
+	var metaList *e.MetaDto
+	var err error
+
+	event := pl.Event{
+		Feature: "Search",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "readList")
+
+	err = dg.I.Transaction(func(tx *gorm.DB) error {
+
+		if dataList, metaList, err = SearchData(input, &event, tx); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":              source,
+			"structure":           "list-data",
+			"status":              "fetched",
+			"page_number":         strconv.Itoa(metaList.PageNumber),
+			"page_size":           strconv.Itoa(metaList.PageSize),
+			"record_totalCount":   strconv.Itoa(metaList.Count),
+			"record_currentCount": strconv.Itoa(len(dataList)),
+		},
+		Data: e.ToResponseList(dataList),
+	}, nil
+}
+
 func Upload(input e.UploadDto) (*d.Data, error) {
 	rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
 	var data *e.Patient

internal/use-case/main-use-case/patient/lib.go

@@ -154,11 +154,11 @@ func DeleteData(data *e.Patient, event *pl.Event, dbx ...*gorm.DB) error {
 	return nil
 }
 
-func SearchData(input e.SearchDto, event *pl.Event, dbx ...*gorm.DB) (*e.Patient, error) {
+// Search By Resident Identity Number
+func SearchDataByRIN(input e.SearchDto, event *pl.Event, dbx ...*gorm.DB) (*e.Patient, error) {
 	pl.SetLogInfo(event, input, "started", "DBSearch")
 
-	var patient e.Patient
-	var err error
+	var data e.Patient
 
 	var tx *gorm.DB
 	if len(dbx) > 0 {
@@ -174,27 +174,60 @@ func SearchData(input e.SearchDto, event *pl.Event, dbx ...*gorm.DB) (*e.Patient
 		Preload("Person.Relatives").
 		Preload("Person.Insurances")
 
-	switch input.Mode {
-	case e.SMIdent:
-		// Search by patient number OR person's resident identity number (exact match) OR person's name (partial match)
-		err = tx.Joins("JOIN \"Person\" ON \"Patient\".\"Person_Id\" = \"Person\".\"Id\"").
-			Where("\"Patient\".\"Number\" = ? OR \"Person\".\"ResidentIdentityNumber\" = ? OR \"Person\".\"Name\" ILIKE ?",
-				input.Search, input.Search, "%"+input.Search+"%").
-			First(&patient).Error
-	case e.SMNik:
-		// Search by patient person's resident identity number (exact match)
-		err = tx.Joins("JOIN \"Person\" ON \"Patient\".\"Person_Id\" = \"Person\".\"Id\"").
-			Where("\"Person\".\"ResidentIdentityNumber\" = ?",
-				input.Search).
-			First(&patient).Error
-	}
+	// Search by patient person's resident identity number (exact match)
+	err := tx.Joins("JOIN \"Person\" ON \"Patient\".\"Person_Id\" = \"Person\".\"Id\"").
+		Where("\"Person\".\"ResidentIdentityNumber\" = ?",
+			input.Search).
+		First(&data).Error
 
 	if err != nil {
-		if processedErr := pu.HandleSearchError(err, event, source, input.Search, patient); processedErr != nil {
+		if processedErr := pu.HandleSearchError(err, event, source, input.Search, data); processedErr != nil {
 			return nil, processedErr
 		}
 	}
 
 	pl.SetLogInfo(event, nil, "complete")
-	return &patient, nil
+	return &data, nil
+}
+
+func SearchData(input e.SearchDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Patient, *e.MetaDto, error) {
+	pl.SetLogInfo(event, input, "started", "DBSearch")
+
+	var data []e.Patient
+	pagination := gh.Pagination{}
+	count := int64(0)
+	meta := e.MetaDto{}
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	// Preload associations for complete data
+	tx = tx.Preload(clause.Associations)
+	tx = tx.Preload("Person.Addresses").
+		Preload("Person.Contacts").
+		Preload("Person.Relatives").
+		Preload("Person.Insurances")
+
+	// Search by patient number OR person's resident identity number (exact match) OR person's name (partial match)
+	tx = tx.Joins("JOIN \"Person\" ON \"Patient\".\"Person_Id\" = \"Person\".\"Id\"").
+		Where("\"Patient\".\"Number\" ILIKE ? OR \"Person\".\"ResidentIdentityNumber\" ILIKE ? OR \"Person\".\"Name\" ILIKE ?",
+			"%"+input.Search+"%", "%"+input.Search+"%", "%"+input.Search+"%")
+	err := tx.Scopes(gh.Paginate(input, &pagination)).Find(&data).Error
+
+	if err != nil {
+		if processedErr := pu.HandleSearchError(err, event, source, input.Search, data); processedErr != nil {
+			return nil, nil, processedErr
+		}
+	}
+
+	meta.Count = int(count)
+	meta.PageNumber = pagination.PageNumber
+	meta.PageSize = pagination.PageSize
+
+	pl.SetLogInfo(event, nil, "complete")
+	return data, &meta, nil
 }