Improve model and add roles

helpers/database.go

@@ -37,11 +37,10 @@ func connectDatabase() (*gorm.DB, error) {
 
 	err = database.AutoMigrate(
 		&models.User{},
-		&models.ParentSection{},
 		&models.Section{},
+		&models.Role{},
+		&models.UserRoles{},
 		&models.Person{},
-		&models.ManageSection{},
-		&models.ManageParentSection{},
 		&models.List{},
 		&models.ListItem{},
 	)

models/people.go

@@ -4,6 +4,8 @@ import "gorm.io/gorm"
 
 type Person struct {
 	gorm.Model
+	IsMember   bool
+	IsContact  bool
 	FirstName  string
 	LastName   string
 	Email      string

models/roles.go

@@ -0,0 +1,15 @@
+package models
+
+import "gorm.io/gorm"
+
+type Role struct {
+	gorm.Model
+	Name               string
+	ShowPerson         bool
+	CreatePerson       bool
+	EditPerson         bool
+	ShowArchivedPerson bool
+	ArchivePerson      bool
+	RestorePerson      bool
+	ExportData         bool
+}

models/sections.go

@@ -2,16 +2,12 @@ package models
 
 import "gorm.io/gorm"
 
-type ParentSection struct {
-	gorm.Model
-	Name      string
-	ShortName string
-}
-
 type Section struct {
 	gorm.Model
 	Name             string
 	ShortName        string
 	ParentSectionID  uint
-	ParentSection   ParentSection
+	ParentSection    *Section
+	ContainsMembers  bool
+	ContainsContacts bool
 }

models/users.go

@@ -17,30 +17,12 @@ type User struct {
 	SkipWelcome bool
 }
 
-type ManageSection struct {
+type UserRoles struct {
 	gorm.Model
 	UserID    uint
 	User      User
+	RoleID    uint
+	Role      Role
 	SectionID uint
 	Section   Section
-	ShowPerson         bool
-	CreatePerson       bool
-	EditPerson         bool
-	ShowArchivedPerson bool
-	ArchivePerson      bool
-	UnarchivePerson    bool
-}
-
-type ManageParentSection struct {
-	gorm.Model
-	UserID             uint
-	User               User
-	ParentSectionID    uint
-	ParentSection      ParentSection
-	ShowPerson         bool
-	CreatePerson       bool
-	EditPerson         bool
-	ShowArchivedPerson bool
-	ArchivePerson      bool
-	UnarchivePerson    bool
 }