@stamhoofd/backend 2.134.0 → 2.136.0

package/src/sql-filters/members.ts

@@ -65,6 +65,11 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
         type: SQLValueType.Datetime,
         nullable: false,
     }),
+    'lastRegisteredAt': createColumnFilter({
+        expression: SQL.column(membersTable, 'lastRegisteredAt'),
+        type: SQLValueType.Datetime,
+        nullable: true,
+    }),
     'organizationName': createColumnFilter({
         expression: SQL.column('organizations', 'name'),
         type: SQLValueType.String,
@@ -504,6 +509,11 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
                     type: SQLValueType.JSONScalar, // Can be string, number or boolean
                     nullable: true,
                 }),
+                dateValue: createColumnFilter({
+                    expression: SQL.jsonExtract(SQL.column('details'), `$.value.recordAnswers.${SQLJsonExtract.escapePathComponent(key)}.dateValue`, true),
+                    type: SQLValueType.JSONDate,
+                    nullable: true,
+                }),
             }),
             {
                 checkPermission: async (key: string) => {

package/src/sql-filters/orders.ts

@@ -216,6 +216,11 @@ export const orderFilterCompilers: SQLFilterDefinitions = {
                 type: SQLValueType.JSONScalar, // Can be string, number or boolean
                 nullable: true,
             }),
+            dateValue: createColumnFilter({
+                expression: SQL.jsonExtract(SQL.column('data'), `$.value.recordAnswers.${SQLJsonExtract.escapePathComponent(key)}.dateValue`, true),
+                type: SQLValueType.JSONDate,
+                nullable: true,
+            }),
         }),
     ),
     payments: createExistsFilter(

package/src/sql-sorters/members.ts

@@ -69,7 +69,7 @@ export const memberSorters: SQLSortDefinitions<MemberWithUsersRegistrationsAndGr
     },
     createdAt: {
         getValue(a) {
-            return a.createdAt;
+            return Formatter.dateTimeIso(a.createdAt, 'UTC');
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -78,4 +78,15 @@ export const memberSorters: SQLSortDefinitions<MemberWithUsersRegistrationsAndGr
             });
         },
     },
+    lastRegisteredAt: {
+        getValue(a) {
+            return a.lastRegisteredAt ? Formatter.dateTimeIso(a.lastRegisteredAt, 'UTC') : null;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('lastRegisteredAt'),
+                direction,
+            });
+        },
+    },
 };

package/vitest.config.js

@@ -2,6 +2,7 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
     test: {
+        include: ['**/*.test.ts'], // only match TypeScript sources, so compiled copies in dist are never picked up
         globalSetup: './tests/vitest.global.setup.ts',
         setupFiles: ['./tests/vitest.setup.ts'],
         watch: false,