Merge pull request #401 from alkem-io/server-4808

updated to work with calloutsSet re codegen + compiling;
alkem-io · Dec 30, 2024 · 8245d18 · 8245d18
2 parents 6831912 + 80b24eb
commit 8245d18
Show file tree

Hide file tree

Showing 63 changed files with 56,608 additions and 56,701 deletions.
diff --git a/server-api/src/core/generated/alkemio-schema.ts b/server-api/src/core/generated/alkemio-schema.ts
diff --git a/server-api/src/core/generated/graphql.ts b/server-api/src/core/generated/graphql.ts
diff --git a/server-api/src/functional-api/activity-logs/challenge-activity-logs.it-spec.ts b/server-api/src/functional-api/activity-logs/challenge-activity-logs.it-spec.ts
@@ -16,7 +16,7 @@ import {
 } from '@functional-api/journey/space/space.request.params';
 import { getActivityLogOnCollaboration } from './activity-log-params';
 import {
-  createCalloutOnCollaboration,
+  createCalloutOnCalloutsSet,
   deleteCallout,
   updateCalloutVisibility,
 } from '@functional-api/callout/callouts.request.params';
@@ -88,10 +88,10 @@ describe('Activity logs - Subspace', () => {
 
   test('should NOT return CALLOUT_PUBLISHED, when created', async () => {
     // Arrange
-    const res = await createCalloutOnCollaboration(
+    const res = await createCalloutOnCalloutsSet(
       baseScenario.subspace.collaboration.id
     );
-    calloutId = res?.data?.createCalloutOnCollaboration.id ?? '';
+    calloutId = res?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     const resActivity = await getActivityLogOnCollaboration(
       baseScenario.subspace.collaboration.id,
@@ -148,10 +148,10 @@ describe('Activity logs - Subspace', () => {
 
   test.skip('should return CALLOUT_PUBLISHED, POST_CREATED, POST_COMMENT, DISCUSSION_COMMENT, WHITEBOARD_CREATED', async () => {
     // Arrange
-    const res = await createCalloutOnCollaboration(
+    const res = await createCalloutOnCalloutsSet(
       baseScenario.subspace.collaboration.id
     );
-    calloutId = res?.data?.createCalloutOnCollaboration.id ?? '';
+    calloutId = res?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(calloutId, CalloutVisibility.Published);
 
@@ -172,7 +172,7 @@ describe('Activity logs - Subspace', () => {
     );
     messageRes?.data?.sendMessageToRoom.id;
 
-    const resDiscussion = await createCalloutOnCollaboration(
+    const resDiscussion = await createCalloutOnCalloutsSet(
       baseScenario.subspace.collaboration.id,
       {
         framing: {
@@ -188,9 +188,9 @@ describe('Activity logs - Subspace', () => {
       }
     );
     const calloutIdDiscussion =
-      resDiscussion?.data?.createCalloutOnCollaboration.id ?? '';
+      resDiscussion?.data?.createCalloutOnCalloutsSet.id ?? '';
     const discussionCalloutCommentsId =
-      resDiscussion?.data?.createCalloutOnCollaboration?.comments?.id ?? '';
+      resDiscussion?.data?.createCalloutOnCalloutsSet?.comments?.id ?? '';
 
     await updateCalloutVisibility(
       calloutIdDiscussion,
@@ -202,7 +202,7 @@ describe('Activity logs - Subspace', () => {
       'comment on discussion callout'
     );
 
-    const resWhiteboard = await createCalloutOnCollaboration(
+    const resWhiteboard = await createCalloutOnCalloutsSet(
       baseScenario.subspace.collaboration.id,
       {
         framing: {
@@ -218,7 +218,7 @@ describe('Activity logs - Subspace', () => {
       }
     );
     const calloutIdWhiteboard =
-      resWhiteboard?.data?.createCalloutOnCollaboration.id ?? '';
+      resWhiteboard?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(
       calloutIdWhiteboard,

diff --git a/server-api/src/functional-api/activity-logs/opportunity-activity-logs.it-spec.ts b/server-api/src/functional-api/activity-logs/opportunity-activity-logs.it-spec.ts
@@ -12,7 +12,7 @@ import {
 } from '@generated/alkemio-schema';
 import { updateSpaceSettings } from '@functional-api/journey/space/space.request.params';
 import {
-  createCalloutOnCollaboration,
+  createCalloutOnCalloutsSet,
   deleteCallout,
   updateCalloutVisibility,
 } from '@functional-api/callout/callouts.request.params';
@@ -93,11 +93,11 @@ describe('Activity logs - Subsubspace', () => {
 
   test('should NOT return CALLOUT_PUBLISHED, when created', async () => {
     // Arrange
-    const res = await createCalloutOnCollaboration(
+    const res = await createCalloutOnCalloutsSet(
       baseScenario.subsubspace.collaboration.id,
       { framing: { profile: { displayName: callDN } } }
     );
-    calloutId = res?.data?.createCalloutOnCollaboration.id ?? '';
+    calloutId = res?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     const resActivity = await getActivityLogOnCollaboration(
       baseScenario.subsubspace.collaboration.id,
@@ -151,11 +151,11 @@ describe('Activity logs - Subsubspace', () => {
   // To be updated with the changes related to whiteboard callouts
   test.skip('should return CALLOUT_PUBLISHED, POST_CREATED, POST_COMMENT, DISCUSSION_COMMENT, WHITEBOARD_CREATED', async () => {
     // Arrange
-    const res = await createCalloutOnCollaboration(
+    const res = await createCalloutOnCalloutsSet(
       baseScenario.subsubspace.collaboration.id,
       { framing: { profile: { displayName: callDN } } }
     );
-    calloutId = res?.data?.createCalloutOnCollaboration.id ?? '';
+    calloutId = res?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(calloutId, CalloutVisibility.Published);
 
@@ -176,7 +176,7 @@ describe('Activity logs - Subsubspace', () => {
     );
     messageRes?.data?.sendMessageToRoom.id;
 
-    const resDiscussion = await createCalloutOnCollaboration(
+    const resDiscussion = await createCalloutOnCalloutsSet(
       baseScenario.subsubspace.collaboration.id,
       {
         framing: {
@@ -192,7 +192,7 @@ describe('Activity logs - Subsubspace', () => {
       }
     );
     const calloutIdDiscussion =
-      resDiscussion?.data?.createCalloutOnCollaboration.id ?? '';
+      resDiscussion?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(
       calloutIdDiscussion,
@@ -204,7 +204,7 @@ describe('Activity logs - Subsubspace', () => {
       'comment on discussion callout'
     );
 
-    const resWhiteboard = await createCalloutOnCollaboration(
+    const resWhiteboard = await createCalloutOnCalloutsSet(
       baseScenario.subsubspace.collaboration.id,
       {
         framing: {
@@ -220,7 +220,7 @@ describe('Activity logs - Subsubspace', () => {
       }
     );
     const calloutIdWhiteboard =
-      resWhiteboard?.data?.createCalloutOnCollaboration.id ?? '';
+      resWhiteboard?.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(
       calloutIdWhiteboard,

diff --git a/server-api/src/functional-api/activity-logs/space-activity-logs.it-spec.ts b/server-api/src/functional-api/activity-logs/space-activity-logs.it-spec.ts
@@ -14,7 +14,7 @@ import {
   updateSpaceSettings,
 } from '../journey/space/space.request.params';
 import {
-  createCalloutOnCollaboration,
+  createCalloutOnCalloutsSet,
   deleteCallout,
   updateCalloutVisibility,
 } from '@functional-api/callout/callouts.request.params';
@@ -84,10 +84,10 @@ describe('Activity logs - Space', () => {
 
   test('should NOT return CALLOUT_PUBLISHED, when created', async () => {
     // Arrange
-    const res = await createCalloutOnCollaboration(
+    const res = await createCalloutOnCalloutsSet(
       baseScenario.space.collaboration.id
     );
-    calloutId = res.data?.createCalloutOnCollaboration.id ?? '';
+    calloutId = res.data?.createCalloutOnCalloutsSet.id ?? '';
 
     const resActivity = await getActivityLogOnCollaboration(
       baseScenario.space.collaboration.id,
@@ -161,10 +161,10 @@ describe('Activity logs - Space', () => {
   // To be updated with the changes related to whiteboard callouts
   test.skip('should return CALLOUT_PUBLISHED, POST_CREATED, POST_COMMENT, DISCUSSION_COMMENT, WHITEBOARD_CREATED', async () => {
     // Arrange
-    const res = await createCalloutOnCollaboration(
+    const res = await createCalloutOnCalloutsSet(
       baseScenario.space.collaboration.id
     );
-    calloutId = res.data?.createCalloutOnCollaboration.id ?? '';
+    calloutId = res.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(calloutId, CalloutVisibility.Published);
 
@@ -185,7 +185,7 @@ describe('Activity logs - Space', () => {
     );
     messageRes?.data?.sendMessageToRoom.id;
 
-    const resDiscussion = await createCalloutOnCollaboration(
+    const resDiscussion = await createCalloutOnCalloutsSet(
       baseScenario.space.collaboration.id,
       {
         framing: {
@@ -201,7 +201,7 @@ describe('Activity logs - Space', () => {
       }
     );
     const calloutIdDiscussion =
-      resDiscussion.data?.createCalloutOnCollaboration.id ?? '';
+      resDiscussion.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(
       calloutIdDiscussion,
@@ -213,7 +213,7 @@ describe('Activity logs - Space', () => {
       'comment on discussion callout'
     );
 
-    const resWhiteboard = await createCalloutOnCollaboration(
+    const resWhiteboard = await createCalloutOnCalloutsSet(
       baseScenario.space.collaboration.id,
       {
         framing: {
@@ -229,7 +229,7 @@ describe('Activity logs - Space', () => {
       }
     );
     const calloutIdWhiteboard =
-      resWhiteboard.data?.createCalloutOnCollaboration.id ?? '';
+      resWhiteboard.data?.createCalloutOnCalloutsSet.id ?? '';
 
     await updateCalloutVisibility(
       calloutIdWhiteboard,

diff --git a/...nctional-api/callout/call-for-whiteboards/whiteboard-collection-callout.params.request.ts b/...nctional-api/callout/call-for-whiteboards/whiteboard-collection-callout.params.request.ts
@@ -4,17 +4,17 @@ import { graphqlErrorWrapper } from '@utils/graphql.wrapper';
 import { getGraphqlClient } from '@utils/graphqlClient';
 
 export const createWhiteboardCollectionCallout = async (
-  collaborationID: string,
+  calloutsSetID: string,
   nameID: string,
   displayName: string,
   userRole: TestUser = TestUser.GLOBAL_ADMIN
 ) => {
   const graphqlClient = getGraphqlClient();
   const callback = (authToken: string | undefined) =>
-    graphqlClient.CreateCalloutOnCollaboration(
+    graphqlClient.CreateCalloutOnCalloutsSet(
       {
         calloutData: {
-          collaborationID,
+          calloutsSetID,
           nameID,
           type: CalloutType.WhiteboardCollection,
           visibility: CalloutVisibility.Published,