@stamhoofd/backend 2.89.2 → 2.90.1

package/src/sql-filters/events.ts

@@ -1,31 +1,63 @@
-import { SQLFilterDefinitions, baseSQLFilterCompilers, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, SQL, SQLValueType, createSQLRelationFilterCompiler } from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
 
 export const eventFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
-    'id': createSQLColumnFilterCompiler('id'),
-    'name': createSQLColumnFilterCompiler('name'),
-    'organizationId': createSQLColumnFilterCompiler('organizationId'),
-    'startDate': createSQLColumnFilterCompiler('startDate'),
-    'endDate': createSQLColumnFilterCompiler('endDate'),
-    'groupIds': createSQLExpressionFilterCompiler(
-        SQL.jsonValue(SQL.column('meta'), '$.value.groups[*].id'),
-        { isJSONValue: true, isJSONObject: true },
-    ),
-    'groupId': createSQLColumnFilterCompiler('groupId'),
-    'typeId': createSQLColumnFilterCompiler('typeId'),
-    'defaultAgeGroupIds': createSQLExpressionFilterCompiler(
-        SQL.jsonValue(SQL.column('meta'), '$.value.defaultAgeGroupIds'),
-        { isJSONValue: true, isJSONObject: true },
-    ),
-    'organizationTagIds': createSQLExpressionFilterCompiler(
-        SQL.jsonValue(SQL.column('meta'), '$.value.organizationTagIds'),
-        { isJSONValue: true, isJSONObject: true },
-    ),
-    'meta.visible': createSQLExpressionFilterCompiler(
-        SQL.jsonValue(SQL.column('meta'), '$.value.visible'),
-        { isJSONValue: true, type: SQLValueType.JSONBoolean },
-    ),
-    'group': createSQLRelationFilterCompiler(
+    'id': createColumnFilter({
+        expression: SQL.column('id'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    'name': createColumnFilter({
+        expression: SQL.column('name'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    'organizationId': createColumnFilter({
+        expression: SQL.column('organizationId'),
+        type: SQLValueType.String,
+        nullable: true,
+    }),
+    'startDate': createColumnFilter({
+        expression: SQL.column('startDate'),
+        type: SQLValueType.Datetime,
+        nullable: false,
+    }),
+    'endDate': createColumnFilter({
+        expression: SQL.column('endDate'),
+        type: SQLValueType.Datetime,
+        nullable: false,
+    }),
+    'groupIds': createColumnFilter({
+        expression: SQL.jsonValue(SQL.column('meta'), '$.value.groups[*].id'),
+        type: SQLValueType.JSONArray,
+        nullable: true,
+    }),
+    'groupId': createColumnFilter({
+        expression: SQL.column('groupId'),
+        type: SQLValueType.String,
+        nullable: true,
+    }),
+    'typeId': createColumnFilter({
+        expression: SQL.column('typeId'),
+        type: SQLValueType.String,
+        nullable: false,
+    }),
+    'defaultAgeGroupIds': createColumnFilter({
+        expression: SQL.jsonValue(SQL.column('meta'), '$.value.defaultAgeGroupIds'),
+        type: SQLValueType.JSONArray,
+        nullable: true,
+    }),
+    'organizationTagIds': createColumnFilter({
+        expression: SQL.jsonValue(SQL.column('meta'), '$.value.organizationTagIds'),
+        type: SQLValueType.JSONArray,
+        nullable: true,
+    }),
+    'meta.visible': createColumnFilter({
+        expression: SQL.jsonValue(SQL.column('meta'), '$.value.visible'),
+        type: SQLValueType.JSONBoolean,
+        nullable: false,
+    }),
+    'group': createExistsFilter(
         SQL.select()
             .from(SQL.table('groups'))
             .where(
@@ -34,7 +66,11 @@ export const eventFilterCompilers: SQLFilterDefinitions = {
             ),
         {
             ...baseSQLFilterCompilers,
-            organizationId: createSQLColumnFilterCompiler('organizationId'),
+            organizationId: createColumnFilter({
+                expression: SQL.column('organizationId'),
+                type: SQLValueType.String,
+                nullable: false,
+            }),
         },
     ),
 };

package/src/sql-filters/groups.ts

@@ -1,48 +1,48 @@
-import { baseModernSQLFilterCompilers, createColumnFilter, createWildcardColumnFilter, SQL, SQLJsonExtract, SQLModernFilterDefinitions, SQLModernValueType } from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createWildcardColumnFilter, SQL, SQLJsonExtract, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
 
-export const groupFilterCompilers: SQLModernFilterDefinitions = {
-    ...baseModernSQLFilterCompilers,
+export const groupFilterCompilers: SQLFilterDefinitions = {
+    ...baseSQLFilterCompilers,
     id: createColumnFilter({
         expression: SQL.column('id'),
-        type: SQLModernValueType.String,
+        type: SQLValueType.String,
         nullable: false,
     }),
     organizationId: createColumnFilter({
         expression: SQL.column('organizationId'),
-        type: SQLModernValueType.String,
+        type: SQLValueType.String,
         nullable: false,
     }),
     periodId: createColumnFilter({
         expression: SQL.column('periodId'),
-        type: SQLModernValueType.String,
+        type: SQLValueType.String,
         nullable: false,
     }),
     name: createColumnFilter({
         expression: SQL.jsonValue(SQL.column('settings'), '$.value.name'),
-        type: SQLModernValueType.JSONString,
+        type: SQLValueType.JSONString,
         nullable: false,
     }),
     status: createColumnFilter({
         expression: SQL.column('status'),
-        type: SQLModernValueType.String,
+        type: SQLValueType.String,
         nullable: false,
     }),
     defaultAgeGroupId: createColumnFilter({
         expression: SQL.column('defaultAgeGroupId'),
-        type: SQLModernValueType.String,
+        type: SQLValueType.String,
         nullable: true,
     }),
     bundleDiscounts: createWildcardColumnFilter(
         (key: string) => ({
             expression: SQL.jsonValue(SQL.column('settings'), `$.value.prices[*].bundleDiscounts.${SQLJsonExtract.escapePathComponent(key)}`, true),
-            type: SQLModernValueType.JSONArray,
+            type: SQLValueType.JSONArray,
             nullable: true,
         }),
         (key: string) => ({
-            ...baseModernSQLFilterCompilers,
+            ...baseSQLFilterCompilers,
             name: createColumnFilter({
                 expression: SQL.jsonValue(SQL.column('settings'), `$.value.prices[*].bundleDiscounts.${SQLJsonExtract.escapePathComponent(key)}.name`, true),
-                type: SQLModernValueType.JSONArray,
+                type: SQLValueType.JSONArray,
                 nullable: true,
             }),
         }),