u

2026-10-11 03:37:13 +02:00 · 2026-10-11 03:30:30 +02:00
7 changed files with 36 additions and 67 deletions
--- a/docs/api/routes-all.md
+++ b/docs/api/routes-all.md
@@ -233,7 +233,7 @@ _none_

 #### List brands — `GET /brand`
 - Params: `query: offset?: int, limit?: int, includeSmallThumbs?: bool`
- Returns: `200 { brands: { id: int, name: str, pics: { fullHash: str, thumbW: int, thumbH: int, thumbHash: str, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null }[], gsprpinfo?: str|null }[], total: int, offset: int, limit: int }`
+- Returns: `200 { brands: { id: int, name: str, articleCount: int, pics: { fullHash: str, thumbW: int, thumbH: int, thumbHash: str, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null }[], gsprpinfo?: str|null }[], total: int, offset: int, limit: int }`
 #### Create brand — `POST /brand`
 - Params: `body: { name: str, gsprpinfo?: str }`
 - Returns: `201 { brand: { id: int, name: str, pics: T36[], gsprpinfo?: str|null } }`
--- a/docs/api/routes.md
+++ b/docs/api/routes.md
@@ -216,7 +216,7 @@ _none_

 #### List brands — `GET /brand`
 - Params: `query: offset?: int, limit?: int, includeSmallThumbs?: bool`
- Returns: `200 { brands: { id: int, name: str, pics: { fullHash: str, thumbW: int, thumbH: int, thumbHash: str, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null }[], gsprpinfo?: str|null }[], total: int, offset: int, limit: int }`
+- Returns: `200 { brands: { id: int, name: str, articleCount: int, pics: { fullHash: str, thumbW: int, thumbH: int, thumbHash: str, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null }[], gsprpinfo?: str|null }[], total: int, offset: int, limit: int }`
 #### Create brand — `POST /brand`
 - Params: `body: { name: str, gsprpinfo?: str }`
 - Returns: `201 { brand: { id: int, name: str, pics: T32[], gsprpinfo?: str|null } }`
--- a/docs/api/routes/brand/list.md
+++ b/docs/api/routes/brand/list.md
@@ -4,7 +4,7 @@ Protected. Requires a valid session cookie (`credentials: 'include'`).

 List brands

-Lists brands for the authenticated user's selected company, sorted by name. Paged; `total` is the unpaged count. Small-thumbnail fields are omitted by default. Set `includeSmallThumbs=true` to include each picture's `smallThumbW`, `smallThumbH`, and `smallThumbBinary` (base64-encoded AVIF bytes, resized with a 32px maximum edge).
+Lists brands for the authenticated user's selected company, sorted by name. Paged; `total` is the unpaged count. Each brand includes `articleCount` (child articles inherit the brand from their father article; father articles are not counted). Small-thumbnail fields are omitted by default. Set `includeSmallThumbs=true` to include each picture's `smallThumbW`, `smallThumbH`, and `smallThumbBinary` (base64-encoded AVIF bytes, resized with a 32px maximum edge).

 ## Query parameters

@@ -24,6 +24,7 @@ Brand list
    {
      "id": 1,
      "name": "…",
+      "articleCount": 1,
      "gsprpinfo": "…",
      "pics": [
        {
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,9 +13,9 @@
        "chalk": "^6.0.1",
        "cookie-parser": "^1.4.7",
        "cross-env": "^10.1.0",
-        "dotenv": "^18.0.6",
+        "dotenv": "^18.0.7",
        "exceljs": "^4.4.0",
-        "express": "^5.2.1",
+        "express": "^5.3.0",
        "google-auth-library": "^11.2.0",
        "ink": "^8.0.0",
        "ink-text-input": "^6.0.0",
@@ -1404,19 +1404,6 @@
        "url": "https://opencollective.com/express"
      }
    },
-    "node_modules/body-parser/node_modules/content-type": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz",
-      "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
    "node_modules/brace-expansion": {
      "version": "1.1.21",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
@@ -1832,9 +1819,9 @@
      "license": "MIT"
    },
    "node_modules/content-disposition": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz",
-      "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-2.0.1.tgz",
+      "integrity": "sha512-e+H0ZXHSWYrENhQzw1LPuP4oF5MzVKmDU6d3hxlvaPEYLLg62MxtQNPRx4SYSuYJSBUgnQIG4HIN2tEtNv7Dog==",
      "license": "MIT",
      "engines": {
        "node": ">=18"
@@ -1845,12 +1832,16 @@
      }
    },
    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz",
+      "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
      "license": "MIT",
      "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/convert-to-spaces": {
@@ -2146,9 +2137,9 @@
      }
    },
    "node_modules/dotenv": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-18.0.6.tgz",
-      "integrity": "sha512-ZMVmohV6CvAJtj++pZNyggluUt6hbRdQAxc2+Z635RL6/AG/ruXv5lHnybUFoxMPL/yrTL/tsF4paZu2l7RA6Q==",
+      "version": "18.0.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-18.0.7.tgz",
+      "integrity": "sha512-QEvMEF8ca3GNZJJnAbOgxpj5ULhBvnMcURp+XKrtvqFNPgjBvYoswQ0Jl2cO7JzCjxZjJhr9ZuIEhlrRxMft/Q==",
      "license": "BSD-2-Clause",
      "bin": {
        "dotenv": "dist/index.cjs"
@@ -2497,15 +2488,15 @@
      }
    },
    "node_modules/express": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
-      "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.3.0.tgz",
+      "integrity": "sha512-qCqy1xSoaugxOD4IVHb1ZWdkvCF2W3aE2okKouWj8VwJ+ztskSiXoBnCSJqfKT+cVPJhuJqe9YLbY425+Zh00g==",
      "license": "MIT",
      "dependencies": {
        "accepts": "^2.0.0",
-        "body-parser": "^2.2.1",
-        "content-disposition": "^1.0.0",
-        "content-type": "^1.0.5",
+        "body-parser": "^2.3.0",
+        "content-disposition": "^2.0.1",
+        "content-type": "^2.0.0",
        "cookie": "^0.7.1",
        "cookie-signature": "^1.2.1",
        "debug": "^4.4.0",
@@ -2521,14 +2512,14 @@
        "on-finished": "^2.4.1",
        "once": "^1.4.0",
        "parseurl": "^1.3.3",
-        "proxy-addr": "^2.0.7",
-        "qs": "^6.14.0",
+        "proxy-addr": "^2.0.8",
+        "qs": "^6.16.0",
        "range-parser": "^1.2.1",
        "router": "^2.2.0",
        "send": "^1.1.0",
        "serve-static": "^2.2.0",
        "statuses": "^2.0.1",
-        "type-is": "^2.0.1",
+        "type-is": "^2.1.0",
        "vary": "^1.1.2"
      },
      "engines": {
@@ -4295,19 +4286,6 @@
        "url": "https://opencollective.com/express"
      }
    },
-    "node_modules/negotiator/node_modules/content-type": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz",
-      "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
    "node_modules/node-abi": {
      "version": "3.97.0",
      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.97.0.tgz",
@@ -5914,19 +5892,6 @@
        "url": "https://opencollective.com/express"
      }
    },
-    "node_modules/type-is/node_modules/content-type": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.1.0.tgz",
-      "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
    "node_modules/typed-array-buffer": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
    "chalk": "^6.0.1",
    "cookie-parser": "^1.4.7",
    "cross-env": "^10.1.0",
-    "dotenv": "^18.0.6",
+    "dotenv": "^18.0.7",
    "exceljs": "^4.4.0",
-    "express": "^5.2.1",
+    "express": "^5.3.0",
    "google-auth-library": "^11.2.0",
    "ink": "^8.0.0",
    "ink-text-input": "^6.0.0",
--- a/src/api/openapi.js
+++ b/src/api/openapi.js
@@ -396,12 +396,15 @@
 *           description: Base64-encoded small AVIF thumbnail bytes
 *     BrandList:
 *       type: object
- *       required: [id, name, pics]
+ *       required: [id, name, articleCount, pics]
 *       properties:
 *         id:
 *           type: integer
 *         name:
 *           type: string
+ *         articleCount:
+ *           type: integer
+ *           description: Number of articles assigned to this brand (excluding father articles, including child articles inheriting the brand)
 *         gsprpinfo:
 *           type: string
 *           nullable: true
--- a/src/api/routes/brand.js
+++ b/src/api/routes/brand.js
@@ -51,7 +51,7 @@ export function register(app, basePath = '') {
     *   get:
     *     tags: [Brand]
     *     summary: List brands
-     *     description: Lists brands for the authenticated user's selected company, sorted by name. Paged; `total` is the unpaged count. Small-thumbnail fields are omitted by default. Set `includeSmallThumbs=true` to include each picture's `smallThumbW`, `smallThumbH`, and `smallThumbBinary` (base64-encoded AVIF bytes, resized with a 32px maximum edge).
+     *     description: Lists brands for the authenticated user's selected company, sorted by name. Paged; `total` is the unpaged count. Each brand includes `articleCount` (child articles inherit the brand from their father article; father articles are not counted). Small-thumbnail fields are omitted by default. Set `includeSmallThumbs=true` to include each picture's `smallThumbW`, `smallThumbH`, and `smallThumbBinary` (base64-encoded AVIF bytes, resized with a 32px maximum edge).
     *     security:
     *       - cookieAuth: []
     *     parameters:
Author	SHA1	Message	Date
seb	8262e35e53	u	2026-10-11 03:37:13 +02:00
seb	b5e7643e12	u	2026-10-11 03:30:30 +02:00