🚧 WIP

infra/db/hooks.go

@@ -22,7 +22,7 @@ func (e *Event) BeforeSave(tx *gorm.DB) (err error) {
 			e.Room.TimeStart = e.TimeStart
 			e.Room.TimeEnd = e.TimeEnd
 			e.Room.CreatedByRefer = e.CreatedByRefer
-			e.Room.Admins = ConvSEventAdminToSRoomAdmin(e.Admins)
+			e.Room.Admins = ConvSEventAdminToSUser(e.Admins)
 		} else {
 			return NewValueError(ErrRoomUndefined, "roomID", "place")
 		}
@@ -180,8 +180,7 @@ func (r *Room) BeforeSave(tx *gorm.DB) (err error) {
 }
 
 func (r *Room) BeforeUpdate(tx *gorm.DB) (err error) {
-	err = tx.Where("room_id", r.ID).Delete(&RoomAdmin{}).Error
-	if err != nil {
+	if err := tx.Model(r).Association("Admins").Clear(); err != nil {
 		return err
 	}
 	return nil

infra/db/model.go

@@ -15,7 +15,7 @@ var tables = []interface{}{
 	GroupAdmin{},
 	Tag{},
 	Room{},
-	RoomAdmin{},
+	// RoomAdmin{},
 	Event{},
 	EventTag{}, // Eventより下にないと、overrideされる
 	EventAdmin{},
@@ -79,12 +79,12 @@ type UserBody struct {
 	User        User `gorm:"->; foreignKey:ID; constraint:OnDelete:CASCADE;" cvt:"->"`
 }
 
-type RoomAdmin struct {
-	UserID uuid.UUID `gorm:"type:char(36); primaryKey"`
-	RoomID uuid.UUID `gorm:"type:char(36); primaryKey"`
-	User   User      `gorm:"->; foreignKey:UserID; constraint:OnDelete:CASCADE;" cvt:"->"`
-	Model  `cvt:"-"`
-}
+// type RoomAdmin struct {
+// 	UserID uuid.UUID `gorm:"type:char(36); primaryKey"`
+// 	RoomID uuid.UUID `gorm:"type:char(36); primaryKey"`
+// 	User   User      `gorm:"->; foreignKey:UserID; constraint:OnDelete:CASCADE;" cvt:"->"`
+// 	Model  `cvt:"-"`
+// }
 
 //go:generate go run github.com/fuji8/gotypeconverter/cmd/gotypeconverter@latest -s Room -d domain.Room -o converter.go .
 //go:generate go run github.com/fuji8/gotypeconverter/cmd/gotypeconverter@latest -s []*Room -d []*domain.Room -o converter.go .
@@ -95,7 +95,7 @@ type Room struct {
 	TimeStart      time.Time `gorm:"type:DATETIME; index"`
 	TimeEnd        time.Time `gorm:"type:DATETIME; index"`
 	Events         []Event   `gorm:"->; constraint:-"` // readOnly
-	Admins         []RoomAdmin
+	Admins         []User    `gorm:"many2many:room_admin_users;"`
 	CreatedByRefer uuid.UUID `gorm:"type:char(36);" cvt:"CreatedBy, <-"`
 	CreatedBy      User      `gorm:"->; foreignKey:CreatedByRefer; constraint:OnDelete:CASCADE;" cvt:"->"`
 	Model          `cvt:"->"`

migration/current.go

@@ -20,5 +20,6 @@ func Migrations() []*gormigrate.Migration {
 		v11(),
 		v12(),
 		v13(),
+		v14(),
 	}
 }

migration/v14.go

@@ -0,0 +1,78 @@
+package migration
+
+import (
+	"time"
+
+	"github.com/go-gormigrate/gormigrate/v2"
+	"github.com/gofrs/uuid"
+	"gorm.io/gorm"
+)
+
+type v14Room struct {
+	ID             uuid.UUID `gorm:"type:char(36);primaryKey"`
+	Place          string    `gorm:"type:varchar(32);"`
+	Verified       bool
+	TimeStart      time.Time `gorm:"type:DATETIME; index"`
+	TimeEnd        time.Time `gorm:"type:DATETIME; index"`
+	CreatedByRefer uuid.UUID `gorm:"type:char(36);"`
+}
+
+func (*v14Room) TableName() string {
+	return "rooms"
+}
+
+type v14RoomUser struct {
+	RoomID uuid.UUID `gorm:"type:char(36); primaryKey"`
+	UserID uuid.UUID `gorm:"type:char(36); primaryKey"`
+}
+
+func (*v14RoomUser) TableName() string {
+	return "room_admin_users"
+}
+
+type v14RoomAdmin struct {
+	UserID uuid.UUID `gorm:"type:char(36); primaryKey"`
+	RoomID uuid.UUID `gorm:"type:char(36); primaryKey"`
+}
+
+func (*v14RoomAdmin) TableName() string {
+	return "room_admins"
+}
+
+func v14() *gormigrate.Migration {
+	return &gormigrate.Migration{
+		ID: "14",
+		Migrate: func(db *gorm.DB) error {
+			// Step 1: Create the new many-to-many table
+			err := db.Migrator().CreateTable(&v14RoomUser{})
+			if err != nil {
+				return err
+			}
+
+			// Step 2: Migrate data from RoomAdmin to RoomUser
+			roomAdmins := []v14RoomAdmin{}
+			err = db.Find(&roomAdmins).Error
+			if err != nil {
+				return err
+			}
+
+			roomUsers := make([]v14RoomUser, len(roomAdmins))
+			for i, admin := range roomAdmins {
+				roomUsers[i] = v14RoomUser{
+					RoomID: admin.RoomID,
+					UserID: admin.UserID,
+				}
+			}
+
+			if len(roomUsers) > 0 {
+				err = db.Create(&roomUsers).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			// Step 3: Drop the RoomAdmin table
+			return db.Migrator().DropTable(&v14RoomAdmin{})
+		},
+	}
+}