Merge pull request #92 from alkem-io/develop

Client-lib; skip goup check
alkem-io · Feb 1, 2022 · 16aa1dd · 16aa1dd
2 parents 9de235c + a678fa5
commit 16aa1dd
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "validate-connection": "ts-node src/utils/validate-connection.ts"
   },
   "dependencies": {
-    "@alkemio/client-lib": "^0.10.4",
+    "@alkemio/client-lib": "^0.11.2",
     "@nestjs/axios": "^0.0.1",
     "@nestjs/common": "^8.0.5",
     "@nestjs/config": "^1.0.1",

diff --git a/src/common/constants/defaults.ts b/src/common/constants/defaults.ts
@@ -1,5 +1,5 @@
 export const DEFAULT_ENDPOINTS = {
-  alkemioServer: 'http://localhost:3000/admin/graphql',
+  alkemioServer: 'http://localhost:3000/api/private/non-interactive/graphql',
   kratosApiEndpoint: 'http://localhost:3000/identity/ory/kratos/public',
 };
 

diff --git a/src/services/domain/builders/application-created/application.created.notification.builder.ts b/src/services/domain/builders/application-created/application.created.notification.builder.ts
@@ -92,7 +92,6 @@ export class ApplicationCreatedNotificationBuilder {
         if (
           recipient.preferences.find(
             preference =>
-              preference.definition.group === 'Notification' &&
               preference.definition.type === preferenceType &&
               preference.value === 'true'
           )

diff --git a/...communication-discussion-created/communication.discussion.created.notification.builder.ts b/...communication-discussion-created/communication.discussion.created.notification.builder.ts
@@ -111,7 +111,6 @@ export class CommunicationDiscussionCreatedNotificationBuilder {
           !preferenceType ||
           recipient.preferences.find(
             preference =>
-              preference.definition.group === 'Notification' &&
               preference.definition.type === preferenceType &&
               preference.value === 'true'
           )

diff --git a/...vices/domain/builders/communication-updated/communication.updated.notification.builder.ts b/...vices/domain/builders/communication-updated/communication.updated.notification.builder.ts
@@ -106,7 +106,6 @@ export class CommunicationUpdateNotificationBuilder {
           !preferenceType ||
           recipient.preferences.find(
             preference =>
-              preference.definition.group === 'Notification' &&
               preference.definition.type === preferenceType &&
               preference.value === 'true'
           )

diff --git a/src/services/domain/builders/user-registered/user.registered.notification.builder.ts b/src/services/domain/builders/user-registered/user.registered.notification.builder.ts
@@ -95,7 +95,6 @@ export class UserRegisteredNotificationBuilder {
           !preferenceType ||
           recipient.preferences.find(
             preference =>
-              preference.definition.group === 'Notification' &&
               preference.definition.type === preferenceType &&
               preference.value === 'true'
           )

diff --git a/src/services/external/alkemio-client/alkemio.client.factory.ts b/src/services/external/alkemio-client/alkemio.client.factory.ts
@@ -14,7 +14,7 @@ export async function alkemioClientFactory(
     )?.public_endpoint;
 
     const alkemioClientConfig = {
-      graphqlEndpoint: server,
+      apiEndpointPrivateGraphql: server,
       authInfo: {
         credentials: {
           email: configService.get(ConfigurationTypes.ALKEMIO)?.service_account

diff --git a/src/utils/validate-connection.ts b/src/utils/validate-connection.ts
@@ -7,10 +7,10 @@ import * as dotenv from 'dotenv';
 
 const main = async () => {
   dotenv.config();
-
+  const server =
+    process.env.ALKEMIO_SERVER_ENDPOINT || DEFAULT_ENDPOINTS.alkemioServer;
   const alkemioClient = new AlkemioClient({
-    graphqlEndpoint:
-      process.env.ALKEMIO_SERVER_ENDPOINT ?? DEFAULT_ENDPOINTS.alkemioServer,
+    apiEndpointPrivateGraphql: server,
     authInfo: {
       credentials: {
         email: