Remove ... another ... redundant function.

Update location pricing to include quantity in calculation

backend/app/api/handlers/v1/v1_ctrl_locations.go

@@ -87,12 +87,22 @@ func (ctrl *V1Controller) HandleLocationDelete() errchain.HandlerFunc {
 
 func (ctrl *V1Controller) GetLocationWithPrice(auth context.Context, GID uuid.UUID, ID uuid.UUID) (repo.LocationOut, error) {
 	var location, err = ctrl.repo.Locations.GetOneByGroup(auth, GID, ID)
+	if err != nil {
+		return repo.LocationOut{}, err
+	}
 
 	// Add direct child items price
 	totalPrice := new(big.Int)
 	items, err := ctrl.repo.Items.QueryByGroup(auth, GID, repo.ItemQuery{LocationIDs: []uuid.UUID{ID}})
+	if err != nil {
+		return repo.LocationOut{}, err
+	}
+
 	for _, item := range items.Items {
-		totalPrice.Add(totalPrice, big.NewInt(int64(item.PurchasePrice*100)))
+		// Convert item.Quantity to float64 for multiplication
+		quantity := float64(item.Quantity)
+		itemTotal := big.NewInt(int64(item.PurchasePrice * quantity * 100))
+		totalPrice.Add(totalPrice, itemTotal)
 	}
 
 	totalPriceFloat := new(big.Float).SetInt(totalPrice)
@@ -101,14 +111,15 @@ func (ctrl *V1Controller) GetLocationWithPrice(auth context.Context, GID uuid.UU
 
 	// Add price from child locations
 	for _, childLocation := range location.Children {
-		var childLocation, err = ctrl.GetLocationWithPrice(auth, GID, childLocation.ID)
+		var childLocationWithPrice repo.LocationOut
+		childLocationWithPrice, err = ctrl.GetLocationWithPrice(auth, GID, childLocation.ID)
 		if err != nil {
 			return repo.LocationOut{}, err
 		}
-		location.TotalPrice += childLocation.TotalPrice
+		location.TotalPrice += childLocationWithPrice.TotalPrice
 	}
 
-	return location, err
+	return location, nil
 }
 
 // HandleLocationGet godoc

backend/app/api/static/docs/swagger.json

@@ -2145,6 +2145,9 @@
                 "purchaseFrom": {
                     "type": "string"
                 },
+                "purchaseFrom": {
+                    "type": "string"
+                },
                 "purchasePrice": {
                     "type": "string",
                     "example": "0"

backend/app/api/static/docs/swagger.yaml

@@ -170,6 +170,8 @@ definitions:
         x-omitempty: true
       purchaseFrom:
         type: string
+      purchaseMethod:
+        type: string
       purchasePrice:
         example: "0"
         type: string

backend/internal/core/services/reporting/io_sheet.go

@@ -203,6 +203,7 @@ func (s *IOSheet) ReadItems(ctx context.Context, items []repo.ItemOut, GID uuid.
 			Archived:    item.Archived,
 
 			PurchasePrice:  item.PurchasePrice,
+			PurchaseMethod: item.PurchaseMethod,
 			PurchaseFrom:   item.PurchaseFrom,
 			PurchaseTime:   item.PurchaseTime,
 

backend/internal/core/services/service_items.go

@@ -298,6 +298,7 @@ func (svc *ItemService) CsvImport(ctx context.Context, GID uuid.UUID, data io.Re
 			Archived:    row.Archived,
 
 			PurchasePrice: row.PurchasePrice,
+			PurchaseFrom:  row.PurchaseMethod,
 			PurchaseFrom:  row.PurchaseFrom,
 			PurchaseTime:  row.PurchaseTime,
 

backend/internal/data/ent/schema/item.go

@@ -76,6 +76,8 @@ func (Item) Fields() []ent.Field {
 
 		// ------------------------------------
 		// item purchase
+		field.String("purchase_method").
+			Optional(),
 		field.Time("purchase_time").
 			Optional(),
 		field.String("purchase_from").

backend/internal/data/migrations/migrations/20220929052825_init.sql

@@ -17,7 +17,7 @@ CREATE INDEX `documenttoken_token` ON `document_tokens` (`token`);
 -- create "groups" table
 CREATE TABLE `groups` (`id` uuid NOT NULL, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `name` text NOT NULL, `currency` text NOT NULL DEFAULT 'usd', PRIMARY KEY (`id`));
 -- create "items" table
-CREATE TABLE `items` (`id` uuid NOT NULL, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `name` text NOT NULL, `description` text NULL, `import_ref` text NULL, `notes` text NULL, `quantity` integer NOT NULL DEFAULT 1, `insured` bool NOT NULL DEFAULT false, `serial_number` text NULL, `model_number` text NULL, `manufacturer` text NULL, `lifetime_warranty` bool NOT NULL DEFAULT false, `warranty_expires` datetime NULL, `warranty_details` text NULL, `purchase_time` datetime NULL, `purchase_from` text NULL, `purchase_price` real NOT NULL DEFAULT 0, `sold_time` datetime NULL, `sold_to` text NULL, `sold_price` real NOT NULL DEFAULT 0, `sold_notes` text NULL, `group_items` uuid NOT NULL, `location_items` uuid NULL, PRIMARY KEY (`id`), CONSTRAINT `items_groups_items` FOREIGN KEY (`group_items`) REFERENCES `groups` (`id`) ON DELETE CASCADE, CONSTRAINT `items_locations_items` FOREIGN KEY (`location_items`) REFERENCES `locations` (`id`) ON DELETE CASCADE);
+CREATE TABLE `items` (`id` uuid NOT NULL, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `name` text NOT NULL, `description` text NULL, `import_ref` text NULL, `notes` text NULL, `quantity` integer NOT NULL DEFAULT 1, `insured` bool NOT NULL DEFAULT false, `serial_number` text NULL, `model_number` text NULL, `manufacturer` text NULL, `lifetime_warranty` bool NOT NULL DEFAULT false, `warranty_expires` datetime NULL, `warranty_details` text NULL, `purchase_method` text NULL, `purchase_time` datetime NULL, `purchase_from` text NULL, `purchase_price` real NOT NULL DEFAULT 0, `sold_time` datetime NULL, `sold_to` text NULL, `sold_price` real NOT NULL DEFAULT 0, `sold_notes` text NULL, `group_items` uuid NOT NULL, `location_items` uuid NULL, PRIMARY KEY (`id`), CONSTRAINT `items_groups_items` FOREIGN KEY (`group_items`) REFERENCES `groups` (`id`) ON DELETE CASCADE, CONSTRAINT `items_locations_items` FOREIGN KEY (`location_items`) REFERENCES `locations` (`id`) ON DELETE CASCADE);
 -- create index "item_name" to table: "items"
 CREATE INDEX `item_name` ON `items` (`name`);
 -- create index "item_manufacturer" to table: "items"

backend/internal/data/repo/repo_items.go

@@ -91,6 +91,7 @@ type (
 		WarrantyDetails  string     `json:"warrantyDetails"`
 
 		// Purchase
+		PurchaseMethod  string     `json:"purchaseMethod"`
 		PurchaseTime    types.Date `json:"purchaseTime"`
 		PurchaseFrom    string     `json:"purchaseFrom"`
 		PurchasePrice   float64    `json:"purchasePrice,string"`
@@ -147,6 +148,7 @@ type (
 		WarrantyDetails  string     `json:"warrantyDetails"`
 
 		// Purchase
+		PurchaseMethod string     `json:"purchaseMethod"`
 		PurchaseTime   types.Date `json:"purchaseTime"`
 		PurchaseFrom   string     `json:"purchaseFrom"`
 

backend/internal/data/repo/repo_items_test.go

@@ -236,6 +236,7 @@ func TestItemsRepository_Update(t *testing.T) {
 		ModelNumber:      fk.Str(10),
 		Manufacturer:     fk.Str(10),
 		PurchaseTime:     types.DateFromTime(time.Now()),
+		PurchaseMethod:     fk.Str(10),
 		PurchaseFrom:     fk.Str(10),
 		PurchasePrice:    300.99,
 		SoldTime:         types.DateFromTime(time.Now()),
@@ -262,6 +263,7 @@ func TestItemsRepository_Update(t *testing.T) {
 	assert.Equal(t, updateData.Manufacturer, got.Manufacturer)
 	// assert.Equal(t, updateData.PurchaseTime, got.PurchaseTime)
 	assert.Equal(t, updateData.PurchaseFrom, got.PurchaseFrom)
+	assert.Equal(t, updateData.PurchaseMethod, got.PurchaseMethod)
 	assert.InDelta(t, updateData.PurchasePrice, got.PurchasePrice, 0.01)
 	// assert.Equal(t, updateData.SoldTime, got.SoldTime)
 	assert.Equal(t, updateData.SoldTo, got.SoldTo)

docs/docs/api/openapi-2.0.json

@@ -2140,6 +2140,9 @@
                     "x-nullable": true,
                     "x-omitempty": true
                 },
+                "purchaseMethod": {
+                    "type": "string"
+                },
                 "purchaseFrom": {
                     "type": "string"
                 },

docs/en/contribute/get-started.md

@@ -47,11 +47,12 @@ type checking `task ui:check`
 
 ## Documentation
 We use [Vitepress](https://vitepress.dev/) for the web documentation of homebox. Anyone is welcome to contribute the documentation if they wish.
-For documentation contributions you only need NodeJS and PNPM.
+Anyone is welcome to contribute the documentation if they wish. For documentation contributions, you only need Node.js and PNPM.
 
 ::: info Notes
-- Languages are seperated by folder (e.g `/en`, `/fr`, etc.)
+- Languages are separated by folder (e.g `/en`, `/fr`, etc.)
 - The Sidebar must be updated on a per language basis
++ The Sidebar must be updated on a per-language basis
 - Each languages files can be named independently (slugs can match the language)
 - The `public/_redirects` file is used to redirect the default to english
 - Redirects can also be configured per language by adding `Language=` after the redirect code

docs/en/import-csv.md

@@ -63,6 +63,7 @@ Specifying import refs also allows you to update existing items via the CSV impo
 | HB.model_number      | String        | Model of the item                             |
 | HB.manufacturer      | String        | Manufacturer of the item                      |
 | HB.notes             | String (1000) | General notes about the product               |
+| HB.purchase_method   | String        | Method of how the item was purchased          |
 | HB.purchase_from     | String        | Name of the place the item was purchased from |
 | HB.purchase_price    | Float64       |                                               |
 | HB.purchase_time     | Date          | Date the item was purchased                   |

frontend/lib/api/__test__/user/stats.test.ts

@@ -16,6 +16,7 @@ type ImportObj = {
   [`HB.manufacturer`]: string;
   [`HB.notes`]: string;
   [`HB.purchase_price`]: number;
+  [`HB.purchase_method`]: string;
   [`HB.purchase_from`]: string;
   [`HB.purchase_time`]: string;
   [`HB.lifetime_warranty`]: boolean;
@@ -62,6 +63,7 @@ function importFileGenerator(entries: number): ImportObj[] {
       [`HB.manufacturer`]: faker.string.alphanumeric(5),
       [`HB.notes`]: "",
       [`HB.purchase_from`]: faker.person.fullName(),
+      [`HB.purchase_method`]: faker.string.alphanumeric(5),
       [`HB.purchase_price`]: faker.number.int(100),
       [`HB.purchase_time`]: faker.date.past().toDateString(),
       [`HB.lifetime_warranty`]: half > i,