Added expenses to plan
This commit is contained in:
parent
8ea8574f3f
commit
54d7d14ef9
9 changed files with 401 additions and 13 deletions
|
|
@ -21,7 +21,6 @@ func CreatePlan(db *gorm.DB, user *User, name string) (*Plan, error) {
|
|||
Members: []Member{
|
||||
{
|
||||
UserID: user.Username,
|
||||
Type: "user",
|
||||
},
|
||||
},
|
||||
JoinCode: base64.URLEncoding.EncodeToString(join_code),
|
||||
|
|
@ -95,10 +94,7 @@ func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
|
|||
return errors.New("Member is nil")
|
||||
}
|
||||
new_member.PlanID = p.ID
|
||||
if new_member.Type == "non-user" {
|
||||
if new_member.Name == "" {
|
||||
return errors.New("name required for non user")
|
||||
}
|
||||
if new_member.Name != "" {
|
||||
found, err := p.HasNonUser(orm, new_member.Name)
|
||||
if err != nil {
|
||||
return nil
|
||||
|
|
@ -107,7 +103,7 @@ func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
|
|||
return errors.New("Non user name taken")
|
||||
}
|
||||
return orm.Create(&new_member).Error
|
||||
} else if new_member.Type == "user" {
|
||||
} else if new_member.UserID != "" {
|
||||
user, err := GetUser(orm, new_member.UserID)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -123,6 +119,6 @@ func (p *Plan) AddMember(orm *gorm.DB, new_member *Member) error {
|
|||
|
||||
return orm.Create(&new_member).Error
|
||||
} else {
|
||||
return errors.New("Invalid type for user")
|
||||
return errors.New("Member object requires one of Name or UserID to be filled")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue