From dea15550311293d1e212d72f99b45caa1b63c61b Mon Sep 17 00:00:00 2001
From: martmull <martmull@hotmail.fr>
Date: Fri, 17 Nov 2023 14:20:33 +0100
Subject: [PATCH] Improvements for migrations (#2556)

* Fix wrong var name

* Add is null is not null filtering on dates

* Simplify
---
 .../activities/tasks/hooks/useCurrentUserDueTaskCount.ts    | 2 +-
 front/src/modules/activities/tasks/hooks/useTasks.ts        | 4 ++--
 .../developers/api-keys/SettingsDevelopersApiKeys.tsx       | 2 +-
 .../workspace-query-runner.service.ts                       | 6 +++++-
 .../graphql-types/input/date-filter.input-type.ts           | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts b/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
index d7af66d21..e7ac13493 100644
--- a/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
+++ b/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
@@ -18,7 +18,7 @@ export const useCurrentUserTaskCount = () => {
     objectNamePlural: 'activitiesV2',
     filter: {
       type: { equals: ActivityType.Task },
-      completedAt: { equals: null },
+      completedAt: { eq: null },
       ...(currentUser
         ? turnFilterIntoWhereClause({
             fieldMetadataId: 'assigneeId',
diff --git a/front/src/modules/activities/tasks/hooks/useTasks.ts b/front/src/modules/activities/tasks/hooks/useTasks.ts
index b57ab8785..5f09c8ba9 100644
--- a/front/src/modules/activities/tasks/hooks/useTasks.ts
+++ b/front/src/modules/activities/tasks/hooks/useTasks.ts
@@ -29,7 +29,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
     skip: !entity && !selectedFilter,
     filter: {
       type: { equals: 'Task' },
-      completedAt: { not: { equals: null } },
+      completedAt: { neq: null },
       ...whereFilters,
     },
     orderBy: [
@@ -44,7 +44,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
     skip: !entity && !selectedFilter,
     filter: {
       type: { equals: 'Task' },
-      completedAt: { equals: null },
+      completedAt: { eq: null },
       ...whereFilters,
     },
     orderBy: [
diff --git a/front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx b/front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx
index ca09620dc..e82efc319 100644
--- a/front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx
+++ b/front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx
@@ -45,7 +45,7 @@ export const SettingsDevelopersApiKeys = () => {
   const [apiKeys, setApiKeys] = useState<Array<ApiFieldItem>>([]);
   useFindManyObjectRecords({
     objectNamePlural: 'apiKeysV2',
-    /*filter: { revokedAt: { eq: null } },*/
+    filter: { revokedAt: { eq: null } },
     onCompleted: (data) => {
       setApiKeys(
         formatExpirations(
diff --git a/server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts b/server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
index e543951e1..d1e6eaaeb 100644
--- a/server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
+++ b/server/src/workspace/workspace-query-runner/workspace-query-runner.service.ts
@@ -150,9 +150,13 @@ export class WorkspaceQueryRunnerService {
       )};
     `);
 
+    const queryFormatted = query
+      .replace('neq:null', 'is:NOT_NULL')
+      .replace('eq:null', 'is:NULL');
+
     const results = await workspaceDataSource?.query<PGGraphQLResult>(`
       SELECT graphql.resolve($$
-        ${query}
+        ${queryFormatted}
       $$);
     `);
 
diff --git a/server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts b/server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
index e61744b85..2b56e9352 100644
--- a/server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
+++ b/server/src/workspace/workspace-schema-builder/graphql-types/input/date-filter.input-type.ts
@@ -6,6 +6,7 @@ export const DateFilterType = new GraphQLInputObjectType({
   name: 'DateFilter',
   fields: {
     eq: { type: DateScalarType },
+    is: { type: DateScalarType },
     gt: { type: DateScalarType },
     gte: { type: DateScalarType },
     in: { type: new GraphQLList(new GraphQLNonNull(DateScalarType)) },