@stamhoofd/backend 2.119.0 → 2.120.1

package/src/sql-filters/email-recipients.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLConcat, SQLFilterDefinitions, SQLScalar, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLConcat, SQLScalar, SQLValueType } from '@stamhoofd/sql';
 
 export const emailRecipientsFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/emails.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 import { emailRecipientsFilterCompilers } from './email-recipients.js';
 
 export const userEmailFilterCompilers: SQLFilterDefinitions = {

package/src/sql-filters/event-notifications.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, createExistsFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, createExistsFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 import { eventFilterCompilers } from './events.js';
 import { organizationFilterCompilers } from './organizations.js';
 

package/src/sql-filters/events.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const eventFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/groups.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createWildcardColumnFilter, SQL, SQLFilterDefinitions, SQLJsonExtract, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createWildcardColumnFilter, SQL, SQLJsonExtract, SQLValueType } from '@stamhoofd/sql';
 import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';
 
 export const groupFilterCompilers: SQLFilterDefinitions = {

package/src/sql-filters/invoiced-balance-items.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const invoicedBalanceItemCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/invoices.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLCast, SQLConcat, SQLFilterDefinitions, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLCast, SQLConcat, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
 import { invoicedBalanceItemCompilers } from './invoiced-balance-items.js';
 
 /**

package/src/sql-filters/member-responsibility-records.ts

@@ -1,5 +1,6 @@
 import { MemberResponsibilityRecord } from '@stamhoofd/models';
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 const baseTable = SQL.table(MemberResponsibilityRecord.table);
 

package/src/sql-filters/members.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email, Member, MemberUser } from '@stamhoofd/models';
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createWildcardColumnFilter, SQL, SQLAge, SQLCast, SQLConcat, SQLFilterDefinitions, SQLJsonExtract, SQLScalar, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createWildcardColumnFilter, SQL, SQLAge, SQLCast, SQLConcat, SQLJsonExtract, SQLScalar, SQLValueType } from '@stamhoofd/sql';
 import { AccessRight } from '@stamhoofd/structures';
 import { Context } from '../helpers/Context.js';
 import { baseRegistrationFilterCompilers } from './base-registration-filter-compilers.js';

package/src/sql-filters/orders.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createWildcardColumnFilter, SQL, SQLCast, SQLConcat, SQLFilterDefinitions, SQLJsonExtract, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createWildcardColumnFilter, SQL, SQLCast, SQLConcat, SQLJsonExtract, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
 
 export const orderFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/organization-registration-periods.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const organizationRegistrationPeriodFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/organizations.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLConcat, SQLFilterDefinitions, SQLNow, SQLNull, SQLScalar, SQLValueType, SQLWhereEqual, SQLWhereOr, SQLWhereSign } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLConcat, SQLNow, SQLNull, SQLScalar, SQLValueType, SQLWhereEqual, SQLWhereOr, SQLWhereSign } from '@stamhoofd/sql';
 import { SetupStepType } from '@stamhoofd/structures';
 
 export const organizationFilterCompilers: SQLFilterDefinitions = {

package/src/sql-filters/payments.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLCast, SQLConcat, SQLFilterDefinitions, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLCast, SQLConcat, SQLJsonUnquote, SQLScalar, SQLValueType } from '@stamhoofd/sql';
 import { balanceItemPaymentsCompilers } from './balance-item-payments.js';
 
 /**

package/src/sql-filters/platform-memberships.ts

@@ -0,0 +1,72 @@
+import { MemberPlatformMembership } from '@stamhoofd/models';
+import type { SQLFilterDefinitions } from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLValueType } from '@stamhoofd/sql';
+import { memberFilterCompilers } from './members.js';
+import { organizationFilterCompilers } from './organizations.js';
+
+export const platformMembershipFilterCompilers: SQLFilterDefinitions = {
+    ...baseSQLFilterCompilers,
+    id: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'id'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    membershipTypeId: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'membershipTypeId'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    periodId: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'periodId'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    startDate: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'startDate'),
+        type: SQLValueType.Datetime,
+        nullable: false,
+    }),
+    endDate: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'endDate'),
+        type: SQLValueType.Datetime,
+        nullable: false,
+    }),
+    trialUntil: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'trialUntil'),
+        type: SQLValueType.Datetime,
+        nullable: true,
+    }),
+    createdAt: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'createdAt'),
+        type: SQLValueType.Datetime,
+        nullable: true,
+    }),
+    freeAmount: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'freeAmount'),
+        type: SQLValueType.Number,
+        nullable: false,
+    }),
+    price: createColumnFilter({
+        expression: SQL.column(MemberPlatformMembership.table, 'price'),
+        type: SQLValueType.Number,
+        nullable: false,
+    }),
+    organization: createExistsFilter(
+        SQL.select()
+            .from(SQL.table('organizations'))
+            .where(
+                SQL.column('organizations', 'id'),
+                SQL.column(MemberPlatformMembership.table, 'organizationId'),
+            ),
+        organizationFilterCompilers
+    ),
+    member: createExistsFilter(
+        SQL.select()
+            .from(SQL.table('members'))
+            .where(
+                SQL.column('members', 'id'),
+                SQL.column(MemberPlatformMembership.table, 'memberId'),
+            ),
+        memberFilterCompilers
+    )
+};

package/src/sql-filters/receivable-balances.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLConcat, SQLFilterDefinitions, SQLValueType, SQLScalar } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLConcat, SQLValueType, SQLScalar } from '@stamhoofd/sql';
 import { memberFilterCompilers } from './members.js';
 import { organizationFilterCompilers } from './organizations.js';
 import { EmailRelationFilterCompilers } from './shared/EmailRelationFilterCompilers.js';

package/src/sql-filters/registration-periods.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const registrationPeriodFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/registrations.ts

@@ -1,5 +1,6 @@
 import { Group, Member, Organization, Registration } from '@stamhoofd/models';
-import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';
 import { baseRegistrationFilterCompilers } from './base-registration-filter-compilers.js';
 import { memberFilterCompilers } from './members.js';

package/src/sql-filters/tickets.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const ticketFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/users.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const userFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/webshops.ts

@@ -0,0 +1,38 @@
+import type { SQLFilterDefinitions } from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createJoinedRelationFilter, SQL, SQLValueType } from '@stamhoofd/sql';
+import { organizationFilterCompilers } from './organizations.js';
+
+export const organizationJoin = SQL.join('organizations').where(SQL.column('organizations', 'id'), SQL.column('webshops', 'organizationId'));
+
+export const webshopFilterCompilers: SQLFilterDefinitions = {
+    ...baseSQLFilterCompilers,
+    id: createColumnFilter({
+        expression: SQL.column('webshops', 'id'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    organizationId: createColumnFilter({
+        expression: SQL.column('webshops', 'organizationId'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    name: createColumnFilter({
+        expression: SQL.jsonExtract(SQL.column('webshops', 'meta'), '$.value.name'),
+        type: SQLValueType.JSONString,
+        nullable: false,
+    }),
+    status: createColumnFilter({
+        expression: SQL.jsonExtract(SQL.column('webshops', 'meta'), '$.value.status'),
+        type: SQLValueType.JSONString,
+        nullable: false,
+    }),
+    organization: createJoinedRelationFilter(
+        organizationJoin,
+        organizationFilterCompilers,
+    ),
+    createdAt: createColumnFilter({
+        expression: SQL.column('createdAt'),
+        type: SQLValueType.Datetime,
+        nullable: false,
+    }),
+};

package/src/sql-sorters/audit-logs.ts

@@ -1,5 +1,6 @@
-import { AuditLog } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { AuditLog } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 
 export const auditLogSorters: SQLSortDefinitions<AuditLog> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!

package/src/sql-sorters/balance-items.ts

@@ -1,5 +1,6 @@
-import { BalanceItem } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { BalanceItem } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const balanceItemSorters: SQLSortDefinitions<BalanceItem> = {

package/src/sql-sorters/document-templates.ts

@@ -1,5 +1,6 @@
-import { DocumentTemplate } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { DocumentTemplate } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const documentTemplateSorters: SQLSortDefinitions<DocumentTemplate> = {

package/src/sql-sorters/documents.ts

@@ -1,5 +1,6 @@
-import { Document } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Document } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const documentSorters: SQLSortDefinitions<Document> = {

package/src/sql-sorters/email-recipients.ts

@@ -1,5 +1,6 @@
-import { EmailRecipient } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { EmailRecipient } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const emailRecipientSorters: SQLSortDefinitions<EmailRecipient> = {

package/src/sql-sorters/emails.ts

@@ -1,5 +1,6 @@
-import { Email } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Email } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const emailSorters: SQLSortDefinitions<Email> = {

package/src/sql-sorters/event-notifications.ts

@@ -1,5 +1,6 @@
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 import { organizationJoin } from '../sql-filters/event-notifications.js';
 

package/src/sql-sorters/events.ts

@@ -1,5 +1,6 @@
-import { Event } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Event } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const eventSorters: SQLSortDefinitions<Event> = {

package/src/sql-sorters/groups.ts

@@ -1,5 +1,6 @@
-import { Group } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Group } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 
 export const groupSorters: SQLSortDefinitions<Group> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!

package/src/sql-sorters/invoices.ts

@@ -1,5 +1,6 @@
-import { Invoice } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Invoice } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const invoiceSorters: SQLSortDefinitions<Invoice> = {

package/src/sql-sorters/members.ts

@@ -1,5 +1,6 @@
-import { MemberWithUsersRegistrationsAndGroups } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { MemberWithUsersRegistrationsAndGroups } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const memberSorters: SQLSortDefinitions<MemberWithUsersRegistrationsAndGroups> = {

package/src/sql-sorters/orders.ts

@@ -1,5 +1,6 @@
-import { Order } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Order } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const orderSorters: SQLSortDefinitions<Order> = {

package/src/sql-sorters/organization-registration-periods.ts

@@ -1,5 +1,6 @@
-import { OrganizationRegistrationPeriod } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { OrganizationRegistrationPeriod } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 
 export const organizationRegistrationPeriodSorters: SQLSortDefinitions<OrganizationRegistrationPeriod> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!

package/src/sql-sorters/organizations.ts

@@ -1,5 +1,6 @@
-import { Organization } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Organization } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 
 export const organizationSorters: SQLSortDefinitions<Organization> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!

package/src/sql-sorters/payments.ts

@@ -1,5 +1,6 @@
-import { Payment } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Payment } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const paymentSorters: SQLSortDefinitions<Payment> = {

package/src/sql-sorters/platform-memberships.ts

@@ -0,0 +1,40 @@
+import type { PlainObject } from '@simonbackx/simple-encoding';
+import type { SQLOrderByDirection, SQLSortDefinition, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
+import type { PlatformMembership } from '@stamhoofd/structures';
+
+type KeysOfType<T, V> = {
+  [K in keyof T]: T[K] extends V ? K : never
+}[keyof T];
+
+const columnsToFilterOn: (KeysOfType<PlatformMembership, PlainObject | Date>)[] = ['id','startDate','endDate','membershipTypeId', 'price', 'createdAt', 'trialUntil', 'freeAmount'];
+
+export const platformMembershipSorters: SQLSortDefinitions<PlatformMembership> = {
+    // 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.
+    // You might be tempted to use ORDER BY firstName, lastName, but that will not work as expected and it needs to be ORDER BY CONCAT(firstName, ' ', lastName)
+    // Why? Because ORDER BY firstName, lastName produces a different order dan ORDER BY CONCAT(firstName, ' ', lastName) if there are multiple people with spaces in the first name
+    // And that again causes issues with pagination because the next query will append a filter of name > 'John Doe' - causing duplicate and/or skipped results
+    // What if you need mapping? simply map the sorters in the frontend: name -> firstname, lastname, age -> birthDay, etc.
+    ...Object.fromEntries(columnsToFilterOn.map((column: KeysOfType<PlatformMembership, PlainObject | Date>) => [column, createColumnSortDefinition(column)]))
+};
+
+/**
+ * Create a basic sort definition from a column
+ * @param column 
+ * @returns 
+ */
+function createColumnSortDefinition<K extends KeysOfType<PlatformMembership, PlainObject | Date>>(column: K): SQLSortDefinition<PlatformMembership, PlatformMembership[K]>{
+    return {
+            getValue(a: PlatformMembership) {
+                return a[column];
+            },
+            toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+                return new SQLOrderBy({
+                    column: SQL.column(column),
+                    direction,
+                });
+            },
+    }
+}

package/src/sql-sorters/receivable-balances.ts

@@ -1,5 +1,6 @@
-import { CachedBalance } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { CachedBalance } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 
 export const receivableBalanceSorters: SQLSortDefinitions<CachedBalance> = {
     // WARNING! TEST NEW SORTERS THOROUGHLY!

package/src/sql-sorters/registration-periods.ts

@@ -1,5 +1,6 @@
-import { RegistrationPeriod } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { RegistrationPeriod } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const registrationPeriodSorters: SQLSortDefinitions<RegistrationPeriod> = {

package/src/sql-sorters/registrations.ts

@@ -1,6 +1,7 @@
 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 type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLIfNull, SQLOrderBy } from '@stamhoofd/sql';
+import type { MemberWithRegistrationsBlob, Organization as OrganizationStruct, RegistrationWithMemberBlob } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { memberCachedBalanceForOrganizationJoin, registrationCachedBalanceJoin } from '../helpers/outstandingBalanceJoin.js';
 import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';

package/src/sql-sorters/tickets.ts

@@ -1,5 +1,6 @@
-import { Ticket } from '@stamhoofd/models';
-import { SQL, SQLOrderBy, SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import type { Ticket } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 
 export const ticketSorters: SQLSortDefinitions<Ticket> = {

package/src/sql-sorters/webshops.ts

@@ -0,0 +1,40 @@
+import type { Webshop } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
+import { Formatter } from '@stamhoofd/utility';
+
+export const webshopSorters: SQLSortDefinitions<Webshop> = {
+    id: {
+        getValue(a) {
+            return a.id;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('id'),
+                direction,
+            });
+        },
+    },
+    name: {
+        getValue(a) {
+            return a.meta.name;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.jsonValue(SQL.column('meta'), '$.value.name', 'CHAR'),
+                direction,
+            });
+        },
+    },
+    createdAt: {
+        getValue(a) {
+            return Formatter.dateTimeIso(a.createdAt, 'UTC');
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('createdAt'),
+                direction,
+            });
+        },
+    },
+};

package/tests/actions/patchOrganizationMember.ts

@@ -1,13 +1,14 @@
-import { AutoEncoderPatchType, PatchableArray } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType} from '@simonbackx/simple-encoding';
+import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import { Organization } from '@stamhoofd/models';
-import { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import type { Organization } from '@stamhoofd/models';
+import type { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
 import { PatchOrganizationMembersEndpoint } from '../../src/endpoints/global/members/PatchOrganizationMembersEndpoint.js';
 import { testServer } from '../helpers/TestServer.js';
 import { initAdmin } from '../init/initAdmin.js';
 
 export async function patchOrganizationMember({ patch, organization }: { patch: AutoEncoderPatchType<MemberWithRegistrationsBlob>; organization: Organization }) {
-    expect(patch.id).toBeString();
+    expect(patch.id).toEqual(expect.any(String));
     const { adminToken } = await initAdmin({ organization: organization });
 
     const arr = new PatchableArray();

package/tests/actions/patchPaymentStatus.ts

@@ -3,11 +3,11 @@ import { PaymentStatus, PaymentGeneral } from '@stamhoofd/structures';
 import { PatchPaymentsEndpoint } from '../../src/endpoints/organization/dashboard/payments/PatchPaymentsEndpoint.js';
 import { testServer } from '../helpers/TestServer.js';
 import { Request } from '@simonbackx/simple-endpoints';
-import { Organization } from '@stamhoofd/models';
+import type { Organization } from '@stamhoofd/models';
 import { initAdmin } from '../init/initAdmin.js';
 
 export async function changePaymentStatus({ payment, organization, status }: { payment: { id: string }; organization: Organization; status: PaymentStatus }) {
-    expect(payment.id).toBeString();
+    expect(payment.id).toEqual(expect.any(String));
     const { adminToken } = await initAdmin({ organization: organization });
 
     const arr = new PatchableArray();

package/tests/actions/patchUserMember.ts

@@ -1,12 +1,14 @@
-import { AutoEncoderPatchType, PatchableArray } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType} from '@simonbackx/simple-encoding';
+import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import { Organization, Token, User } from '@stamhoofd/models';
-import { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import type { Organization, User } from '@stamhoofd/models';
+import { Token } from '@stamhoofd/models';
+import type { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
 import { PatchUserMembersEndpoint } from '../../src/endpoints/global/registration/PatchUserMembersEndpoint.js';
 import { testServer } from '../helpers/TestServer.js';
 
 export async function patchUserMember({ patch, organization, user }: { patch: AutoEncoderPatchType<MemberWithRegistrationsBlob>; organization: Organization; user: User }) {
-    expect(patch.id).toBeString();
+    expect(patch.id).toEqual(expect.any(String));
 
     const token = await Token.createToken(user);
 

package/tests/e2e/api-rate-limits.test.ts

@@ -1,13 +1,12 @@
-/* eslint-disable jest/no-conditional-expect */
 import { Request } from '@simonbackx/simple-endpoints';
-import { Organization, OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization } from '@stamhoofd/models';
+import { OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
 
-import { PatchMap } from '@simonbackx/simple-encoding';
-import { ApiUser, ApiUserRateLimits, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, UserMeta, UserPermissions } from '@stamhoofd/structures';
+import { ApiUser, ApiUserRateLimits, PermissionLevel, Permissions, UserMeta, UserPermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
+import { GetUserEndpoint } from '../../src/endpoints/auth/GetUserEndpoint.js';
 import { CreateApiUserEndpoint } from '../../src/endpoints/organization/dashboard/users/CreateApiUserEndpoint.js';
 import { testServer } from '../helpers/TestServer.js';
-import { GetUserEndpoint } from '../../src/endpoints/auth/GetUserEndpoint.js';
 
 describe('E2E.APIRateLimits', () => {
     // Test endpoint