@stamhoofd/backend 2.108.0 → 2.109.0

package/src/sql-sorters/orders.ts

@@ -71,7 +71,7 @@ export const orderSorters: SQLSortDefinitions<Order> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('data'), '$.value.paymentMethod'),
+                column: SQL.jsonExtract(SQL.column('data'), '$.value.paymentMethod'),
                 direction,
             });
         },
@@ -82,7 +82,7 @@ export const orderSorters: SQLSortDefinitions<Order> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('data'), '$.value.checkoutMethod.type'),
+                column: SQL.jsonExtract(SQL.column('data'), '$.value.checkoutMethod.type'),
                 direction,
             });
         },
@@ -93,7 +93,7 @@ export const orderSorters: SQLSortDefinitions<Order> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('data'), '$.value.timeSlot.date'),
+                column: SQL.jsonExtract(SQL.column('data'), '$.value.timeSlot.date'),
                 direction,
             });
         },
@@ -104,7 +104,7 @@ export const orderSorters: SQLSortDefinitions<Order> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('data'), '$.value.timeSlot.endTime'),
+                column: SQL.jsonExtract(SQL.column('data'), '$.value.timeSlot.endTime'),
                 direction,
             });
         },
@@ -126,7 +126,7 @@ export const orderSorters: SQLSortDefinitions<Order> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('data'), '$.value.totalPrice'),
+                column: SQL.jsonExtract(SQL.column('data'), '$.value.totalPrice'),
                 direction,
             });
         },

package/src/sql-sorters/organizations.ts

@@ -60,7 +60,7 @@ export const organizationSorters: SQLSortDefinitions<Organization> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('meta'), '$.value.type'),
+                column: SQL.jsonExtract(SQL.column('meta'), '$.value.type'),
                 direction,
             });
         },
@@ -71,7 +71,7 @@ export const organizationSorters: SQLSortDefinitions<Organization> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('address'), '$.value.city'),
+                column: SQL.jsonExtract(SQL.column('address'), '$.value.city'),
                 direction,
             });
         },
@@ -82,7 +82,7 @@ export const organizationSorters: SQLSortDefinitions<Organization> = {
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
-                column: SQL.jsonValue(SQL.column('address'), '$.value.country'),
+                column: SQL.jsonExtract(SQL.column('address'), '$.value.country'),
                 direction,
             });
         },

package/src/sql-sorters/registrations.ts

@@ -1,10 +1,31 @@
-import { Member } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
-import { RegistrationWithMemberBlob } from '@stamhoofd/structures';
+import { Group, Member, Organization } from '@stamhoofd/models';
+import { SQL, SQLIfNull, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { MemberWithRegistrationsBlob, Organization as OrganizationStruct, RegistrationWithMemberBlob } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import { memberJoin } from '../sql-filters/registrations';
+import { memberCachedBalanceForOrganizationJoin, registrationCachedBalanceJoin } from '../helpers/outstandingBalanceJoin.js';
+import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';
+import { groupJoin, memberJoin, organizationJoin } from '../sql-filters/registrations.js';
 
-export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob> = {
+export class RegistrationSortData {
+    readonly registration: RegistrationWithMemberBlob;
+    private organizations: OrganizationStruct[];
+
+    constructor({ registration, organizations }: { registration: RegistrationWithMemberBlob; organizations: OrganizationStruct[] }) {
+        this.registration = registration;
+        this.organizations = organizations;
+    }
+
+    get organization() {
+        const organization = this.organizations.find(o => o.id === this.registration.organizationId);
+        if (!organization) {
+            throw new Error('Organization not found for registration');
+        }
+
+        return organization;
+    }
+}
+
+export const registrationSorters: SQLSortDefinitions<RegistrationSortData> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!
     // Try to avoid creating sorters on fields that er not 1:1 with the database, that often causes pagination issues if not thought through
     // An example: sorting on 'name' is not a good idea, because it is a concatenation of two fields.
@@ -14,8 +35,8 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
     // What if you need mapping? simply map the sorters in the frontend: name -> firstname, lastname, age -> birthDay, etc.
 
     'id': {
-        getValue(a) {
-            return a.id;
+        getValue({ registration }) {
+            return registration.id;
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -25,8 +46,8 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
         },
     },
     'registeredAt': {
-        getValue(a) {
-            return a.registeredAt;
+        getValue({ registration }) {
+            return registration.registeredAt;
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -35,9 +56,95 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
             });
         },
     },
+    'groupPrice': {
+        getValue: ({ registration }) => registration.groupPrice.name.toString(),
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: new SQLTranslatedString(SQL.column('groupPrice'), '$.value.name'),
+                direction,
+            });
+        },
+    },
+    'trialUntil': {
+        getValue({ registration }) {
+            return registration.trialUntil;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('trialUntil'),
+                direction,
+            });
+        },
+    },
+    'startDate': {
+        getValue({ registration }) {
+            return registration.startDate;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('startDate'),
+                direction,
+            });
+        },
+    },
+    'endDate': {
+        getValue({ registration }) {
+            return registration.endDate;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('endDate'),
+                direction,
+            });
+        },
+    },
+    'memberCachedBalance.amountOpen': {
+        getValue({ registration }) {
+            return registration.member.balances.reduce((sum, r) => sum + (r.amountOpen), 0);
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: new SQLIfNull(SQL.column('memberCachedBalance', 'amountOpen'), 0),
+                direction,
+            });
+        },
+        join: memberCachedBalanceForOrganizationJoin,
+        select: [SQL.column('memberCachedBalance', 'amountOpen')],
+    },
+    'registrationCachedBalance.toPay': {
+        getValue({ registration }) {
+            return registration.balances.reduce((sum, r) => sum + (r.amountOpen + r.amountPending), 0);
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: new SQLIfNull(SQL.column('registrationCachedBalance', 'toPay'), 0),
+                direction,
+            });
+        },
+        join: registrationCachedBalanceJoin,
+        select: [SQL.column('registrationCachedBalance', 'toPay')],
+    },
+    'registrationCachedBalance.price': {
+        getValue({ registration }) {
+            return registration.balances.reduce((sum, r) => sum + (r.amountOpen + r.amountPaid + r.amountPending), 0);
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: new SQLIfNull(SQL.column('registrationCachedBalance', 'price'), 0),
+                direction,
+            });
+        },
+        join: registrationCachedBalanceJoin,
+        select: [SQL.column('registrationCachedBalance', 'price')],
+    },
+    'member.memberNumber': createMemberColumnSorter({
+        columnName: 'memberNumber',
+        getValue: member => member.details.memberNumber ?? '',
+
+    }),
     'member.firstName': {
-        getValue(a) {
-            return a.member.firstName;
+        getValue({ registration }) {
+            return registration.member.firstName;
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -49,8 +156,8 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
         select: [SQL.column(Member.table, 'firstName')],
     },
     'member.lastName': {
-        getValue(a) {
-            return a.member.lastName;
+        getValue({ registration }) {
+            return registration.member.lastName;
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -62,8 +169,8 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
         select: [SQL.column(Member.table, 'lastName')],
     },
     'member.birthDay': {
-        getValue(a) {
-            return a.member.details.birthDay === null ? null : Formatter.dateIso(a.member.details.birthDay);
+        getValue({ registration }) {
+            return registration.member.details.birthDay === null ? null : Formatter.dateIso(registration.member.details.birthDay);
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -74,4 +181,68 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
         join: memberJoin,
         select: [SQL.column(Member.table, 'birthDay')],
     },
+    'member.createdAt': {
+        getValue({ registration }) {
+            return registration.member.createdAt;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column(Member.table, 'createdAt'),
+                direction,
+            });
+        },
+        join: memberJoin,
+        select: [SQL.column(Member.table, 'createdAt')],
+    },
+    'organization.name': {
+        getValue: ({ organization }) => organization.name,
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column(Organization.table, 'name'),
+                direction,
+            });
+        },
+        join: organizationJoin,
+        select: [SQL.column(Organization.table, 'name')],
+    },
+    'organization.uri': {
+        getValue: ({ organization }) => organization.uri,
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column(Organization.table, 'uri'),
+                direction,
+            });
+        },
+        join: organizationJoin,
+        select: [SQL.column(Organization.table, 'uri')],
+    },
+    'group.name': {
+        getValue: ({ registration }) => registration.group.settings.name.toString(),
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: new SQLTranslatedString(SQL.column(Group.table, 'settings'), '$.value.name'),
+                direction,
+            });
+        },
+        join: groupJoin,
+    },
 };
+
+/**
+ * Helper function for simple sort on member column
+ * @param param0
+ * @returns
+ */
+function createMemberColumnSorter<T>({ columnName, getValue }: { columnName: string; getValue: (member: MemberWithRegistrationsBlob) => T }) {
+    return {
+        getValue: ({ registration }: RegistrationSortData) => getValue(registration.member),
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column(Member.table, columnName),
+                direction,
+            });
+        },
+        join: memberJoin,
+        select: [SQL.column(Member.table, columnName)],
+    };
+}