interfaces/externalをinfrastructure/externalに移動

infrastructure/apiclient.go → infrastructure/external/apiclient.go

@@ -1,4 +1,4 @@
-package infrastructure
+package external
 
 import (
 	"fmt"

infrastructure/knoq.go → infrastructure/external/knoq.go

@@ -1,36 +1,52 @@
-package infrastructure
+//go:generate go run github.com/golang/mock/mockgen@latest -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
+
+package external
 
 import (
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/gofrs/uuid"
-	"github.com/traPtitech/traPortfolio/interfaces/external"
-	"github.com/traPtitech/traPortfolio/interfaces/external/mock_external_e2e"
 	"github.com/traPtitech/traPortfolio/usecases/repository"
 	"github.com/traPtitech/traPortfolio/util/config"
 )
 
-type KnoqAPI struct {
-	apiClient
+type EventResponse struct {
+	ID          uuid.UUID   `json:"eventId"`
+	Name        string      `json:"name"`
+	Description string      `json:"description"`
+	Place       string      `json:"place"`
+	GroupID     uuid.UUID   `json:"groupId"`
+	RoomID      uuid.UUID   `json:"roomId"`
+	TimeStart   time.Time   `json:"timeStart"`
+	TimeEnd     time.Time   `json:"timeEnd"`
+	SharedRoom  bool        `json:"sharedRoom"`
+	Admins      []uuid.UUID `json:"admins"`
 }
 
-func NewKnoqAPI(conf *config.KnoqConfig, isDevelopment bool) (external.KnoqAPI, error) {
-	if isDevelopment {
-		return &mock_external_e2e.MockKnoqAPI{}, nil
-	}
+type KnoqAPI interface {
+	GetEvents() ([]*EventResponse, error)
+	GetEvent(eventID uuid.UUID) (*EventResponse, error)
+	GetEventsByUserID(userID uuid.UUID) ([]*EventResponse, error)
+}
+
+type knoqAPI struct {
+	apiClient
+}
 
+func NewKnoqAPI(conf *config.KnoqConfig) (KnoqAPI, error) {
 	jar, err := newCookieJar(conf.API(), "session")
 	if err != nil {
 		return nil, err
 	}
 
-	return &KnoqAPI{newAPIClient(jar, conf.API())}, nil
+	return &knoqAPI{newAPIClient(jar, conf.API())}, nil
 }
 
-func (a *KnoqAPI) GetEvents() ([]*external.EventResponse, error) {
+func (a *knoqAPI) GetEvents() ([]*EventResponse, error) {
 	res, err := a.apiGet("/events")
 	if err != nil {
 		return nil, err
@@ -41,14 +57,14 @@
 		return nil, errors.New("GET /events failed")
 	}
 
-	var er []*external.EventResponse
+	var er []*EventResponse
 	if err := json.NewDecoder(res.Body).Decode(&er); err != nil {
 		return nil, err
 	}
 	return er, nil
 }
 
-func (a *KnoqAPI) GetEvent(eventID uuid.UUID) (*external.EventResponse, error) {
+func (a *knoqAPI) GetEvent(eventID uuid.UUID) (*EventResponse, error) {
 	res, err := a.apiGet(fmt.Sprintf("/events/%s", eventID))
 	if err != nil {
 		return nil, err
@@ -63,14 +79,14 @@
 		return nil, fmt.Errorf("GET /events/%s failed: %d", eventID, res.StatusCode)
 	}
 
-	var er external.EventResponse
+	var er EventResponse
 	if err := json.NewDecoder(res.Body).Decode(&er); err != nil {
 		return nil, err
 	}
 	return &er, nil
 }
 
-func (a *KnoqAPI) GetEventsByUserID(userID uuid.UUID) ([]*external.EventResponse, error) {
+func (a *knoqAPI) GetEventsByUserID(userID uuid.UUID) ([]*EventResponse, error) {
 	res, err := a.apiGet(fmt.Sprintf("/users/%s/events", userID))
 	if err != nil {
 		return nil, err
@@ -81,7 +97,7 @@
 		return nil, fmt.Errorf("GET /users/%s/events failed", userID)
 	}
 
-	var er []*external.EventResponse
+	var er []*EventResponse
 	if err := json.NewDecoder(res.Body).Decode(&er); err != nil {
 		return nil, err
 	}
@@ -90,5 +106,5 @@
 
 // Interface guards
 var (
-	_ external.KnoqAPI = (*KnoqAPI)(nil)
+	_ KnoqAPI = (*knoqAPI)(nil)
 )

interfaces/external/mock_external_e2e/mock_knoq.go → infrastructure/external/mock_external_e2e/mock_knoq.go

@@ -2,7 +2,7 @@ package mock_external_e2e //nolint:revive
 
 import (
 	"github.com/gofrs/uuid"
-	"github.com/traPtitech/traPortfolio/interfaces/external"
+	"github.com/traPtitech/traPortfolio/infrastructure/external"
 	"github.com/traPtitech/traPortfolio/usecases/repository"
 	"github.com/traPtitech/traPortfolio/util/mockdata"
 )

interfaces/external/mock_external_e2e/mock_portal.go → infrastructure/external/mock_external_e2e/mock_portal.go

@@ -3,7 +3,7 @@ package mock_external_e2e //nolint:revive
 import (
 	"fmt"
 
-	"github.com/traPtitech/traPortfolio/interfaces/external"
+	"github.com/traPtitech/traPortfolio/infrastructure/external"
 	"github.com/traPtitech/traPortfolio/util/mockdata"
 )
 

interfaces/external/mock_external_e2e/mock_traq.go → infrastructure/external/mock_external_e2e/mock_traq.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gofrs/uuid"
 	"github.com/traPtitech/traPortfolio/domain"
-	"github.com/traPtitech/traPortfolio/interfaces/external"
+	"github.com/traPtitech/traPortfolio/infrastructure/external"
 	"github.com/traPtitech/traPortfolio/util/mockdata"
 )
 

infrastructure/portal.go → infrastructure/external/portal.go

@@ -1,4 +1,6 @@
-package infrastructure
+//go:generate go run github.com/golang/mock/mockgen@latest -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
+
+package external
 
 import (
 	"encoding/json"
@@ -7,40 +9,45 @@
 	"time"
 
 	"github.com/patrickmn/go-cache"
-	"github.com/traPtitech/traPortfolio/interfaces/external"
-	"github.com/traPtitech/traPortfolio/interfaces/external/mock_external_e2e"
 	"github.com/traPtitech/traPortfolio/util/config"
 )
 
+type PortalUserResponse struct {
+	TraQID         string `json:"id"`
+	RealName       string `json:"name"`
+	AlphabeticName string `json:"alphabeticName"`
+}
+
+type PortalAPI interface {
+	GetUsers() ([]*PortalUserResponse, error)
+	GetUserByTraqID(traQID string) (*PortalUserResponse, error)
+}
+
 const (
 	cacheKey = "portalUsers"
 )
 
-type PortalAPI struct {
+type portalAPI struct {
 	apiClient
 	cache *cache.Cache
 }
 
-func NewPortalAPI(conf *config.PortalConfig, isDevelopment bool) (external.PortalAPI, error) {
-	if isDevelopment {
-		return mock_external_e2e.NewMockPortalAPI(), nil
-	}
-
+func NewPortalAPI(conf *config.PortalConfig) (PortalAPI, error) {
 	jar, err := newCookieJar(conf.API(), "access_token")
 	if err != nil {
 		return nil, err
 	}
 
-	return &PortalAPI{
+	return &portalAPI{
 		apiClient: newAPIClient(jar, conf.API()),
 		cache:     cache.New(1*time.Hour, 2*time.Hour),
 	}, nil
 }
 
-func (a *PortalAPI) GetUsers() ([]*external.PortalUserResponse, error) {
+func (a *portalAPI) GetUsers() ([]*PortalUserResponse, error) {
 	portalUsers, found := a.cache.Get(cacheKey)
 	if found {
-		return portalUsers.([]*external.PortalUserResponse), nil
+		return portalUsers.([]*PortalUserResponse), nil
 	}
 
 	res, err := a.apiGet("/user")
@@ -52,15 +59,15 @@
 	if res.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("GET /user failed: %v", res.Status)
 	}
-	var userResponses []*external.PortalUserResponse
+	var userResponses []*PortalUserResponse
 	if err := json.NewDecoder(res.Body).Decode(&userResponses); err != nil {
 		return nil, fmt.Errorf("decode failed: %w", err)
 	}
 	a.cache.Set(cacheKey, userResponses, cache.DefaultExpiration)
 	return userResponses, nil
 }
 
-func (a *PortalAPI) GetUserByTraqID(traQID string) (*external.PortalUserResponse, error) {
+func (a *portalAPI) GetUserByTraqID(traQID string) (*PortalUserResponse, error) {
 	if traQID == "" {
 		return nil, fmt.Errorf("invalid traQID")
 	}
@@ -75,7 +82,7 @@
 		return nil, fmt.Errorf("GET /user/%v failed: %v", traQID, res.Status)
 	}
 
-	var userResponse external.PortalUserResponse
+	var userResponse PortalUserResponse
 	if err := json.NewDecoder(res.Body).Decode(&userResponse); err != nil {
 		return nil, fmt.Errorf("decode failed: %w", err)
 	}
@@ -84,5 +91,5 @@
 
 // Interface guards
 var (
-	_ external.PortalAPI = (*PortalAPI)(nil)
+	_ PortalAPI = (*portalAPI)(nil)
 )

infrastructure/traq.go → infrastructure/external/traq.go

@@ -1,34 +1,46 @@
-package infrastructure
+//go:generate go run github.com/golang/mock/mockgen@latest -source=$GOFILE -destination=mock_$GOPACKAGE/mock_$GOFILE
+
+package external
 
 import (
 	"encoding/json"
 	"fmt"
 	"net/http"
 
 	"github.com/gofrs/uuid"
-	"github.com/traPtitech/traPortfolio/interfaces/external"
-	"github.com/traPtitech/traPortfolio/interfaces/external/mock_external_e2e"
+	"github.com/traPtitech/traPortfolio/domain"
 	"github.com/traPtitech/traPortfolio/util/config"
 )
 
-type TraQAPI struct {
-	apiClient
+type TraQUserResponse struct {
+	ID    uuid.UUID        `json:"id"`
+	State domain.TraQState `json:"state"`
 }
 
-func NewTraQAPI(conf *config.TraqConfig, isDevelopment bool) (external.TraQAPI, error) {
-	if isDevelopment {
-		return mock_external_e2e.NewMockTraQAPI(), nil
-	}
+type TraQGetAllArgs struct {
+	IncludeSuspended bool
+	Name             string
+}
+
+type TraQAPI interface {
+	GetUsers(args *TraQGetAllArgs) ([]*TraQUserResponse, error)
+	GetUser(userID uuid.UUID) (*TraQUserResponse, error)
+}
+
+type traQAPI struct {
+	apiClient
+}
 
+func NewTraQAPI(conf *config.TraqConfig) (TraQAPI, error) {
 	jar, err := newCookieJar(conf.API(), "r_session")
 	if err != nil {
 		return nil, err
 	}
 
-	return &TraQAPI{newAPIClient(jar, conf.API())}, nil
+	return &traQAPI{newAPIClient(jar, conf.API())}, nil
 }
 
-func (a *TraQAPI) GetUsers(args *external.TraQGetAllArgs) ([]*external.TraQUserResponse, error) {
+func (a *traQAPI) GetUsers(args *TraQGetAllArgs) ([]*TraQUserResponse, error) {
 	res, err := a.apiGet(fmt.Sprintf("/users?include-suspended=%t&name=%s", args.IncludeSuspended, args.Name))
 	if err != nil {
 		return nil, err
@@ -39,14 +51,14 @@
 		return nil, fmt.Errorf("GET /users failed: %v", res.Status)
 	}
 
-	var usersResponse []*external.TraQUserResponse
+	var usersResponse []*TraQUserResponse
 	if err := json.NewDecoder(res.Body).Decode(&usersResponse); err != nil {
 		return nil, fmt.Errorf("decode failed: %w", err)
 	}
 	return usersResponse, nil
 }
 
-func (a *TraQAPI) GetUser(userID uuid.UUID) (*external.TraQUserResponse, error) {
+func (a *traQAPI) GetUser(userID uuid.UUID) (*TraQUserResponse, error) {
 	res, err := a.apiGet(fmt.Sprintf("/users/%v", userID))
 	if err != nil {
 		return nil, err
@@ -57,7 +69,7 @@
 		return nil, fmt.Errorf("GET /users/%v failed: %v", userID, res.Status)
 	}
 
-	var userResponse external.TraQUserResponse
+	var userResponse TraQUserResponse
 	if err := json.NewDecoder(res.Body).Decode(&userResponse); err != nil {
 		return nil, fmt.Errorf("decode failed: %v", err)
 	}
@@ -66,5 +78,5 @@
 
 // Interface guards
 var (
-	_ external.TraQAPI = (*TraQAPI)(nil)
+	_ TraQAPI = (*traQAPI)(nil)
 )