fix: city response

app/domain/city_domain.go

@@ -16,7 +16,8 @@ type City struct {
 
 type CityRepository interface {
 	GetByCityCode(ctx context.Context, code int32) (*City, error)
-	Fetch(ctx context.Context, limit int32, offset int32, search string) ([]*City, error)
+	FetchByName(ctx context.Context, limit int32, offset int32, search string) ([]*City, error)
+	Fetch(ctx context.Context, limit int32, offset int32) ([]*City, error)
 	FetchByPrefectureCode(ctx context.Context, limit int32, offset int32, prefectureCode int32) ([]*City, error)
 }
 

app/domain/common.go

@@ -1,30 +1,6 @@
 package domain
 
-import "time"
-
 const (
 	DEFAULT_LIMIT  = int32(10)
 	DEFAULT_OFFSET = int32(0)
 )
-
-type Response struct {
-	Data interface{} `json:"data"`
-}
-
-type FetchResponse struct {
-	Data interface{} `json:"data"`
-	Next interface{} `json:"next"`
-}
-
-func NewResponse(data interface{}) *Response {
-	return &Response{
-		Data: data,
-	}
-}
-
-func NewFetchResponse[T string | int32 | time.Time](data interface{}, next T) *FetchResponse {
-	return &FetchResponse{
-		Data: data,
-		Next: next,
-	}
-}

app/infrastructure/repository/city_repository.go

@@ -36,40 +36,41 @@ func (r *cityRepository) GetByCityCode(ctx context.Context, code int32) (*domain
 
 }
 
-func (r *cityRepository) Fetch(ctx context.Context, limit int32, offset int32, search string) ([]*domain.City, error) {
-
-	if search != "" {
-		arg := db.ListCitiesByNameParams{
-			Limit:    limit,
-			Offset:   offset,
-			CityName: search,
-		}
-
-		result, err := r.query.ListCitiesByName(ctx, arg)
-		if err != nil {
-			return nil, err
-		}
-
-		var cities []*domain.City
-
-		for _, city := range result {
-			cities = append(cities, domain.NewCity(
-				city.CityCode,
-				city.CityName,
-				city.PrefectureCode,
-				city.PrefectureName,
-			))
-		}
-
-		return cities, nil
+func (r *cityRepository) FetchByName(ctx context.Context, limit int32, offset int32, search string) ([]*domain.City, error) {
+
+	arg := db.ListCitiesByNameParams{
+		Limit:    limit,
+		Offset:   offset,
+		CityName: search,
+	}
+
+	result, err := r.query.ListCitiesByName(ctx, arg)
+	if err != nil {
+		return nil, err
 	}
 
+	var cities []*domain.City
+
+	for _, city := range result {
+		cities = append(cities, domain.NewCity(
+			city.CityCode,
+			city.CityName,
+			city.PrefectureCode,
+			city.PrefectureName,
+		))
+	}
+
+	return cities, nil
+}
+
+func (r *cityRepository) Fetch(ctx context.Context, limit int32, offset int32) ([]*domain.City, error) {
 	arg := db.ListCitiesParams{
 		Limit:  limit,
 		Offset: offset,
 	}
 
 	result, err := r.query.ListCities(ctx, arg)
+
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +87,6 @@ func (r *cityRepository) Fetch(ctx context.Context, limit int32, offset int32, s
 	}
 
 	return cities, nil
-
 }
 
 func (r *cityRepository) FetchByPrefectureCode(ctx context.Context, limit int32, offset int32, prefectureCode int32) ([]*domain.City, error) {