Added membership for users

models/models.go

@@ -9,13 +9,15 @@ type User struct {
 }
 
 type Member struct {
-	ID     uint `gorm:"primaryKey;autoIncrement:true"`
-	PlanID uint
-	Plan   Plan
-	Type   string `gorm:"check:type in ('member','non-member')"`
-	Name   string `gorm:"check:type=='member' OR name IS NOT NULL" json:"name"`
-	UserID string
-	User   User `gorm:"foreignKey:UserID"`
+	ID       uint   `gorm:"primaryKey;autoIncrement:true" json:"-"`
+	PlanID   uint   `json:"-"`
+	Plan     Plan   `json:"-"`
+	Type     string `gorm:"check:type in ('user','non-user')" json:"type"`
+	Name     string `gorm:"check:type=='member' OR name IS NOT NULL" json:"name"`
+	Status   string `gorm:"check:status in ('pending','ready')" json:"status"`
+	JoinCode string `gorm:"uniqueIndex;check:type=='non-member' OR join_code IS NOT NULL" json:"join_code,omitempty"`
+	UserID   string `json:"username"`
+	User     User   `gorm:"foreignKey:UserID" json:"-"`
 }
 
 // CREATE TABLE plans(id INTEGER PRIMARY KEY AUTOINCREMENT, name STRING, owner STRING, FOREIGN KEY(owner) REFERENCES users(username))

models/plans.go

@@ -1,9 +1,12 @@
 package models
 
 import (
+	"crypto/rand"
+	"encoding/base64"
 	"errors"
-	"gorm.io/gorm"
 	. "planner/errors"
+
+	"gorm.io/gorm"
 )
 
 func GetPlan(orm *gorm.DB, user User, id uint) (*Plan, error) {
@@ -48,3 +51,80 @@ func (p *Plan) IsMember(orm *gorm.DB, u *User) (bool, error) {
 	}
 	return member_count == 1, nil
 }
+
+func (p *Plan) GetMember(orm *gorm.DB, u *User) (*Member, error) {
+	var m Member
+	result := orm.
+		Table("members").
+		Where("user_id=? AND plan_id=?", u.Username, p.ID).
+		Take(&m).Error
+	if result != nil {
+		return nil, ErrNotMember
+	}
+	return &m, nil
+}
+
+func (p *Plan) HasNonUser(orm *gorm.DB, name string) (bool, error) {
+	var member_count int64
+	result := orm.
+		Table("members").
+		Where("plan_id=? AND name=?", p.ID, name).
+		Count(&member_count).Error
+	if result != nil {
+		return false, result
+	}
+	return member_count == 1, nil
+}
+
+func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
+	if new_member == nil {
+		return errors.New("Member is nil")
+	}
+	new_member.PlanID = p.ID
+	if new_member.Type == "non-user" {
+		found, err := p.HasNonUser(orm, new_member.Name)
+		if err != nil {
+			return nil
+		}
+		if found {
+			return errors.New("Non user name taken")
+		}
+		new_member.Status = "ready"
+		return orm.Create(&new_member).Error
+
+	} else if new_member.Type == "user" {
+		user, err := GetUser(orm, new_member.UserID)
+		if err != nil {
+			return err
+		}
+
+		found, err := p.IsMember(orm, &user)
+		if err != nil {
+			return nil
+		}
+		if found {
+			return errors.New("User already is member")
+		}
+
+		new_member.Status = "pending"
+		var res error
+		for retries := 3; retries >= 0; retries -= 1 {
+			join_code := make([]byte, 32)
+			_, err = rand.Read(join_code)
+			if err != nil {
+				return err
+			}
+			new_member.JoinCode = base64.URLEncoding.EncodeToString(join_code)
+			res = orm.Create(&new_member).Error
+
+			if res == nil {
+				break
+			} else if !errors.Is(res, gorm.ErrDuplicatedKey) {
+				return res
+			}
+		}
+		return res
+	} else {
+		return errors.New("Invalid type for user")
+	}
+}

models/users.go

@@ -13,3 +13,11 @@ func (u *User) GetPlans(orm *gorm.DB) ([]Plan, error) {
 		Find(&plans)
 	return plans, err.Error
 }
+
+func GetUser(orm *gorm.DB, username string) (User, error) {
+	user := User{Username: username}
+	if err := orm.Take(&user).Error; err != nil {
+		return user, err
+	}
+	return user, nil
+}