@stamhoofd/models 2.36.2 → 2.38.0

package/src/factories/GroupFactory.ts

@@ -1,5 +1,5 @@
 import { Factory } from "@simonbackx/simple-database";
-import { GroupCategory, OldGroupPrice, OldGroupPrices,GroupSettings, PermissionsByRole } from "@stamhoofd/structures";
+import { GroupPrice, GroupSettings, OldGroupPrice, OldGroupPrices, PermissionsByRole, ReduceablePrice } from "@stamhoofd/structures";
 
 import { Group } from "../models/Group";
 import { Organization } from "../models/Organization";
@@ -8,13 +8,15 @@ import { OrganizationFactory } from './OrganizationFactory';
 class Options {
     organization?: Organization;
     price?: number;
-    reducedPrice?: number
+    reducedPrice?: number;
+    stock?: number;
 
     delayDate?: Date
     delayPrice?: number
     delayReducedPrice?: number
     skipCategory?: boolean
     permissions?: PermissionsByRole
+    maxMembers?: number | null
 }
 
 export class GroupFactory extends Factory<Options, Group> {
@@ -38,6 +40,16 @@ export class GroupFactory extends Factory<Options, Group> {
                     })],
                 })
             ],
+            prices: [
+                GroupPrice.create({
+                    price: ReduceablePrice.create({
+                        price: this.options.price ?? 400,
+                        reducedPrice: this.options.reducedPrice ?? null
+                    }),
+                    stock: this.options.stock ?? null
+                })
+            ],
+            maxMembers: this.options.maxMembers === undefined ? null : this.options.maxMembers
         })
 
         if (this.options.delayPrice !== undefined) {

package/src/factories/OrganizationFactory.ts

@@ -1,8 +1,10 @@
 import { Factory } from "@simonbackx/simple-database";
-import { Address,Country,OrganizationMetaData, OrganizationType, PermissionRoleDetailed } from "@stamhoofd/structures";
-import { Formatter } from "@stamhoofd/utility"; 
+import { Address, Country, OrganizationMetaData, OrganizationType, PermissionRoleDetailed } from "@stamhoofd/structures";
+import { Formatter } from "@stamhoofd/utility";
 
 import { Organization } from "../models/Organization";
+import { RegistrationPeriod } from "../models/RegistrationPeriod";
+import { RegistrationPeriodFactory } from "./RegistrationPeriodFactory";
 
 class Options {
     uri?: string;
@@ -11,6 +13,7 @@ class Options {
     name?: string;
     city?: string;
     roles?: PermissionRoleDetailed[];
+    period?: RegistrationPeriod;
 }
 
 export class OrganizationFactory extends Factory<Options, Organization> {
@@ -35,6 +38,9 @@ export class OrganizationFactory extends Factory<Options, Organization> {
             country: Country.Belgium
         })
 
+        const period = this.options.period ?? await new RegistrationPeriodFactory({}).create();
+        organization.periodId = period.id;
+
         if (this.options.roles) {
             organization.privateMeta.roles = this.options.roles;
         }

package/src/factories/RegistrationFactory.ts

@@ -1,5 +1,6 @@
 import { Factory } from "@simonbackx/simple-database";
 
+import { GroupPrice } from "@stamhoofd/structures";
 import { Group } from "../models/Group";
 import { Member } from '../models/Member';
 import { Registration } from '../models/Registration';
@@ -7,6 +8,8 @@ import { Registration } from '../models/Registration';
 class Options {
     member: Member;
     group: Group;
+    groupPrice: GroupPrice
+    price?: number
 }
 
 export class RegistrationFactory extends Factory<Options, Registration> {
@@ -18,6 +21,8 @@ export class RegistrationFactory extends Factory<Options, Registration> {
         registration.organizationId = this.options.group.organizationId
         registration.registeredAt = new Date()
         registration.registeredAt.setMilliseconds(0)
+        registration.groupPrice = this.options.groupPrice
+        registration.price = this.options.price === undefined ? registration.groupPrice.price.price : this.options.price
         
         await registration.save()
         return registration;

package/src/factories/RegistrationPeriodFactory.ts

@@ -0,0 +1,23 @@
+import { Factory } from "@simonbackx/simple-database";
+import { RegistrationPeriodSettings } from "@stamhoofd/structures";
+
+import { RegistrationPeriod } from "../models";
+
+class Options {
+    startDate?: Date;
+    endDate?: Date;
+}
+
+export class RegistrationPeriodFactory extends Factory<Options, RegistrationPeriod> {
+    async create(): Promise<RegistrationPeriod> {
+        const period = new RegistrationPeriod();
+
+        period.organizationId = null;
+        period.startDate = this.options.startDate ?? new Date(2024,0,1,0,0,0,0);
+        period.endDate = this.options.endDate ?? new Date(2024,11,31,59,59,59,999);
+        period.settings = RegistrationPeriodSettings.create({});
+
+        await period.save();
+        return period;
+    }
+}

package/src/index.ts

@@ -9,6 +9,7 @@ export * from "./factories/RegisterCodeFactory"
 export * from "./factories/RegistrationFactory"
 export * from "./factories/UserFactory"
 export * from "./factories/WebshopFactory"
+export * from "./factories/RegistrationPeriodFactory"
 
 // Helpers
 export * from "./helpers/EmailBuilder"

package/src/migrations/1726668114-maximum-free-amount.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_platform_memberships`
+ADD COLUMN `maximumFreeAmount` int NOT NULL DEFAULT '1';

package/src/migrations/1726668115-free-amount.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_platform_memberships`
+ADD COLUMN `freeAmount` int NOT NULL DEFAULT '0';

package/src/migrations/1726668116-price-without-discount.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_platform_memberships`
+ADD COLUMN `priceWithoutDiscount` int NOT NULL DEFAULT '0';

package/src/models/BalanceItem.ts

@@ -237,7 +237,7 @@ export class BalanceItem extends Model {
 
         // Set other items to zero (the balance item payments keep the real price)
         for (const item of items) {
-            needsUpdate = needsUpdate || (item.price > 0 && item.status !== BalanceItemStatus.Hidden)
+            needsUpdate = true
 
             // Don't change status of items that are already paid or are partially paid
             // Not using item.paidPrice, since this is cached
@@ -264,7 +264,7 @@ export class BalanceItem extends Model {
         for (const item of items) {
             if (item.status === BalanceItemStatus.Hidden) {
                 item.status = BalanceItemStatus.Pending
-                needsUpdate = needsUpdate || item.price > 0
+                needsUpdate = true
                 await item.save()
             }
         }

package/src/models/CachedOutstandingBalance.ts

@@ -154,6 +154,13 @@ export class CachedOutstandingBalance extends Model {
 
             results.push([objectId, {amount, amountPending}]);
         }
+
+        // Add missing object ids (with 0 amount, otherwise we don't reset the amounts back to zero when all the balance items are hidden)
+        for (const objectId of objectIds) {
+            if (!results.find(([id]) => id === objectId)) {
+                results.push([objectId, {amount: 0, amountPending: 0}]);
+            }
+        }
             
         return results;
     }

package/src/models/Email.ts

@@ -4,6 +4,7 @@ import { v4 as uuidv4 } from "uuid";
 
 import { AnyDecoder, ArrayDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
+import { I18n } from '@stamhoofd/backend-i18n';
 import { Email as EmailClass } from "@stamhoofd/email";
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL, SQLWhereSign } from '@stamhoofd/sql';
@@ -11,7 +12,6 @@ import { Formatter } from '@stamhoofd/utility';
 import { getEmailBuilder } from '../helpers/EmailBuilder';
 import { EmailRecipient } from './EmailRecipient';
 import { Organization } from './Organization';
-import { I18n } from '@stamhoofd/backend-i18n';
 
 export class Email extends Model {
     static table = "emails";
@@ -132,6 +132,46 @@ export class Email extends Model {
                 human: 'Vul een afzender in voor je een e-mail verstuurt'
             })
         }
+
+        this.validateAttachments()
+    }
+    
+    validateAttachments() {
+        // Validate attachments
+        const size = this.attachments.reduce((value: number, attachment) => {
+            return value + attachment.bytes
+        }, 0)
+        
+        if (size > 9.5*1024*1024) {
+            throw new SimpleError({
+                code: "too_big_attachments",
+                message: "Too big attachments",
+                human: "Jouw bericht is te groot. Grote bijlages verstuur je beter niet via e-mail, je plaatst dan best een link naar de locatie in bv. Google Drive. De maximale grootte van een e-mail is 10MB, inclusief het bericht. Als je grote bestanden verstuurt kan je ze ook proberen te verkleinen.",
+                field: "attachments"
+            })
+        }
+
+        const safeContentTypes = [
+            "application/msword",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            "application/vnd.ms-excel",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            "application/pdf",
+            "image/jpeg",
+            "image/png",
+            "image/gif"
+        ]
+
+        for (const attachment of this.attachments) {
+            if (attachment.contentType && !safeContentTypes.includes(attachment.contentType)) {
+                throw new SimpleError({
+                    code: "content_type_not_supported",
+                    message: "Content-Type not supported",
+                    human: "Het bestandstype van jouw bijlage wordt niet ondersteund of is onveilig om in een e-mail te plaatsen. Overweeg om je bestand op bv. Google Drive te zetten en de link in jouw e-mail te zetten.",
+                    field: "attachments"
+                })
+            }
+        }
     }
 
     getFromAddress() {
@@ -172,7 +212,7 @@ export class Email extends Model {
         await this.save();
 
         const id = this.id;
-        return await QueueHandler.schedule('send-email', async function () {
+        return await QueueHandler.schedule('send-email', async function (this: unknown) {
             let upToDate = await Email.getByID(id);
             if (!upToDate) {
                 throw new SimpleError({
@@ -253,6 +293,27 @@ export class Email extends Model {
             const batchSize = 100;
             const recipientsSet = new Set<string>();
 
+            const attachments = upToDate.attachments.map((attachment, index) => {
+                let filename = "bijlage-"+index;
+                
+                if (attachment.contentType == "application/pdf") {
+                    // tmp solution for pdf only
+                    filename += ".pdf"
+                }
+    
+                // Correct file name if needed
+                if (attachment.filename) {
+                    filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, "-").replace(/^-+/, "").replace(/-+$/, "")
+                }
+    
+                return {
+                    filename: filename,
+                    content: attachment.content,
+                    contentType: attachment.contentType ?? undefined,
+                    encoding: "base64"
+                }
+            })
+
             // eslint-disable-next-line no-constant-condition
             while (true) {
                 const data = await SQL.select()
@@ -315,6 +376,7 @@ export class Email extends Model {
                         subject: upToDate.subject!, 
                         html: upToDate.html!,
                         type: "broadcast",
+                        attachments,
                         callback(error: Error|null ) {
                             callback(error).catch(console.error)
                         },

package/src/models/Member.ts

@@ -498,18 +498,9 @@ export class Member extends Model {
 
             if (activeMembershipsUndeletable.length) {
                 // Skip automatic additions
-                for (const m of activeMembershipsUndeletable) {
-                    const beforePrice = m.price
-                
+                for (const m of activeMembershipsUndeletable) {                
                     await m.calculatePrice(me)
-
-                    if (beforePrice !== m.price) {
-                        await m.save()
-
-                        console.log('Updated price for membership: ' + me.id + ' - membership ' + m.id)
-                    } else if (!silent) {
-                        console.log('Skipping automatic membership for: ' + me.id, ' - already has active memberships - no price change')
-                    }
+                    await m.save()
                 }
                 return
             }
@@ -541,18 +532,9 @@ export class Member extends Model {
             // Check if already have the same membership
             for (const m of activeMemberships) {
                 if (m.membershipTypeId === cheapestMembership.membership.id) {
-                    // Update the price of this active membership (could have changed)
-                    const beforePrice = m.price
-            
+                    // Update the price of this active membership (could have changed)            
                     await m.calculatePrice(me)
-
-                    if (beforePrice !== m.price) {
-                        await m.save()
-
-                        console.log('Updated price for membership: ' + me.id + ' - membership ' + m.id)
-                    } else if (!silent) {
-                        console.log('Skipping automatic membership for: ' + me.id, ' - already has this membership - no price change')
-                    }
+                    await m.save()
                     return
                 }
             }

package/src/models/MemberPlatformMembership.ts

@@ -1,7 +1,7 @@
 
 import { column, Model, SQLResultNamespacedRow } from "@simonbackx/simple-database";
 import { SimpleError } from "@simonbackx/simple-errors";
-import { SQL, SQLSelect } from "@stamhoofd/sql";
+import { SQL, SQLSelect, SQLWhereSign } from "@stamhoofd/sql";
 import { PlatformMembershipTypeBehaviour } from "@stamhoofd/structures";
 import { Formatter } from "@stamhoofd/utility";
 import { v4 as uuidv4 } from "uuid";
@@ -48,6 +48,19 @@ export class MemberPlatformMembership extends Model {
     @column({ type: "integer" })
     price = 0;
 
+    @column({ type: "integer" })
+    priceWithoutDiscount = 0;
+
+    /**
+     * Contains the amount of days, or either 1/0 to count the amount of 'free' days maximum could be awarded.
+     * Set to 0 when already a different 'free' membership was created, so it shouldn't count for a free day
+     */
+    @column({ type: "integer" })
+    maximumFreeAmount = 0;
+
+    @column({ type: "integer" })
+    freeAmount = 0;
+
     /**
      * Whether this was added automatically by the system
      */
@@ -93,7 +106,7 @@ export class MemberPlatformMembership extends Model {
     }
 
     async calculatePrice(member: Member) {
-        const platform = await Platform.getShared();
+        const platform = await Platform.getSharedPrivateStruct();
         const membershipType = platform.config.membershipTypes.find(m => m.id == this.membershipTypeId);
 
         if (!membershipType) {
@@ -115,7 +128,7 @@ export class MemberPlatformMembership extends Model {
         }
 
         const organization = await Organization.getByID(this.organizationId);
-        if(!organization) {
+        if (!organization) {
             throw new SimpleError({
                 //todo
                 code: 'not_found',
@@ -126,9 +139,40 @@ export class MemberPlatformMembership extends Model {
 
         const tagIds = organization.meta.tags;
         const shouldApplyReducedPrice = member.details.shouldApplyReducedPrice;
-
-        const priceConfig = periodConfig.getPriceConfigForDate(membershipType.behaviour === PlatformMembershipTypeBehaviour.Days ? this.startDate : (this.createdAt ?? new Date()));
         
+        const priceConfig = periodConfig.getPriceConfigForDate(membershipType.behaviour === PlatformMembershipTypeBehaviour.Days ? this.startDate : (this.createdAt ?? new Date()));
+        const earliestPriceConfig = periodConfig.getPriceConfigForDate(membershipType.behaviour === PlatformMembershipTypeBehaviour.Days ? new Date(1950, 0, 1) : (new Date(1950, 0, 1)));
+
+        let freeDays = 0;
+
+        const d = this.createdAt ??new Date();
+
+        if (periodConfig.amountFree) {
+            // Check if this organization has rights to free memberships
+            const alreadyUsed = await MemberPlatformMembership.select()
+                .where('organizationId', this.organizationId)
+                .where('membershipTypeId', this.membershipTypeId)
+                .where('periodId', this.periodId)
+                .where('deletedAt', null)
+                .whereNot('id', this.id)
+                .where(
+                    SQL.where('createdAt', SQLWhereSign.Less, d)
+                    .or(
+                        SQL.where('createdAt', SQLWhereSign.Equal, d)
+                            .and('id', SQLWhereSign.Less, this.id)
+                    )
+                )
+                .sum(SQL.column('maximumFreeAmount'));
+
+            if (alreadyUsed < periodConfig.amountFree) {
+                freeDays = periodConfig.amountFree - alreadyUsed;
+                console.log('Free membership created for ', this.id, periodConfig.amountFree, alreadyUsed);
+            } else {
+                console.log('No free membership created for', this.id, periodConfig.amountFree, alreadyUsed);
+            }
+        }
+
+
         if (membershipType.behaviour === PlatformMembershipTypeBehaviour.Days) {
             // Make sure time is equal between start and end date
             let startBrussels = Formatter.luxon(this.startDate);
@@ -141,20 +185,48 @@ export class MemberPlatformMembership extends Model {
             this.expireDate = null
 
             const days = Math.round((this.endDate.getTime() - this.startDate.getTime()) / (1000 * 60 * 60 * 24));
-            this.price = priceConfig.calculatePrice(tagIds, shouldApplyReducedPrice, days);
+            this.maximumFreeAmount = days;
+            this.priceWithoutDiscount = earliestPriceConfig.calculatePrice(tagIds, false, days);
+            this.price = priceConfig.calculatePrice(tagIds, shouldApplyReducedPrice, Math.max(0, days - freeDays));
+            this.freeAmount = Math.min(days, freeDays);
         } else {
+            this.priceWithoutDiscount = earliestPriceConfig.getBasePrice(tagIds, false);
             this.price = priceConfig.getBasePrice(tagIds, shouldApplyReducedPrice);
             this.startDate = periodConfig.startDate;
             this.endDate = periodConfig.endDate;
             this.expireDate = periodConfig.expireDate;
+            this.maximumFreeAmount = this.price > 0 ? 1 : 0;
+            this.freeAmount = 0;
+
+            if (freeDays > 0) {
+                this.price = 0;
+                this.freeAmount = 1;
+            }
         }
 
         if (this.balanceItemId) {
+            this.maximumFreeAmount = this.freeAmount;
+
             // Also update the balance item
             const balanceItem = await BalanceItem.getByID(this.balanceItemId);
             if (balanceItem) {
                 balanceItem.unitPrice = this.price;
                 await balanceItem.save();
+
+                await BalanceItem.updateOutstanding([balanceItem]);
+            }
+        }
+    }
+
+    async doDelete() {
+        this.deletedAt = new Date()
+        await this.save()
+
+        if (this.balanceItemId) {
+            // Also update the balance item
+            const balanceItem = await BalanceItem.getByID(this.balanceItemId);
+            if (balanceItem) {
+                await BalanceItem.deleteItems([balanceItem])
             }
         }
     }

package/src/models/Organization.ts

@@ -196,7 +196,7 @@ export class Organization extends Model {
      * Get an Organization by looking at the host of a request
      * Format is 2331c59a-0cbe-4279-871c-ea9d0474cd54.api.stamhoofd.app
      */
-    static async fromApiHost(host: string): Promise<Organization> {
+    static async fromApiHost(host: string, options?: {allowInactive?: boolean}): Promise<Organization> {
         const splitted = host.split('.')
         if (splitted.length < 2) {
             throw new SimpleError({
@@ -213,7 +213,7 @@ export class Organization extends Model {
             });
         }
 
-        if (!organization.active) {
+        if (!organization.active && !options?.allowInactive) {
             throw new SimpleError({
                 code: "archived",
                 message: "This organization is archived",

package/src/models/Platform.ts

@@ -77,7 +77,12 @@ export class Platform extends Model {
     }
 
     async save() {
-        Platform.sharedStruct = null
-        return await super.save()
+        Platform.clearCache()
+        const s = await super.save()
+
+        // Force update cache immediately
+        await Platform.getSharedStruct();
+
+        return s;
     }
 }