diff --git a/backend/app/api/handlers/v1/v1_ctrl_items.go b/backend/app/api/handlers/v1/v1_ctrl_items.go index d7be19d..ec8f580 100644 --- a/backend/app/api/handlers/v1/v1_ctrl_items.go +++ b/backend/app/api/handlers/v1/v1_ctrl_items.go @@ -4,6 +4,7 @@ import ( "database/sql" "errors" "net/http" + "strings" "github.com/hay-kot/homebox/backend/internal/core/services" "github.com/hay-kot/homebox/backend/internal/data/repo" @@ -29,18 +30,48 @@ func (ctrl *V1Controller) HandleItemsGetAll() server.HandlerFunc { extractQuery := func(r *http.Request) repo.ItemQuery { params := r.URL.Query() - return repo.ItemQuery{ + filterFieldItems := func(raw []string) []repo.FieldQuery { + var items []repo.FieldQuery + + for _, v := range raw { + parts := strings.SplitN(v, "=", 2) + if len(parts) == 2 { + items = append(items, repo.FieldQuery{ + Name: parts[0], + Value: parts[1], + }) + } + } + + return items + } + + v := repo.ItemQuery{ Page: queryIntOrNegativeOne(params.Get("page")), PageSize: queryIntOrNegativeOne(params.Get("pageSize")), Search: params.Get("q"), LocationIDs: queryUUIDList(params, "locations"), LabelIDs: queryUUIDList(params, "labels"), IncludeArchived: queryBool(params.Get("includeArchived")), + Fields: filterFieldItems(params["fields"]), } + + if strings.HasPrefix(v.Search, "#") { + aidStr := strings.TrimPrefix(v.Search, "#") + + aid, ok := repo.ParseAssetID(aidStr) + if ok { + v.Search = "" + v.AssetID = aid + } + } + + return v } return func(w http.ResponseWriter, r *http.Request) error { ctx := services.NewContext(r.Context()) + items, err := ctrl.repo.Items.QueryByGroup(ctx, ctx.GID, extractQuery(r)) if err != nil { if errors.Is(err, sql.ErrNoRows) { @@ -161,6 +192,48 @@ func (ctrl *V1Controller) handleItemsGeneral() server.HandlerFunc { } } +// HandleGetAllCustomFieldNames godocs +// @Summary imports items into the database +// @Tags Items +// @Produce json +// @Success 200 +// @Router /v1/items/fields [GET] +// @Success 200 {object} []string +// @Security Bearer +func (ctrl *V1Controller) HandleGetAllCustomFieldNames() server.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) error { + ctx := services.NewContext(r.Context()) + + v, err := ctrl.repo.Items.GetAllCustomFieldNames(r.Context(), ctx.GID) + if err != nil { + return err + } + + return server.Respond(w, http.StatusOK, v) + } +} + +// HandleGetAllCustomFieldValues godocs +// @Summary imports items into the database +// @Tags Items +// @Produce json +// @Success 200 +// @Router /v1/items/fields/values [GET] +// @Success 200 {object} []string +// @Security Bearer +func (ctrl *V1Controller) HandleGetAllCustomFieldValues() server.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) error { + ctx := services.NewContext(r.Context()) + + v, err := ctrl.repo.Items.GetAllCustomFieldValues(r.Context(), ctx.GID, r.URL.Query().Get("field")) + if err != nil { + return err + } + + return server.Respond(w, http.StatusOK, v) + } +} + // HandleItemsImport godocs // @Summary imports items into the database // @Tags Items diff --git a/backend/app/api/routes.go b/backend/app/api/routes.go index 3475e7a..04e4066 100644 --- a/backend/app/api/routes.go +++ b/backend/app/api/routes.go @@ -103,8 +103,11 @@ func (a *app) mountRoutes(repos *repo.AllRepos) { a.server.Delete(v1Base("/labels/{id}"), v1Ctrl.HandleLabelDelete(), userMW...) a.server.Get(v1Base("/items"), v1Ctrl.HandleItemsGetAll(), userMW...) - a.server.Post(v1Base("/items/import"), v1Ctrl.HandleItemsImport(), userMW...) a.server.Post(v1Base("/items"), v1Ctrl.HandleItemsCreate(), userMW...) + a.server.Post(v1Base("/items/import"), v1Ctrl.HandleItemsImport(), userMW...) + a.server.Get(v1Base("/items/fields"), v1Ctrl.HandleGetAllCustomFieldNames(), userMW...) + a.server.Get(v1Base("/items/fields/values"), v1Ctrl.HandleGetAllCustomFieldValues(), userMW...) + a.server.Get(v1Base("/items/{id}"), v1Ctrl.HandleItemGet(), userMW...) a.server.Put(v1Base("/items/{id}"), v1Ctrl.HandleItemUpdate(), userMW...) a.server.Delete(v1Base("/items/{id}"), v1Ctrl.HandleItemDelete(), userMW...) diff --git a/backend/internal/data/repo/asset_id_type.go b/backend/internal/data/repo/asset_id_type.go index 6aecf9c..06d610e 100644 --- a/backend/internal/data/repo/asset_id_type.go +++ b/backend/internal/data/repo/asset_id_type.go @@ -8,11 +8,34 @@ import ( type AssetID int +func (aid AssetID) Nil() bool { + return aid.Int() <= 0 +} + +func (aid AssetID) Int() int { + return int(aid) +} + +func ParseAssetIDBytes(d []byte) (AID AssetID, ok bool) { + d = bytes.Replace(d, []byte(`"`), []byte(``), -1) + d = bytes.Replace(d, []byte(`-`), []byte(``), -1) + + aidInt, err := strconv.Atoi(string(d)) + if err != nil { + return AssetID(-1), false + } + + return AssetID(aidInt), true +} + +func ParseAssetID(s string) (AID AssetID, ok bool) { + return ParseAssetIDBytes([]byte(s)) +} + func (aid AssetID) MarshalJSON() ([]byte, error) { aidStr := fmt.Sprintf("%06d", aid) aidStr = fmt.Sprintf("%s-%s", aidStr[:3], aidStr[3:]) return []byte(fmt.Sprintf(`"%s"`, aidStr)), nil - } func (aid *AssetID) UnmarshalJSON(d []byte) error { @@ -26,5 +49,4 @@ func (aid *AssetID) UnmarshalJSON(d []byte) error { *aid = AssetID(aidInt) return nil - } diff --git a/backend/internal/data/repo/repo_items.go b/backend/internal/data/repo/repo_items.go index d6faccd..01f090f 100644 --- a/backend/internal/data/repo/repo_items.go +++ b/backend/internal/data/repo/repo_items.go @@ -2,6 +2,7 @@ package repo import ( "context" + "fmt" "time" "github.com/google/uuid" @@ -19,14 +20,21 @@ type ItemsRepository struct { } type ( + FieldQuery struct { + Name string + Value string + } + ItemQuery struct { Page int PageSize int Search string `json:"search"` + AssetID AssetID `json:"assetId"` LocationIDs []uuid.UUID `json:"locationIds"` LabelIDs []uuid.UUID `json:"labelIds"` SortBy string `json:"sortBy"` IncludeArchived bool `json:"includeArchived"` + Fields []FieldQuery } ItemField struct { @@ -326,7 +334,26 @@ func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q Ite ) } + if !q.AssetID.Nil() { + qb = qb.Where(item.AssetID(q.AssetID.Int())) + } + + if len(q.Fields) > 0 { + predicates := make([]predicate.Item, 0, len(q.Fields)) + for _, f := range q.Fields { + predicates = append(predicates, item.HasFieldsWith( + itemfield.And( + itemfield.Name(f.Name), + itemfield.TextValue(f.Value), + ), + )) + } + + qb = qb.Where(item.Or(predicates...)) + } + count, err := qb.Count(ctx) + if err != nil { return PaginationResult[ItemSummary]{}, err } @@ -473,8 +500,8 @@ func (e *ItemsRepository) DeleteByGroup(ctx context.Context, gid, id uuid.UUID) return err } -func (e *ItemsRepository) UpdateByGroup(ctx context.Context, gid uuid.UUID, data ItemUpdate) (ItemOut, error) { - q := e.db.Item.Update().Where(item.ID(data.ID), item.HasGroupWith(group.ID(gid))). +func (e *ItemsRepository) UpdateByGroup(ctx context.Context, GID uuid.UUID, data ItemUpdate) (ItemOut, error) { + q := e.db.Item.Update().Where(item.ID(data.ID), item.HasGroupWith(group.ID(GID))). SetName(data.Name). SetDescription(data.Description). SetLocationID(data.LocationID). @@ -587,3 +614,62 @@ func (e *ItemsRepository) UpdateByGroup(ctx context.Context, gid uuid.UUID, data return e.GetOne(ctx, data.ID) } + +func (e *ItemsRepository) GetAllCustomFieldValues(ctx context.Context, GID uuid.UUID, name string) ([]string, error) { + type st struct { + Value string `json:"text_value"` + } + + var values []st + + err := e.db.Item.Query(). + Where( + item.HasGroupWith(group.ID(GID)), + ). + QueryFields(). + Where( + itemfield.Name(name), + ). + Unique(true). + Select(itemfield.FieldTextValue). + Scan(ctx, &values) + + if err != nil { + return nil, fmt.Errorf("failed to get field values: %w", err) + } + + valueStrings := make([]string, len(values)) + for i, f := range values { + valueStrings[i] = f.Value + } + + return valueStrings, nil +} + +func (e *ItemsRepository) GetAllCustomFieldNames(ctx context.Context, GID uuid.UUID) ([]string, error) { + type st struct { + Name string `json:"name"` + } + + var fields []st + + err := e.db.Debug().Item.Query(). + Where( + item.HasGroupWith(group.ID(GID)), + ). + QueryFields(). + Unique(true). + Select(itemfield.FieldName). + Scan(ctx, &fields) + + if err != nil { + return nil, fmt.Errorf("failed to get custom fields: %w", err) + } + + fieldNames := make([]string, len(fields)) + for i, f := range fields { + fieldNames[i] = f.Name + } + + return fieldNames, nil +} diff --git a/backend/internal/data/repo/repo_items_test.go b/backend/internal/data/repo/repo_items_test.go index 6d361ba..1f5ea0e 100644 --- a/backend/internal/data/repo/repo_items_test.go +++ b/backend/internal/data/repo/repo_items_test.go @@ -7,6 +7,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func itemFactory() ItemCreate { @@ -273,3 +274,48 @@ func TestItemsRepository_Update(t *testing.T) { assert.Equal(t, updateData.WarrantyDetails, got.WarrantyDetails) assert.Equal(t, updateData.LifetimeWarranty, got.LifetimeWarranty) } + +func TestItemRepository_GetAllCustomFields(t *testing.T) { + const FIELDS_COUNT = 5 + + entity := useItems(t, 1)[0] + + fields := make([]ItemField, FIELDS_COUNT) + names := make([]string, FIELDS_COUNT) + values := make([]string, FIELDS_COUNT) + + for i := 0; i < FIELDS_COUNT; i++ { + name := fk.Str(10) + fields[i] = ItemField{ + Name: name, + Type: "text", + TextValue: fk.Str(10), + } + names[i] = name + values[i] = fields[i].TextValue + } + + _, err := tRepos.Items.UpdateByGroup(context.Background(), tGroup.ID, ItemUpdate{ + ID: entity.ID, + Name: entity.Name, + LocationID: entity.Location.ID, + Fields: fields, + }) + + require.NoError(t, err) + + // Test getting all fields + { + results, err := tRepos.Items.GetAllCustomFieldNames(context.Background(), tGroup.ID) + assert.NoError(t, err) + assert.ElementsMatch(t, names, results) + } + + // Test getting all values from field + { + results, err := tRepos.Items.GetAllCustomFieldValues(context.Background(), tUser.GroupID, names[0]) + + assert.NoError(t, err) + assert.ElementsMatch(t, values[:1], results) + } +}