UserドメインにAgent,Admin情報の追加

.github/workflows/go test.yml

@@ -1,5 +1,12 @@
 name: go test with firestore emulator
-on: [ push ]
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    paths:
+      - '**.go'
 jobs:
   go-test-with-firestore-emulator:
     runs-on: ubuntu-latest

.gitignore

@@ -1,2 +1,5 @@
 .idea
-.env
+.env
+setting.dev.yaml
+gcloud-credential.json
+*.exe

pkg/setting/application.go

@@ -2,17 +2,14 @@ package setting
 
 type (
 	Application struct {
-		Server Server `yaml:"server"`
-		Admin  Admin  `yaml:"admin"`
+		Server         Server         `yaml:"server"`
+		Authentication Authentication `yaml:"authentication"`
 	}
 	Server struct {
 		OnProduction bool     `yaml:"on_production"`
 		Frontend     Frontend `yaml:"frontend"`
 		Backend      Backend  `yaml:"backend"`
 	}
-	Admin struct {
-		JwtSecret string `yaml:"jwt_secret"`
-	}
 	Frontend struct {
 		Protocol string `yaml:"protocol"`
 		Domain   string `yaml:"domain"`

pkg/setting/files/setting.template.yaml

@@ -11,8 +11,6 @@ application:
       domain: "ynufes-mypage.shion.pro"
       port: ":1306"
     # CONCATING PROTOCOL, DOMAIN, AND PORT TOGETHER SHOULD GIVE THE FULL URL
-  admin:
-    jwt_secret: "ADMIN_AUTH_CIPHER_KEY_TEST_TOKEN"
 infrastructure:
   firestore:
     project_id: "ynufes-mypage"
@@ -27,5 +25,6 @@ third_party:
     enable_line_auth: true
 service:
   authentication:
+    jwt_secret: "LEN32_AUTH_CIPHER_KEY_TEST_TOKEN"
     secure_cookie: true
     # YOU CAN DISABLE SECURE COOKIE FOR TESTING PURPOSES

pkg/setting/files/setting.testing.yaml

@@ -12,8 +12,6 @@ application:
       domain: "ynufes-mypage.shion.pro"
       port: ""
     # CONCATING PROTOCOL, DOMAIN, AND PORT TOGETHER SHOULD GIVE THE FULL URL
-  admin:
-    jwt_secret: "ADMIN_AUTH_CIPHER_KEY_TEST_TOKEN"
 infrastructure:
   firestore:
     project_id: "ynufes-mypage"
@@ -29,5 +27,6 @@ third_party:
     # DISABLE LINE AUTH ON TESTING
 service:
   authentication:
+    jwt_secret: "LEN32_AUTH_CIPHER_KEY_TEST_TOKEN"
     secure_cookie: false
     # DISABLE SECURE COOKIE ON TESTING

pkg/setting/service.go

@@ -5,6 +5,7 @@ type (
 		Authentication Authentication `yaml:"authentication"`
 	}
 	Authentication struct {
-		SecureCookie bool `yaml:"secure_cookie"`
+		SecureCookie bool   `yaml:"secure_cookie"`
+		JwtSecret    string `yaml:"jwt_secret"`
 	}
 )

reload.ps1

@@ -0,0 +1 @@
+go build -o ynufes-mypage-backend.exe ./svc/cmd/dev/main.go

svc/cmd/dev/main.go

@@ -14,7 +14,7 @@ func main() {
 		log.Fatalf("Failed to start server... %v", err)
 		return
 	}
-	if err := runner.ImplementAdmin(apiV1); err != nil {
+	if err := runner.ImplementAgent(apiV1); err != nil {
 		log.Fatalf("Failed to start server... %v", err)
 		return
 	}

svc/cmd/release/main.go

@@ -14,7 +14,7 @@ func main() {
 		log.Fatalf("Failed to start server... %v", err)
 		return
 	}
-	if err := runner.ImplementAdmin(apiV1); err != nil {
+	if err := runner.ImplementAgent(apiV1); err != nil {
 		log.Fatalf("Failed to start server... %v", err)
 		return
 	}

svc/pkg/config/jwt.go

@@ -6,7 +6,7 @@ var JWT jwt
 
 func init() {
 	config := setting.Get()
-	JWT = jwt{JWTSecret: config.Application.Admin.JwtSecret}
+	JWT = jwt{JWTSecret: config.Application.Authentication.JwtSecret}
 }
 
 type jwt struct {

svc/pkg/domain/command/event.go

@@ -7,6 +7,6 @@ import (
 
 type Event interface {
 	Create(context.Context, event.Event) error
-	UpdateAll(context.Context, *event.Event) error
+	UpdateName(context.Context, event.Event) error
 	Delete(context.Context, *event.Event) error
 }

svc/pkg/domain/command/org.go

@@ -8,6 +8,6 @@ import (
 type Org interface {
 	Create(context.Context, org.Org) error
 	Set(context.Context, org.Org) error
-	UpdateMembers(context.Context, org.Org) error
+	UpdateUsers(context.Context, org.Org) error
 	UpdateIsOpen(context.Context, org.Org) error
 }

svc/pkg/domain/command/user.go

@@ -9,6 +9,8 @@ type User interface {
 	Create(context.Context, user.User) error
 	UpdateLine(ctx context.Context, oldUser *user.User, update user.Line) error
 	UpdateUserDetail(ctx context.Context, oldUser *user.User, update user.Detail) error
+	UpdateAgent(ctx context.Context, oldUser *user.User, update user.Agent) error
+	UpdateAdmin(ctx context.Context, oldUser *user.User, update user.Admin) error
 	UpdateAll(context.Context, user.User) error
 	Delete(context.Context, user.User) error
 }

svc/pkg/domain/model/org/aggregate.go

@@ -8,11 +8,11 @@ import (
 
 type (
 	Org struct {
-		ID      ID
-		Event   event.Event
-		Name    string
-		Members []user.ID
-		IsOpen  bool
+		ID     ID
+		Event  event.Event
+		Name   string
+		Users  []user.ID
+		IsOpen bool
 	}
 	ID util.ID
 )

svc/pkg/domain/model/user/admin.go

@@ -0,0 +1,13 @@
+package user
+
+import (
+	"time"
+)
+
+type (
+	Admin struct {
+		IsSuperAdmin bool
+		GrantedTime  *time.Time
+		// if IsSuperAdmin is false, GrantedTime should be nil.
+	}
+)

svc/pkg/domain/model/user/agent.go

@@ -0,0 +1,39 @@
+package user
+
+import (
+	"time"
+	"ynufes-mypage-backend/svc/pkg/domain/model/util"
+	"ynufes-mypage-backend/svc/pkg/exception"
+)
+
+type (
+	Agent struct {
+		Roles []Role
+	}
+	Role struct {
+		ID          RoleID
+		Level       RoleLevel
+		GrantedTime time.Time
+	}
+	RoleID    util.ID
+	RoleLevel int
+)
+
+const (
+	Viewer  RoleLevel = 1
+	Editor  RoleLevel = 2
+	Manager RoleLevel = 3
+)
+
+func NewRoleLevel(level int) (RoleLevel, error) {
+	switch RoleLevel(level) {
+	case Viewer:
+		return Viewer, nil
+	case Editor:
+		return Editor, nil
+	case Manager:
+		return Manager, nil
+	default:
+		return 0, exception.ErrInvalidRoleLevel
+	}
+}

svc/pkg/domain/model/user/aggregate.go

@@ -8,6 +8,8 @@ type (
 		Status Status
 		Detail Detail
 		Line   Line
+		Admin  Admin
+		Agent  Agent
 	}
 	ID     util.ID
 	Status int

svc/pkg/domain/model/user/type.go

@@ -6,12 +6,15 @@ type Type int
 
 const (
 	TypeNormal Type = 1
+	TypeMember Type = 2
 )
 
 func NewType(t int) (Type, error) {
-	switch t {
-	case int(TypeNormal):
+	switch Type(t) {
+	case TypeNormal:
 		return TypeNormal, nil
+	case TypeMember:
+		return TypeMember, nil
 	default:
 		return -1, errors.New("USER TYPE VALUE IS INVALID")
 	}

svc/pkg/exception/error.go

@@ -3,7 +3,8 @@ package exception
 import "errors"
 
 var (
-	ErrorInvalidHeader = errors.New("INVALID Authorization Header")
-	ErrInvalidJWT      = errors.New("INVALID JWT")
-	ErrIDNotAssigned   = errors.New("ID NOT ASSIGNED")
+	ErrorInvalidHeader  = errors.New("INVALID Authorization Header")
+	ErrInvalidJWT       = errors.New("INVALID JWT")
+	ErrIDNotAssigned    = errors.New("ID NOT ASSIGNED")
+	ErrInvalidRoleLevel = errors.New("INVALID ROLE LEVEL")
 )

svc/pkg/handler/admin/event.go → svc/pkg/handler/agent/event.go

@@ -1,9 +1,9 @@
-package admin
+package agent
 
 import (
 	"github.com/gin-gonic/gin"
 	"ynufes-mypage-backend/svc/pkg/registry"
-	"ynufes-mypage-backend/svc/pkg/schema/admin"
+	"ynufes-mypage-backend/svc/pkg/schema/agent"
 	"ynufes-mypage-backend/svc/pkg/uc/event"
 )
 
@@ -33,7 +33,7 @@ func (uc Event) CreateHandler() gin.HandlerFunc {
 		if err != nil {
 			return
 		}
-		resp := admin.CreateEventResponse{
+		resp := agent.CreateEventResponse{
 			EventID:   opt.Event.ID.ExportID(),
 			EventName: opt.Event.Name,
 		}

svc/pkg/handler/admin/org.go → svc/pkg/handler/agent/org.go

@@ -1,4 +1,4 @@
-package admin
+package agent
 
 import (
 	"github.com/gin-gonic/gin"
@@ -8,7 +8,7 @@ import (
 	"ynufes-mypage-backend/pkg/jwt"
 	"ynufes-mypage-backend/pkg/setting"
 	"ynufes-mypage-backend/svc/pkg/registry"
-	"ynufes-mypage-backend/svc/pkg/schema/admin"
+	"ynufes-mypage-backend/svc/pkg/schema/agent"
 	"ynufes-mypage-backend/svc/pkg/uc/org"
 )
 
@@ -23,7 +23,7 @@ func NewOrg(rgst registry.Registry) *Org {
 	return &Org{
 		createOrgUC: org.NewCreateOrg(rgst),
 		infoOrgUC:   org.NewInfo(rgst),
-		jwtSecret:   config.Application.Admin.JwtSecret,
+		jwtSecret:   config.Application.Authentication.JwtSecret,
 	}
 }
 
@@ -52,7 +52,7 @@ func (o Org) CreateHandler() gin.HandlerFunc {
 			c.AbortWithStatusJSON(500, gin.H{"error": "failed to create org"})
 			return
 		}
-		resp := admin.CreateOrgResponse{
+		resp := agent.CreateOrgResponse{
 			EventID:   opt.Org.Event.ID.ExportID(),
 			EventName: opt.Org.Event.Name,
 			OrgID:     opt.Org.ID.ExportID(),
@@ -91,7 +91,7 @@ func (o Org) IssueOrgInviteToken() gin.HandlerFunc {
 		if err != nil {
 			return
 		}
-		resp := admin.IssueOrgInviteTokenResponse{
+		resp := agent.IssueOrgInviteTokenResponse{
 			Token:      issueJWT,
 			OrgID:      opt.Org.ID.ExportID(),
 			ValidUntil: time.Now().Add(duration).Format(time.RFC3339),

svc/pkg/infra/entity/org/aggregate.go

@@ -14,14 +14,14 @@ type Org struct {
 	EventID   int64   `firestore:"event_id"`
 	EventName string  `firestore:"event_name"`
 	Name      string  `firestore:"name"`
-	Members   []int64 `firestore:"member_ids"`
+	Users     []int64 `firestore:"user_ids"`
 	IsOpen    bool    `firestore:"is_open"`
 }
 
 func (o Org) ToModel() (*org.Org, error) {
-	var members []user.ID
-	for i := range o.Members {
-		members = append(members, identity.NewID(o.Members[i]))
+	var users []user.ID
+	for i := range o.Users {
+		users = append(users, identity.NewID(o.Users[i]))
 	}
 	id, err := identity.ImportID(o.ID)
 	if err != nil {
@@ -33,8 +33,8 @@ func (o Org) ToModel() (*org.Org, error) {
 			ID:   identity.NewID(o.EventID),
 			Name: o.EventName,
 		},
-		Name:    o.Name,
-		Members: members,
-		IsOpen:  o.IsOpen,
+		Name:   o.Name,
+		Users:  users,
+		IsOpen: o.IsOpen,
 	}, nil
 }

svc/pkg/infra/entity/user/admin.go

@@ -0,0 +1,8 @@
+package entity
+
+type (
+	Admin struct {
+		IsSuperAdmin bool  `firestore:"admin-super_admin"`
+		GrantedTime  int64 `firestore:"admin-granted_time"`
+	}
+)

svc/pkg/infra/entity/user/agent.go

@@ -0,0 +1,12 @@
+package entity
+
+type (
+	Agent struct {
+		Roles []Role `firestore:"agent-roles"`
+	}
+	Role struct {
+		ID          int64 `firestore:"id"`
+		Level       int   `firestore:"level"`
+		GrantedTime int64 `firestore:"granted_time"`
+	}
+)