A continuation of HomeBox the inventory and organization system built for the Home User
fix: prevents re-creating locations and labels when someone joins group (#262)
Hayden504569bed074
diff --git a/backend/internal/core/services/service_user.go b/backend/internal/core/services/service_user.goindex 6d3bc6ef..053087b6 100644--- a/backend/internal/core/services/service_user.go+++ b/backend/internal/core/services/service_user.go@@ -51,15 +51,17 @@ func (svc *UserService) RegisterUser(ctx context.Context, data UserRegistration)Msg("Registering new user")var (- err error- group repo.Group- token repo.GroupInvitation- isOwner = false+ err error+ group repo.Group+ token repo.GroupInvitation++ // creatingGroup is true if the user is creating a new group.+ creatingGroup = false)switch data.GroupToken {case "":- isOwner = true+ creatingGroup = truegroup, err = svc.repos.Groups.GroupCreate(ctx, "Home")if err != nil {log.Err(err).Msg("Failed to create group")@@ -81,7 +83,7 @@ func (svc *UserService) RegisterUser(ctx context.Context, data UserRegistration)Password: hashed,IsSuperuser: false,GroupID: group.ID,- IsOwner: isOwner,+ IsOwner: creatingGroup,}usr, err := svc.repos.Users.Create(ctx, usrCreate)@@ -89,21 +91,24 @@ func (svc *UserService) RegisterUser(ctx context.Context, data UserRegistration)return repo.UserOut{}, err}- for _, label := range defaultLabels() {- _, err := svc.repos.Labels.Create(ctx, group.ID, label)- if err != nil {- return repo.UserOut{}, err+ // Create the default labels and locations for the group.+ if creatingGroup {+ for _, label := range defaultLabels() {+ _, err := svc.repos.Labels.Create(ctx, group.ID, label)+ if err != nil {+ return repo.UserOut{}, err+ }}- }- for _, location := range defaultLocations() {- _, err := svc.repos.Locations.Create(ctx, group.ID, location)- if err != nil {- return repo.UserOut{}, err+ for _, location := range defaultLocations() {+ _, err := svc.repos.Locations.Create(ctx, group.ID, location)+ if err != nil {+ return repo.UserOut{}, err+ }}}- // Decrement the invitation token if it was used+ // Decrement the invitation token if it was used.if token.ID != uuid.Nil {err = svc.repos.Groups.InvitationUpdate(ctx, token.ID, token.Uses-1)if err != nil {diff --git a/backend/internal/data/repo/repo_items.go b/backend/internal/data/repo/repo_items.goindex 01f090fa..a62d3474 100644--- a/backend/internal/data/repo/repo_items.go+++ b/backend/internal/data/repo/repo_items.go@@ -653,7 +653,7 @@ func (e *ItemsRepository) GetAllCustomFieldNames(ctx context.Context, GID uuid.Uvar fields []st- err := e.db.Debug().Item.Query().+ err := e.db.Item.Query().Where(item.HasGroupWith(group.ID(GID)),).