Merge pull request #68 from shion1305/issue/67

Agent -> Role Staffへの移行, 対応するテーブルとWriterの作成

database.rules.json

@@ -20,6 +20,12 @@
           "user_id",
           "org_id"
         ]
+      },
+      "RoleStaff": {
+        ".indexOn": [
+          "user_id",
+          "role_id"
+        ]
       }
     },
     "Forms": {

svc/pkg/domain/command/user.go

@@ -10,7 +10,5 @@ type User interface {
 	Create(context.Context, *user.User) error
 	Set(context.Context, user.User) error
 	UpdateUserDetail(context.Context, id.UserID, user.Detail) error
-	SetAgent(context.Context, id.UserID, user.Agent) error
-	SetAdmin(context.Context, id.UserID, user.Admin) error
 	Delete(context.Context, user.User) error
 }

svc/pkg/domain/model/form/form.go

@@ -4,7 +4,6 @@ import (
 	"sort"
 	"time"
 	"ynufes-mypage-backend/svc/pkg/domain/model/id"
-	"ynufes-mypage-backend/svc/pkg/domain/model/user"
 )
 
 type (
@@ -14,7 +13,7 @@ type (
 		Title       string
 		Summary     string
 		Description string
-		Roles       []user.RoleID
+		Roles       []id.RoleID
 		Deadline    time.Time
 		IsOpen      bool
 		Sections    SectionsOrder
@@ -27,7 +26,7 @@ func NewForm(
 	eventID id.EventID,
 	title, summary, description string,
 	sectionOrders map[id.SectionID]float64,
-	roles []user.RoleID,
+	roles []id.RoleID,
 	deadline time.Time,
 	isOpen bool,
 ) *Form {

svc/pkg/domain/model/id/id.go

@@ -10,6 +10,7 @@ type (
 	SectionID  util.ID
 	QuestionID util.ID
 	OrgIDs     []OrgID
+	RoleID     util.ID
 )
 
 func (i OrgIDs) HasOrgID(oid OrgID) bool {

svc/pkg/domain/model/role/role.go

@@ -0,0 +1,8 @@
+package role
+
+import "ynufes-mypage-backend/svc/pkg/domain/model/id"
+
+type Role struct {
+	ID   id.RoleID
+	Name string
+}

svc/pkg/domain/model/staff/staff.go

@@ -0,0 +1,8 @@
+package staff
+
+import "ynufes-mypage-backend/svc/pkg/domain/model/id"
+
+type Staff struct {
+	id.UserID
+	IsAdmin bool
+}

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

@@ -8,8 +8,6 @@ type (
 	User struct {
 		ID     id.UserID
 		Detail Detail
-		Admin  Admin
-		Agent  Agent
 	}
 )
 

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

@@ -2,19 +2,18 @@ package user
 
 import "errors"
 
+// Type represents the type of user.
+// This field is currently not used, but it is expected to be used in the future.
 type Type int
 
 const (
 	TypeNormal Type = 1
-	TypeMember Type = 2
 )
 
 func NewType(t int) (Type, error) {
 	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/infra/entity/form/aggregate.go

@@ -5,7 +5,6 @@ import (
 	"ynufes-mypage-backend/pkg/identity"
 	"ynufes-mypage-backend/svc/pkg/domain/model/form"
 	"ynufes-mypage-backend/svc/pkg/domain/model/id"
-	"ynufes-mypage-backend/svc/pkg/domain/model/user"
 	"ynufes-mypage-backend/svc/pkg/exception"
 )
 
@@ -57,7 +56,7 @@ func (f Form) ToModel() (*form.Form, error) {
 		return nil, err
 	}
 
-	roles := make([]user.RoleID, 0, len(f.Roles))
+	roles := make([]id.RoleID, 0, len(f.Roles))
 	for k, v := range f.Roles {
 		if !v {
 			continue

svc/pkg/infra/entity/relation/org_user.go

@@ -1,4 +1,4 @@
-package relation
+package entity
 
 const (
 	RelationRootName    = "Relation"

svc/pkg/infra/entity/relation/role_staff.go

@@ -0,0 +1,8 @@
+package entity
+
+const RelationRoleStaffName = "RoleStaff"
+
+type RoleStaffRelation struct {
+	RoleID string `json:"role_id"`
+	UserID string `json:"user_id"`
+}

svc/pkg/infra/entity/role/role.go

@@ -0,0 +1,8 @@
+package entity
+
+const RoleTableName = "Roles"
+
+type Role struct {
+	ID   string `json:"-"`
+	Name string `json:"name"`
+}

svc/pkg/infra/entity/staff/staff.go

@@ -0,0 +1,8 @@
+package entity
+
+const StaffTableName = "Staffs"
+
+type Staff struct {
+	UserID  string `json:"-"`
+	IsAdmin bool   `json:"is_admin"`
+}

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

@@ -1,8 +1,6 @@
 package entity
 
 import (
-	"time"
-	"ynufes-mypage-backend/pkg/identity"
 	"ynufes-mypage-backend/svc/pkg/domain/model/id"
 	"ynufes-mypage-backend/svc/pkg/domain/model/user"
 )
@@ -12,8 +10,6 @@ const UserRootName = "Users"
 type User struct {
 	ID         id.UserID `json:"-"`
 	UserDetail `json:"detail"`
-	Admin      `json:"admin"`
-	Agent      `json:"agent"`
 }
 
 func (u User) ToModel() (*user.User, error) {
@@ -25,23 +21,6 @@ func (u User) ToModel() (*user.User, error) {
 	if err != nil {
 		return nil, err
 	}
-	roles := make([]user.Role, len(u.Roles))
-	for i, role := range u.Roles {
-		lv, err := user.NewRoleLevel(role.Level)
-		if err != nil {
-			return nil, err
-		}
-		roles[i] = user.Role{
-			ID:          identity.NewID(role.ID),
-			Level:       lv,
-			GrantedTime: time.UnixMilli(role.GrantedTime),
-		}
-	}
-	var adminGrantedTime *time.Time
-	if u.IsSuperAdmin {
-		t := time.UnixMilli(u.GrantedTime)
-		adminGrantedTime = &t
-	}
 	ty, err := user.NewType(u.UserDetail.Type)
 	if err != nil {
 		return nil, err
@@ -62,12 +41,5 @@ func (u User) ToModel() (*user.User, error) {
 			Type:       ty,
 			PictureURL: user.PictureURL(u.PictureURL),
 		},
-		Admin: user.Admin{
-			IsSuperAdmin: u.IsSuperAdmin,
-			GrantedTime:  adminGrantedTime,
-		},
-		Agent: user.Agent{
-			Roles: roles,
-		},
 	}, nil
 }

svc/pkg/infra/reader/form_test.go

@@ -10,7 +10,6 @@ import (
 	"ynufes-mypage-backend/svc/pkg/domain/model/event"
 	"ynufes-mypage-backend/svc/pkg/domain/model/form"
 	"ynufes-mypage-backend/svc/pkg/domain/model/id"
-	"ynufes-mypage-backend/svc/pkg/domain/model/user"
 	"ynufes-mypage-backend/svc/pkg/infra/writer"
 )
 
@@ -33,9 +32,9 @@ func TestForm_GetByID(t *testing.T) {
 		Title:       "FormTitle1",
 		Summary:     "FormSummary1",
 		Description: "FormDescription1",
-		Roles: []user.RoleID{
-			user.RoleID(identity.IssueID()),
-			user.RoleID(identity.IssueID()),
+		Roles: []id.RoleID{
+			id.RoleID(identity.IssueID()),
+			id.RoleID(identity.IssueID()),
 		},
 		Deadline: time.UnixMilli(deadline),
 		IsOpen:   false,
@@ -82,9 +81,9 @@ func TestForm_ListByEventID(t *testing.T) {
 		Title:       "FormTitle1",
 		Summary:     "FormSummary1",
 		Description: "FormDescription1",
-		Roles: []user.RoleID{
-			user.RoleID(identity.IssueID()),
-			user.RoleID(identity.IssueID()),
+		Roles: []id.RoleID{
+			id.RoleID(identity.IssueID()),
+			id.RoleID(identity.IssueID()),
 		},
 		Deadline: time.UnixMilli(deadline1),
 		IsOpen:   false,
@@ -102,9 +101,9 @@ func TestForm_ListByEventID(t *testing.T) {
 		Title:       "FormTitle2",
 		Summary:     "FormSummary2",
 		Description: "FormDescription2",
-		Roles: []user.RoleID{
-			user.RoleID(identity.IssueID()),
-			user.RoleID(identity.IssueID()),
+		Roles: []id.RoleID{
+			id.RoleID(identity.IssueID()),
+			id.RoleID(identity.IssueID()),
 		},
 		Deadline: time.UnixMilli(deadline2),
 		IsOpen:   false,
@@ -122,9 +121,9 @@ func TestForm_ListByEventID(t *testing.T) {
 		Title:       "FormTitle3",
 		Summary:     "FormSummary3",
 		Description: "FormDescription3",
-		Roles: []user.RoleID{
-			user.RoleID(identity.IssueID()),
-			user.RoleID(identity.IssueID()),
+		Roles: []id.RoleID{
+			id.RoleID(identity.IssueID()),
+			id.RoleID(identity.IssueID()),
 		},
 		Deadline: time.UnixMilli(deadline3),
 		IsOpen:   false,
@@ -174,9 +173,9 @@ func checkFormEqual(t *testing.T, f1, f2 form.Form) {
 	}
 }
 
-func checkRolesEqual(t *testing.T, r1, r2 []user.RoleID) {
+func checkRolesEqual(t *testing.T, r1, r2 []id.RoleID) {
 	assert.Equal(t, len(r1), len(r2))
-	roles := make(map[user.RoleID]struct{}, len(r1))
+	roles := make(map[id.RoleID]struct{}, len(r1))
 	for _, v := range r1 {
 		roles[v] = struct{}{}
 	}

svc/pkg/infra/reader/relation.go → svc/pkg/infra/reader/r_org_user.go

@@ -9,17 +9,17 @@ import (
 	entity "ynufes-mypage-backend/svc/pkg/infra/entity/relation"
 )
 
-type Relation struct {
+type RelationOrgUser struct {
 	orgUserRef *db.Ref
 }
 
-func NewRelation(db *firebase.Firebase) Relation {
-	return Relation{
+func NewRelationOrgUser(db *firebase.Firebase) RelationOrgUser {
+	return RelationOrgUser{
 		orgUserRef: db.Client(entity.RelationRootName).Child(entity.RelationOrgUserName),
 	}
 }
 
-func (r Relation) ListUserIDsByOrgID(ctx context.Context, orgID id.OrgID) ([]id.UserID, error) {
+func (r RelationOrgUser) ListUserIDsByOrgID(ctx context.Context, orgID id.OrgID) ([]id.UserID, error) {
 	qs, err := r.orgUserRef.OrderByChild("org_id").
 		EqualTo(orgID.ExportID()).
 		GetOrdered(ctx)
@@ -42,7 +42,7 @@ func (r Relation) ListUserIDsByOrgID(ctx context.Context, orgID id.OrgID) ([]id.
 	return userIDs, nil
 }
 
-func (r Relation) ListOrgIDsByUserID(ctx context.Context, userID id.UserID) (id.OrgIDs, error) {
+func (r RelationOrgUser) ListOrgIDsByUserID(ctx context.Context, userID id.UserID) (id.OrgIDs, error) {
 	qs, err := r.orgUserRef.OrderByChild("user_id").
 		EqualTo(userID.ExportID()).
 		GetOrdered(ctx)