Merge pull request #448 from traPtitech/remove/usecase-production

usecase/productionをrepositoryに移行する

docker-compose.yml

@@ -38,7 +38,7 @@ services:
       - ./domain:/srv/knoq/domain
       - ./infra:/srv/knoq/infra
       - ./presentation:/srv/knoq/presentation
-      - ./usecase:/srv/knoq/usecase
+      - ./repository:/srv/knoq/repository
       - ./parsing:/srv/knoq/parsing
     ports:
       - "6006:3000"

domain/group.go

@@ -36,6 +36,7 @@ type GroupRepository interface {
 	GetUserBelongingGroupIDs(userID uuid.UUID, info *ConInfo) ([]uuid.UUID, error)
 	GetUserAdminGroupIDs(userID uuid.UUID) ([]uuid.UUID, error)
 	IsGroupAdmins(groupID uuid.UUID, info *ConInfo) bool
+	GetGradeGroupNames(info *ConInfo) ([]string, error)
 }
 
 func (g *Group) AdminsValidation() bool {

domain/user.go

@@ -25,4 +25,5 @@ type UserRepository interface {
 	GetMyiCalSecret(info *ConInfo) (string, error)
 
 	IsPrevilege(info *ConInfo) bool
+	SyncUsers(info *ConInfo) error
 }

main.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/traPtitech/knoQ/domain"
 	"github.com/traPtitech/knoQ/infra/db"
+	"github.com/traPtitech/knoQ/repository"
 	"github.com/traPtitech/knoQ/infra/traq"
-	"github.com/traPtitech/knoQ/usecase/production"
 	"github.com/traPtitech/knoQ/utils"
 	"golang.org/x/oauth2"
 
@@ -69,7 +69,7 @@ func main() {
 		},
 		URL: "https://q.trap.jp/api/v3",
 	}
-	repo := &production.Repository{
+	repo := &repository.Repository{
 		GormRepo: gormRepo,
 		TraQRepo: traqRepo,
 	}

usecase/production/converter.go → repository/converter.go

@@ -1,6 +1,6 @@
 // FIXME: ↓が動かないので一時的に手動で作成
 // //go:generate go run github.com/fuji8/gotypeconverter/cmd/gotypeconverter@latest -s []*traq.UserGroup -d []*domain.Group -o converter.go .
-package production
+package repository
 
 import (
 	"github.com/gofrs/uuid"

usecase/production/errors.go → repository/errors.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"errors"

usecase/production/event.go → repository/event.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"github.com/gofrs/uuid"

usecase/production/group.go → repository/group.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"errors"
@@ -194,6 +194,27 @@ func (repo *Repository) getTraPGroup(info *domain.ConInfo) *domain.Group {
 	}
 }
 
+func (repo *Repository) GetGradeGroupNames(info *domain.ConInfo) ([]string, error) {
+	t, err := repo.GormRepo.GetToken(info.ReqUserID)
+	if err != nil {
+		return nil, defaultErrorHandling(err)
+	}
+
+	groups, err := repo.TraQRepo.GetAllGroups(t)
+	if err != nil {
+		return nil, defaultErrorHandling(err)
+	}
+
+	names := make([]string, 0)
+	for _, g := range groups {
+		if g.Type == "grade" {
+			names = append(names, g.Name)
+		}
+	}
+
+	return names, nil
+}
+
 func convSPdomainUserToSdomainUser(src []*domain.User) (dst []domain.User) {
 	dst = make([]domain.User, len(src))
 	for i := range src {

usecase/production/production.go → repository/repository.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"github.com/traPtitech/knoQ/infra/db"

usecase/production/room.go → repository/room.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"time"

usecase/production/tag.go → repository/tag.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"github.com/gofrs/uuid"

usecase/production/user.go → repository/user.go

@@ -1,4 +1,4 @@
-package production
+package repository
 
 import (
 	"errors"

router/middleware.go

@@ -10,7 +10,6 @@ import (
 	"github.com/traPtitech/knoQ/domain"
 	log "github.com/traPtitech/knoQ/logging"
 	"github.com/traPtitech/knoQ/presentation"
-	"github.com/traPtitech/knoQ/usecase/production"
 	"github.com/traPtitech/knoQ/utils"
 
 	"github.com/gofrs/uuid"
@@ -194,7 +193,7 @@ func (h *Handlers) WebhookEventHandler(c echo.Context, reqBody, resBody []byte)
 		return
 	}
 	usersMap := createUserMap(users)
-	nofiticationTargets := make([]string, 0)
+	notificationTargets := make([]string, 0)
 
 	if e.TimeEnd.Before(time.Now()) {
 		return
@@ -203,32 +202,25 @@ func (h *Handlers) WebhookEventHandler(c echo.Context, reqBody, resBody []byte)
 	// TODO fix: IDを環境変数などで定義すべき
 	traPGroupID := uuid.Must(uuid.FromString("11111111-1111-1111-1111-111111111111"))
 	if e.Group.ID == traPGroupID {
-		repo, ok := h.Repo.(*production.Repository)
-		if !ok {
-			return
-		}
-		t, err := repo.GormRepo.GetToken(getConinfo(c).ReqUserID)
+		groups, err := h.Repo.GetGradeGroupNames(getConinfo(c))
 		if err != nil {
+			h.Logger.Error("failed to get groups", zap.Error(err))
 			return
 		}
-		groups, _ := repo.TraQRepo.GetAllGroups(t)
-		for _, g := range groups {
-			if g.Type == "grade" {
-				nofiticationTargets = append(nofiticationTargets, g.Name)
-			}
-		}
+
+		notificationTargets = append(notificationTargets, groups...)
 	} else {
 		for _, attendee := range e.Attendees {
 			if attendee.Schedule == presentation.Pending {
 				user, ok := usersMap[attendee.ID]
 				if ok {
-					nofiticationTargets = append(nofiticationTargets, user.Name)
+					notificationTargets = append(notificationTargets, user.Name)
 				}
 			}
 		}
 	}
 
-	content := presentation.GenerateEventWebhookContent(c.Request().Method, e, nofiticationTargets, h.Origin, !domain.DEVELOPMENT)
+	content := presentation.GenerateEventWebhookContent(c.Request().Method, e, notificationTargets, h.Origin, !domain.DEVELOPMENT)
 
 	_ = utils.RequestWebhook(content, h.WebhookSecret, h.ActivityChannelID, h.WebhookID, 1)
 }

router/users.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/traPtitech/knoQ/domain"
 	"github.com/traPtitech/knoQ/presentation"
-	"github.com/traPtitech/knoQ/usecase/production"
 
 	"github.com/labstack/echo/v4"
 )
@@ -68,11 +67,7 @@ func (h *Handlers) HandleUpdateiCal(c echo.Context) error {
 // 停止されているユーザーの`token`を削除して、
 // 活動中のユーザーを追加する(userIDをDBに保存)
 func (h *Handlers) HandleSyncUser(c echo.Context) error {
-	repo, ok := h.Repo.(*production.Repository)
-	if !ok {
-		return internalServerError(errors.New("not implemented"))
-	}
-	err := repo.SyncUsers(getConinfo(c))
+	err := h.Repo.SyncUsers(getConinfo(c))
 	if err != nil {
 		return judgeErrorResponse(err)
 	}