@stamhoofd/backend 2.50.0 → 2.51.0

package/.env.template.json

@@ -24,7 +24,8 @@
         },
         "legacyWebshop": "shop.stamhoofd",
         "api": "api.stamhoofd",
-        "rendererApi": "renderer.stamhoofd"
+        "rendererApi": "renderer.stamhoofd",
+        "webshopCname": "shop.stamhoofd"
     },
     "translationNamespace": "stamhoofd",
     "platformName": "stamhoofd",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.50.0",
+    "version": "2.51.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -33,17 +33,17 @@
     "dependencies": {
         "@mollie/api-client": "3.7.0",
         "@simonbackx/simple-database": "1.25.0",
-        "@simonbackx/simple-encoding": "2.16.5",
+        "@simonbackx/simple-encoding": "2.16.6",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.50.0",
-        "@stamhoofd/backend-middleware": "2.50.0",
-        "@stamhoofd/email": "2.50.0",
-        "@stamhoofd/models": "2.50.0",
-        "@stamhoofd/queues": "2.50.0",
-        "@stamhoofd/sql": "2.50.0",
-        "@stamhoofd/structures": "2.50.0",
-        "@stamhoofd/utility": "2.50.0",
+        "@stamhoofd/backend-i18n": "2.51.0",
+        "@stamhoofd/backend-middleware": "2.51.0",
+        "@stamhoofd/email": "2.51.0",
+        "@stamhoofd/models": "2.51.0",
+        "@stamhoofd/queues": "2.51.0",
+        "@stamhoofd/sql": "2.51.0",
+        "@stamhoofd/structures": "2.51.0",
+        "@stamhoofd/utility": "2.51.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,8 @@
         "postmark": "^4.0.5",
         "stripe": "^16.6.0"
     },
-    "gitHead": "809b483cc6e98291fca589b1ac39aaa3a7fcf6f2"
+    "publishConfig": {
+        "access": "public"
+    },
+    "gitHead": "5db656e50ded9b65076cd2d0d864f7fb65a4b7fb"
 }

package/src/endpoints/organization/dashboard/documents/GetDocumentsEndpoint.ts

@@ -1,6 +1,6 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { Document } from '@stamhoofd/models';
-import { assertSort, CountFilteredRequest, Document as DocumentStruct, getSortFilter, LimitedFilteredRequest, PaginatedResponse } from '@stamhoofd/structures';
+import { assertSort, CountFilteredRequest, Document as DocumentStruct, getSortFilter, LimitedFilteredRequest, PaginatedResponse, SearchFilterFactory, StamhoofdFilter } from '@stamhoofd/structures';
 
 import { Decoder } from '@simonbackx/simple-encoding';
 import { compileToSQLFilter, compileToSQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
@@ -55,12 +55,11 @@ export class GetDocumentsEndpoint extends Endpoint<Params, Query, Body, Response
         }
 
         if (q.search) {
-            // todo
-            // const searchFilter: StamhoofdFilter | null = getOrderSearchFilter(q.search, parsePhoneNumber);
+            const searchFilter: StamhoofdFilter | null = getDocumentSearchFilter(q.search);
 
-            // if (searchFilter) {
-            //     query.where(compileToSQLFilter(searchFilter, filterCompilers));
-            // }
+            if (searchFilter) {
+                query.where(compileToSQLFilter(searchFilter, filterCompilers));
+            }
         }
 
         if (q instanceof LimitedFilteredRequest) {
@@ -126,3 +125,33 @@ export class GetDocumentsEndpoint extends Endpoint<Params, Query, Body, Response
         );
     }
 }
+
+function getDocumentSearchFilter(search: string | null): StamhoofdFilter | null {
+    if (search === null || search === undefined) {
+        return null;
+    }
+
+    const numberFilter = SearchFilterFactory.getIntegerFilter(search);
+
+    if (numberFilter) {
+        return {
+            number: numberFilter,
+        };
+    }
+
+    return {
+        $or: [
+            {
+                description: {
+                    $contains: search,
+                },
+            },
+            {
+                id: {
+                    $contains: search,
+                },
+            },
+        ]
+        ,
+    };
+}

package/src/endpoints/organization/shared/GetDocumentHtml.ts

@@ -1,7 +1,7 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { signInternal } from '@stamhoofd/backend-env';
-import { Document } from '@stamhoofd/models';
+import { Document, Organization } from '@stamhoofd/models';
 
 import { Context } from '../../../helpers/Context';
 type Params = { id: string };
@@ -24,7 +24,7 @@ export class GetDocumentHtml extends Endpoint<Params, Query, Body, ResponseBody>
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope();
+        await Context.setOptionalOrganizationScope();
         await Context.authenticate();
 
         const document = await Document.getByID(request.params.id);
@@ -35,6 +35,15 @@ export class GetDocumentHtml extends Endpoint<Params, Query, Body, ResponseBody>
             });
         }
 
+        const organization = await Organization.getByID(document.organizationId);
+
+        if (!organization) {
+            throw new SimpleError({
+                code: 'not_found',
+                message: 'Organization not found',
+            });
+        }
+
         const html = await document.getRenderedHtml(organization);
         if (!html) {
             throw new SimpleError({

package/tsconfig.json

@@ -33,7 +33,8 @@
     ],
     "exclude": [
         "node_modules",
-        "dist"
+        "dist",
+        "dist/**/*"
     ],
     "ts-node": {
         "files": true