@stamhoofd/backend 2.78.2 → 2.78.4

package/.env.ci.json

@@ -1,23 +1,37 @@
 {
     "environment": "test",
     "domains": {
-        "dashboard": "dashboard.stamhoofd.dev",
-        "registration": {
-            "": "stamhoofd.dev",
-            "BE": "dev.stamhoofd.be",
-            "NL": "dev.stamhoofd.nl"
+        "dashboard": "dashboard.stamhoofd",
+        "marketing": {
+            "": "www.be.stamhoofd",
+            "BE": "www.be.stamhoofd",
+            "NL": "www.nl.stamhoofd"
         },
-        "webshop": "shop.stamhoofd.dev",
-        "api": "api.stamhoofd.dev"
+        "webshop": {
+            "": "shop.be.stamhoofd",
+            "BE": "shop.be.stamhoofd",
+            "NL": "shop.nl.stamhoofd"
+        },
+        "api": "api.stamhoofd",
+        "rendererApi": "renderer.stamhoofd",
+            
+        "defaultTransactionalEmail": {
+            "": "stamhoofd.be"
+        },
+
+        "defaultBroadcastEmail": {
+            "": "stamhoofd.email"
+        },
+        "webshopCname": "shop.stamhoofd"
     },
     
     "PORT": 9091,
     "DB_HOST": "127.0.0.1",
     "DB_USER": "root",
     "DB_PASS": "root",
-    "DB_DATABASE": "stamhoofd",
+    "DB_DATABASE": "stamhoofd-tests",
 
-    "SMTP_HOST": "email-smtp.eu-west-1.amazonaws.com",
+    "SMTP_HOST": "0.0.0.0",
     "SMTP_USERNAME": "test",
     "SMTP_PASSWORD": "test",
     "SMTP_PORT": 587,
@@ -26,17 +40,19 @@
     "AWS_SECRET_ACCESS_KEY": "",
     "AWS_REGION": "",
 
-    "SPACES_ENDPOINT": "ams3.digitaloceanspaces.com",
-    "SPACES_BUCKET": "stamhoofd",
-    "SPACES_KEY": "",
-    "SPACES_SECRET": "",
+    "SPACES_ENDPOINT": "anydomain.example",
+    "SPACES_BUCKET": "example",
+    "SPACES_KEY": "test",
+    "SPACES_SECRET": "test",
 
     "INTERNAL_SECRET_KEY": "test",
 
-    "STRIPE_SECRET_KEY": "test",
-    "STRIPE_ENDPOINT_SECRET": "test",
+    "STRIPE_SECRET_KEY": "sk_test_test",
+    "STRIPE_ENDPOINT_SECRET": "sk_test",
     "translationNamespace": "digit",
     "platformName": "ravot",
     "userMode": "organization",
-    "WHITELISTED_EMAIL_DESTINATIONS": []
+    "WHITELISTED_EMAIL_DESTINATIONS": [],
+    "MEMBER_NUMBER_ALGORITHM": "Incremental",
+    "MEMBER_NUMBER_ALGORITHM_LENGTH": 10
 }

package/index.ts

@@ -60,10 +60,13 @@ const start = async () => {
     await UniqueUserService.check();
 
     // Init platform shared struct: otherwise permissions won't work with missing responsibilities
+    console.log('Loading platform...');
     await Platform.getSharedStruct();
 
     const router = new Router();
 
+    console.log('Loading endpoints...');
+
     // Note: we should load endpoints one by once to have a reliable order of url matching
     await router.loadAllEndpoints(__dirname + '/src/endpoints/global/*');
     await router.loadAllEndpoints(__dirname + '/src/endpoints/admin/*');
@@ -76,6 +79,7 @@ const start = async () => {
 
     router.endpoints.push(new CORSPreflightEndpoint());
 
+    console.log('Creating router...');
     const routerServer = new RouterServer(router);
     routerServer.verbose = false;
 
@@ -104,6 +108,8 @@ const start = async () => {
     // Add CORS headers
     routerServer.addResponseMiddleware(CORSMiddleware);
 
+    console.log('Loading loaders...');
+
     // Register Excel loaders
     await import('./src/excel-loaders/members');
     await import('./src/excel-loaders/payments');
@@ -115,6 +121,7 @@ const start = async () => {
     await import('./src/email-recipient-loaders/orders');
     await import('./src/email-recipient-loaders/receivable-balances');
 
+    console.log('Opening port...');
     routerServer.listen(STAMHOOFD.PORT ?? 9090);
 
     const hrend = process.hrtime(bootTime);

package/jest.config.cjs

@@ -1,3 +1,5 @@
+const useGithubActions = !!process.env.GITHUB_ACTIONS;
+
 module.exports = {
     roots: ['<rootDir>/dist'],
     testEnvironment: 'node',
@@ -5,6 +7,21 @@ module.exports = {
         'jest-extended/all',
         './dist/tests/jest.setup.js',
     ],
+    reporters: [['jest-console-group-reporter', {
+        consoleLevels: ['error', 'warn', 'log'],
+        filters: [],
+        groups: [],
+        onlyFailingTestSuites: true,
+        afterEachTest: {
+            enable: false,
+        },
+        afterAllTests: {
+            reportType: 'detailed',
+            enable: true,
+            filePaths: true,
+        },
+        useGitHubActions: useGithubActions,
+    }]],
     globalSetup: './dist/tests/jest.global.setup.js',
     // verbose: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.78.2",
+    "version": "2.78.4",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -37,14 +37,14 @@
         "@simonbackx/simple-encoding": "2.20.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.78.2",
-        "@stamhoofd/backend-middleware": "2.78.2",
-        "@stamhoofd/email": "2.78.2",
-        "@stamhoofd/models": "2.78.2",
-        "@stamhoofd/queues": "2.78.2",
-        "@stamhoofd/sql": "2.78.2",
-        "@stamhoofd/structures": "2.78.2",
-        "@stamhoofd/utility": "2.78.2",
+        "@stamhoofd/backend-i18n": "2.78.4",
+        "@stamhoofd/backend-middleware": "2.78.4",
+        "@stamhoofd/email": "2.78.4",
+        "@stamhoofd/models": "2.78.4",
+        "@stamhoofd/queues": "2.78.4",
+        "@stamhoofd/sql": "2.78.4",
+        "@stamhoofd/structures": "2.78.4",
+        "@stamhoofd/utility": "2.78.4",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "454b272e0ac9a3ec6e081d70bf1154447a45444d"
+    "gitHead": "e8c207be8fd75320024f670d5c663eaa8306ba29"
 }

package/src/endpoints/auth/GetUserEndpoint.test.ts

@@ -1,6 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
 import { OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
-import { NewUser } from '@stamhoofd/structures';
 
 import { testServer } from '../../../tests/helpers/TestServer';
 import { GetUserEndpoint } from './GetUserEndpoint';
@@ -19,21 +18,12 @@ describe('Endpoint.GetUser', () => {
 
         const response = await testServer.test(endpoint, r);
         expect(response.body).toBeDefined();
-
-        if (!(response.body instanceof NewUser)) {
-            throw new Error('Expected NewUser');
-        }
-
         expect(response.body.id).toEqual(user.id);
     });
 
     test('Request user details when not signed in is not working', async () => {
         const organization = await new OrganizationFactory({}).create();
-        const user = await new UserFactory({ organization }).create();
-        const token = await Token.createToken(user);
-
         const r = Request.buildJson('GET', '/v1/user', organization.getApiHost());
-
         await expect(testServer.test(endpoint, r)).rejects.toThrow(/missing/i);
     });