Subject APIを追加

.env.example

@@ -1,3 +1,4 @@
 ANNOUNCEMENT_API_URL=
 GOOGLE_APPLICATION_CREDENTIALS=
 GOOGLE_CLOUD_PROJECT=
+SUBJECT_API_URL=

.github/workflows/cd.yaml

@@ -125,5 +125,6 @@ jobs:
           region: ${{ vars._DEPLOY_REGION }}
           env_vars: |
             ANNOUNCEMENT_API_URL=${{ vars.ANNOUNCEMENT_API_URL }}
+            SUBJECT_API_URL=${{ vars.SUBJECT_API_URL }}
           env_vars_update_strategy: overwrite
           secrets_update_strategy: overwrite

cmd/server/main.go

@@ -3,20 +3,16 @@ package main
 import (
 	"context"
 	"log"
-	"os"
 
 	firebase "firebase.google.com/go/v4"
 	api "github.com/fun-dotto/api-template/generated"
-	"github.com/fun-dotto/api-template/generated/external/announcement_api"
 	"github.com/fun-dotto/api-template/internal/handler"
+	"github.com/fun-dotto/api-template/internal/infrastructure"
 	"github.com/fun-dotto/api-template/internal/middleware"
-	"github.com/fun-dotto/api-template/internal/repository"
-	"github.com/fun-dotto/api-template/internal/service"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/gin-gonic/gin"
 	"github.com/joho/godotenv"
 	oapimiddleware "github.com/oapi-codegen/gin-middleware"
-	"google.golang.org/api/idtoken"
 )
 
 func main() {
@@ -46,31 +42,12 @@ func main() {
 	router.Use(oapimiddleware.OapiRequestValidator(spec))
 	router.Use(middleware.FirebaseAuth(authClient))
 
-	announcementAPIURL := os.Getenv("ANNOUNCEMENT_API_URL")
-	if announcementAPIURL == "" {
-		log.Fatal("ANNOUNCEMENT_API_URL is required")
-	}
-	// 認証付きHTTPクライアントを作成
-	announcementAPIAuthClient, err := idtoken.NewClient(ctx, announcementAPIURL)
+	clients, err := infrastructure.NewExternalClients(ctx)
 	if err != nil {
-		log.Fatal("Failed to create auth client:", err)
+		log.Fatalf("Failed to initialize external clients: %v", err)
 	}
 
-	// 生成されたクライアントに認証付きHTTPクライアントを注入
-	apiClient, err := announcement_api.NewClientWithResponses(
-		announcementAPIURL,
-		announcement_api.WithHTTPClient(announcementAPIAuthClient),
-	)
-	if err != nil {
-		log.Fatal("Failed to create API client:", err)
-	}
-
-	// Initialize layers
-	announcementRepo := repository.NewAnnouncementRepository(apiClient)
-	announcementService := service.NewAnnouncementService(announcementRepo)
-
-	// Register handlers
-	h := handler.NewHandler(announcementService)
+	h := handler.NewHandler(clients.Announcement, clients.Subject)
 	api.RegisterHandlers(router, h)
 
 	addr := ":8080"

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/oapi-codegen/gin-middleware v1.0.2
 	github.com/oapi-codegen/runtime v1.1.2
-	github.com/stretchr/testify v1.11.1
 	google.golang.org/api v0.231.0
 )
 
@@ -35,7 +34,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
 	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -74,7 +72,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.55.0 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect

internal/handler/announcement.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	api "github.com/fun-dotto/api-template/generated"
+	"github.com/fun-dotto/api-template/generated/external/announcement_api"
 	"github.com/fun-dotto/api-template/internal/middleware"
 )
 
@@ -15,15 +15,18 @@ func (h *Handler) AnnouncementsV1List(c *gin.Context) {
 		return
 	}
 
-	announcements, err := h.announcementService.List(c.Request.Context())
+	response, err := h.announcementClient.AnnouncementsV1ListWithResponse(c.Request.Context(), nil)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	c.JSON(http.StatusOK, api.AnnouncementsV1List200JSONResponse{
-		Announcements: ToAPIAnnouncements(announcements),
-	})
+	if response.JSON200 == nil {
+		c.JSON(response.StatusCode(), gin.H{"error": "unexpected response from upstream"})
+		return
+	}
+
+	c.JSON(http.StatusOK, response.JSON200)
 }
 
 // AnnouncementsV1Detail 詳細を取得する
@@ -32,15 +35,18 @@ func (h *Handler) AnnouncementsV1Detail(c *gin.Context, id string) {
 		return
 	}
 
-	announcement, err := h.announcementService.Detail(c.Request.Context(), id)
+	response, err := h.announcementClient.AnnouncementsV1DetailWithResponse(c.Request.Context(), id)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	c.JSON(http.StatusOK, api.AnnouncementsV1Detail200JSONResponse{
-		Announcement: ToAPIAnnouncement(announcement),
-	})
+	if response.JSON200 == nil {
+		c.JSON(response.StatusCode(), gin.H{"error": "unexpected response from upstream"})
+		return
+	}
+
+	c.JSON(http.StatusOK, response.JSON200)
 }
 
 // AnnouncementsV1Create 新規作成する
@@ -49,21 +55,24 @@ func (h *Handler) AnnouncementsV1Create(c *gin.Context) {
 		return
 	}
 
-	var req api.AnnouncementServiceAnnouncementRequest
+	var req announcement_api.AnnouncementRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	announcement, err := h.announcementService.Create(c.Request.Context(), ToDomainAnnouncementRequest(&req))
+	response, err := h.announcementClient.AnnouncementsV1CreateWithResponse(c.Request.Context(), req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	c.JSON(http.StatusCreated, api.AnnouncementsV1Create201JSONResponse{
-		Announcement: ToAPIAnnouncement(announcement),
-	})
+	if response.JSON201 == nil {
+		c.JSON(response.StatusCode(), gin.H{"error": "unexpected response from upstream"})
+		return
+	}
+
+	c.JSON(http.StatusCreated, response.JSON201)
 }
 
 // AnnouncementsV1Delete 削除する
@@ -72,13 +81,18 @@ func (h *Handler) AnnouncementsV1Delete(c *gin.Context, id string) {
 		return
 	}
 
-	if err := h.announcementService.Delete(c.Request.Context(), id); err != nil {
+	response, err := h.announcementClient.AnnouncementsV1DeleteWithResponse(c.Request.Context(), id)
+	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
+	if response.StatusCode() != http.StatusNoContent {
+		c.JSON(response.StatusCode(), gin.H{"error": "unexpected response from upstream"})
+		return
+	}
+
 	c.Status(http.StatusNoContent)
-	c.Writer.WriteHeaderNow()
 }
 
 // AnnouncementsV1Update 更新する
@@ -87,19 +101,22 @@ func (h *Handler) AnnouncementsV1Update(c *gin.Context, id string) {
 		return
 	}
 
-	var req api.AnnouncementServiceAnnouncementRequest
+	var req announcement_api.AnnouncementRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	announcement, err := h.announcementService.Update(c.Request.Context(), id, ToDomainAnnouncementRequest(&req))
+	response, err := h.announcementClient.AnnouncementsV1UpdateWithResponse(c.Request.Context(), id, req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	c.JSON(http.StatusOK, api.AnnouncementsV1Update200JSONResponse{
-		Announcement: ToAPIAnnouncement(announcement),
-	})
+	if response.JSON200 == nil {
+		c.JSON(response.StatusCode(), gin.H{"error": "unexpected response from upstream"})
+		return
+	}
+
+	c.JSON(http.StatusOK, response.JSON200)
 }