From de670a00ed365c7a1db82151c4040f359a47c24f Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Sun, 13 Nov 2022 13:15:26 -0900 Subject: [PATCH] conditionally increment asset IDs --- backend/internal/core/services/all.go | 27 +++++++++++++-- .../internal/core/services/service_items.go | 34 +++++++++++++++++-- backend/internal/data/repo/repo_items.go | 4 ++- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/backend/internal/core/services/all.go b/backend/internal/core/services/all.go index 5147b8a..25e406e 100644 --- a/backend/internal/core/services/all.go +++ b/backend/internal/core/services/all.go @@ -8,17 +8,38 @@ type AllServices struct { Items *ItemService } -func New(repos *repo.AllRepos) *AllServices { +type OptionsFunc func(*options) + +type options struct { + autoIncrementAssetID bool +} + +func WithAutoIncrementAssetID(v bool) func(*options) { + return func(o *options) { + o.autoIncrementAssetID = v + } +} + +func New(repos *repo.AllRepos, opts ...OptionsFunc) *AllServices { if repos == nil { panic("repos cannot be nil") } + options := &options{ + autoIncrementAssetID: true, + } + + for _, opt := range opts { + opt(options) + } + return &AllServices{ User: &UserService{repos}, Group: &GroupService{repos}, Items: &ItemService{ - repo: repos, - at: attachmentTokens{}, + repo: repos, + at: attachmentTokens{}, + autoIncrementAssetID: options.autoIncrementAssetID, }, } } diff --git a/backend/internal/core/services/service_items.go b/backend/internal/core/services/service_items.go index 0541577..cd2a889 100644 --- a/backend/internal/core/services/service_items.go +++ b/backend/internal/core/services/service_items.go @@ -21,6 +21,21 @@ type ItemService struct { // at is a map of tokens to attachment IDs. This is used to store the attachment ID // for issued URLs at attachmentTokens + + autoIncrementAssetID bool +} + +func (svc *ItemService) Create(ctx Context, item repo.ItemCreate) (repo.ItemOut, error) { + if svc.autoIncrementAssetID { + highest, err := svc.repo.Items.GetHighestAssetID(ctx, ctx.GID) + if err != nil { + return repo.ItemOut{}, err + } + + item.AssetID = repo.AssetID(highest + 1) + } + + return svc.repo.Items.Create(ctx, ctx.GID, item) } func (svc *ItemService) EnsureAssetID(ctx context.Context, GID uuid.UUID) (int, error) { @@ -140,6 +155,14 @@ func (svc *ItemService) CsvImport(ctx context.Context, GID uuid.UUID, data [][]s } } + highest := repo.AssetID(-1) + if svc.autoIncrementAssetID { + highest, err = svc.repo.Items.GetHighestAssetID(ctx, GID) + if err != nil { + return 0, err + } + } + // Create the items var count int for _, row := range loaded { @@ -165,13 +188,20 @@ func (svc *ItemService) CsvImport(ctx context.Context, GID uuid.UUID, data [][]s Str("location", row.Location). Msgf("Creating Item: %s", row.Item.Name) - result, err := svc.repo.Items.Create(ctx, GID, repo.ItemCreate{ + data := repo.ItemCreate{ ImportRef: row.Item.ImportRef, Name: row.Item.Name, Description: row.Item.Description, LabelIDs: labelIDs, LocationID: locationID, - }) + } + + if svc.autoIncrementAssetID { + highest++ + data.AssetID = highest + } + + result, err := svc.repo.Items.Create(ctx, GID, data) if err != nil { return count, err diff --git a/backend/internal/data/repo/repo_items.go b/backend/internal/data/repo/repo_items.go index e983abf..6c12287 100644 --- a/backend/internal/data/repo/repo_items.go +++ b/backend/internal/data/repo/repo_items.go @@ -71,6 +71,7 @@ type ( ParentID uuid.UUID `json:"parentId" extensions:"x-nullable"` Name string `json:"name"` Description string `json:"description"` + AssetID AssetID `json:"-"` // Edges LocationID uuid.UUID `json:"locationId"` @@ -431,7 +432,8 @@ func (e *ItemsRepository) Create(ctx context.Context, gid uuid.UUID, data ItemCr SetName(data.Name). SetDescription(data.Description). SetGroupID(gid). - SetLocationID(data.LocationID) + SetLocationID(data.LocationID). + SetAssetID(int(data.AssetID)) if data.LabelIDs != nil && len(data.LabelIDs) > 0 { q.AddLabelIDs(data.LabelIDs...)