Dish API wIth Menu

Makefile

@@ -84,6 +84,10 @@ build_swagger:
 	rm -rf ${APP_PATH}/doc/swagger/statik
 	cd ${APP_PATH} && statik -src=./doc/swagger -dest=./doc
 
+rebuild_prod:
+	$(DOCKER_COMPOSE) -f docker-compose.yaml down
+	$(DOCKER_COMPOSE) -f docker-compose.yaml up -d --build
+
 # 半田市のデータをデータベースに追加
 seed_handa:
 	docker compose cp ./ops/docker/entrypoint/data/ mysql:tmp/data/

app/domain/dish_domain.go

@@ -12,23 +12,31 @@ type Dish struct {
 	Name string `json:"name"`
 }
 
+type DishWithMenuIDs struct {
+	Dish
+	MenuIDs []string `json:"menu_ids"`
+}
+
 type DishRepository interface {
 	Create(ctx context.Context, dish *Dish, menuID string) error
-	GetByID(ctx context.Context, id string) (*Dish, error)
+	GetByID(ctx context.Context, id string, limit int32, offset int32) (*DishWithMenuIDs, error)
+	GetByIdInCity(ctx context.Context, id string, limit int32, offset int32, city int32) (*DishWithMenuIDs, error)
 	FetchByMenuID(ctx context.Context, menuID string) ([]*Dish, error)
 	FetchByName(ctx context.Context, search string, limit int32, offset int32) ([]*Dish, error)
 	Fetch(ctx context.Context, limit int32, offset int32) ([]*Dish, error)
 }
 
 type DishUsecase interface {
 	Create(ctx context.Context, dish *Dish, menuID string) error
-	GetByID(ctx context.Context, id string) (*Dish, error)
+	GetByID(ctx context.Context, id string, limit int32, offset int32) (*DishWithMenuIDs, error)
+	GetByIdInCity(ctx context.Context, id string, limit int32, offset int32, city int32) (*DishWithMenuIDs, error)
 	FetchByMenuID(ctx context.Context, menuID string) ([]*Dish, error)
 	Fetch(ctx context.Context, search string, limit int32, offset int32) ([]*Dish, error)
 }
 
 type DishController interface {
 	GetByID(c echo.Context) error
+	GetByIdInCity(c echo.Context) error
 	FetchByMenuID(c echo.Context) error
 	Fetch(c echo.Context) error
 }
@@ -49,8 +57,23 @@ func ReNewDish(id string, name string) (*Dish, error) {
 
 	return newDish(id, name)
 }
+
 func NewDish(name string) (*Dish, error) {
 	id := util.NewUlid()
 
 	return newDish(id, name)
 }
+
+func ReNewDishWithMenuIDs(id string, name string, menuIDs []string) (*DishWithMenuIDs, error) {
+
+	dish, err := newDish(id, name)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &DishWithMenuIDs{
+		Dish:    *dish,
+		MenuIDs: menuIDs,
+	}, nil
+}

app/infrastructure/db/query/dish.sql

@@ -2,12 +2,27 @@
 INSERT INTO dishes (id, name)
 VALUES (sqlc.arg(id), sqlc.arg(name));
 
--- name: GetDish :one
+-- name: GetDish :many
 SELECT dishes.id,
-  dishes.name
+  dishes.name,
+  md.menu_id AS menu_id
+FROM dishes
+  INNER JOIN menu_dishes AS md ON dishes.id = md.dish_id
+WHERE dishes.id = sqlc.arg(id)
+ORDER BY dishes.id
+LIMIT ? OFFSET ?;
+
+-- name: GetDishInCity :many
+SELECT dishes.id,
+  dishes.name,
+  md.menu_id AS menu_id
 FROM dishes
-WHERE id = sqlc.arg(id)
-LIMIT 1;
+  INNER JOIN menu_dishes AS md ON dishes.id = md.dish_id
+  INNER JOIN menus AS m ON md.menu_id = m.id
+WHERE dishes.id = sqlc.arg(id)
+  AND m.city_code = sqlc.arg(city_code)
+ORDER BY dishes.id
+LIMIT ? OFFSET ?;
 
 -- name: ListDishByMenuID :many
 SELECT dishes.id,