@stamhoofd/backend 2.77.4 → 2.78.0

package/.env.ci.json

@@ -0,0 +1,42 @@
+{
+    "environment": "test",
+    "domains": {
+        "dashboard": "dashboard.stamhoofd.dev",
+        "registration": {
+            "": "stamhoofd.dev",
+            "BE": "dev.stamhoofd.be",
+            "NL": "dev.stamhoofd.nl"
+        },
+        "webshop": "shop.stamhoofd.dev",
+        "api": "api.stamhoofd.dev"
+    },
+    
+    "PORT": 9091,
+    "DB_HOST": "127.0.0.1",
+    "DB_USER": "root",
+    "DB_PASS": "root",
+    "DB_DATABASE": "stamhoofd",
+
+    "SMTP_HOST": "email-smtp.eu-west-1.amazonaws.com",
+    "SMTP_USERNAME": "test",
+    "SMTP_PASSWORD": "test",
+    "SMTP_PORT": 587,
+
+    "AWS_ACCESS_KEY_ID": "",
+    "AWS_SECRET_ACCESS_KEY": "",
+    "AWS_REGION": "",
+
+    "SPACES_ENDPOINT": "ams3.digitaloceanspaces.com",
+    "SPACES_BUCKET": "stamhoofd",
+    "SPACES_KEY": "",
+    "SPACES_SECRET": "",
+
+    "INTERNAL_SECRET_KEY": "test",
+
+    "STRIPE_SECRET_KEY": "test",
+    "STRIPE_ENDPOINT_SECRET": "test",
+    "translationNamespace": "digit",
+    "platformName": "ravot",
+    "userMode": "organization",
+    "WHITELISTED_EMAIL_DESTINATIONS": []
+}

package/index.ts

@@ -30,7 +30,7 @@ process.on('unhandledRejection', (error: Error) => {
 // Set version of saved structures
 Column.setJSONVersion(Version);
 
-// Set timezone!
+// Set timezone
 process.env.TZ = 'UTC';
 
 // Quick check

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.77.4",
+    "version": "2.78.0",
     "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.77.4",
-        "@stamhoofd/backend-middleware": "2.77.4",
-        "@stamhoofd/email": "2.77.4",
-        "@stamhoofd/models": "2.77.4",
-        "@stamhoofd/queues": "2.77.4",
-        "@stamhoofd/sql": "2.77.4",
-        "@stamhoofd/structures": "2.77.4",
-        "@stamhoofd/utility": "2.77.4",
+        "@stamhoofd/backend-i18n": "2.78.0",
+        "@stamhoofd/backend-middleware": "2.78.0",
+        "@stamhoofd/email": "2.78.0",
+        "@stamhoofd/models": "2.78.0",
+        "@stamhoofd/queues": "2.78.0",
+        "@stamhoofd/sql": "2.78.0",
+        "@stamhoofd/structures": "2.78.0",
+        "@stamhoofd/utility": "2.78.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e41b2942f787a4e8eb1f77ebb7c9b68d33fb4e69"
+    "gitHead": "7dedb2d33af820a18f9a246d2ab44016ea4fcff5"
 }

package/src/endpoints/global/registration/GetUserPayableBalanceEndpoint.ts

@@ -1,6 +1,6 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { CachedBalance, Member, Organization } from '@stamhoofd/models';
-import { PayableBalanceCollection, PayableBalance } from '@stamhoofd/structures';
+import { CachedBalance, Organization } from '@stamhoofd/models';
+import { PayableBalance, PayableBalanceCollection } from '@stamhoofd/structures';
 
 import { Formatter } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
@@ -31,9 +31,7 @@ export class GetUserPayableBalanceEndpoint extends Endpoint<Params, Query, Body,
         const organization = await Context.setUserOrganizationScope();
         const { user } = await Context.authenticate();
 
-        const memberIds = await Member.getMemberIdsWithRegistrationForUser(user);
-
-        return new Response(await GetUserPayableBalanceEndpoint.getBillingStatusForObjects([user.id, ...memberIds], organization));
+        return new Response(await GetUserPayableBalanceEndpoint.getBillingStatusForObjects([user.id], organization));
     }
 
     static async getBillingStatusForObjects(objectIds: string[], organization?: Organization | null) {

package/src/helpers/MembershipCharger.ts

@@ -33,7 +33,6 @@ export const MembershipCharger = {
         while (true) {
             const memberships = await MemberPlatformMembership.select()
                 .where('id', SQLWhereSign.Greater, lastId)
-                .where('balanceItemId', null)
                 .where('deletedAt', null)
                 .where('locked', false)
                 .where(SQL.where('trialUntil', null).or('trialUntil', SQLWhereSign.LessEqual, new Date()))
@@ -57,6 +56,11 @@ export const MembershipCharger = {
             for (const membership of memberships) {
                 // charge
                 if (membership.balanceItemId) {
+                    if (!membership.locked) {
+                        // Lock this membership
+                        membership.locked = true;
+                        await membership.save();
+                    }
                     continue;
                 }