Simplified join with a global code

core/plans.go

@@ -8,7 +8,32 @@ import (
 	"gorm.io/gorm"
 )
 
-func GetPlan(orm *gorm.DB, user User, id uint) (*Plan, error) {
+func CreatePlan(db *gorm.DB, user *User, name string) (*Plan, error) {
+	join_code := make([]byte, 32)
+	_, err := rand.Read(join_code)
+	if err != nil {
+		return nil, err
+	}
+
+	var plan Plan = Plan{
+		Name:  name,
+		Owner: user.Username,
+		Members: []Member{
+			{
+				UserID: user.Username,
+				Type:   "user",
+			},
+		},
+		JoinCode: base64.URLEncoding.EncodeToString(join_code),
+	}
+	result := db.Create(&plan)
+	if result.Error != nil {
+		return nil, result.Error
+	}
+	return &plan, nil
+}
+
+func GetPlan(orm *gorm.DB, id uint) (*Plan, error) {
 	var plan Plan = Plan{
 		ID: id,
 	}
@@ -20,16 +45,6 @@ func GetPlan(orm *gorm.DB, user User, id uint) (*Plan, error) {
 		return nil, result.Error
 	}
 
-	if plan.Owner == user.Username {
-		return &plan, nil
-	}
-
-	isMember, err := plan.IsMember(orm, &user)
-
-	if !isMember || err != nil {
-		return nil, err
-	}
-
 	return &plan, nil
 }
 
@@ -81,6 +96,9 @@ func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
 	}
 	new_member.PlanID = p.ID
 	if new_member.Type == "non-user" {
+		if new_member.Name == "" {
+			return errors.New("name required for non user")
+		}
 		found, err := p.HasNonUser(orm, new_member.Name)
 		if err != nil {
 			return nil
@@ -88,9 +106,7 @@ func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
 		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 {
@@ -105,24 +121,7 @@ func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
 			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
+		return orm.Create(&new_member).Error
 	} else {
 		return errors.New("Invalid type for user")
 	}