Merge branch 'main' into feature-assignments

Author: Morphenoed

.meshrc.yaml

@@ -62,6 +62,12 @@ sources:
           endpoint: "{env.ASSIGNMENT_SERVICE_URL}"
           operationHeaders:
             CurrentUser: "{context.currentUserJson}"
+  - name: GamificationService
+    handler:
+      graphql:
+        endpoint: "{env.GAMIFICATION_SERVICE_URL}"
+        operationHeaders:
+          CurrentUser: "{context.currentUserJson}"
 additionalTypeDefs:
   - "./additionalTypeDefs/content.graphqls"
   - "./additionalTypeDefs/course.graphqls"
@@ -77,6 +83,7 @@ additionalResolvers:
   - "./additionalResolvers/course.ts"
   - "./additionalResolvers/flashcard.ts"
   - "./additionalResolvers/quiz.ts"
+  - "./additionalResolvers/user.ts"
 additionalEnvelopPlugins: "./envelopPlugins"
 transforms:
   - filterSchema:

README.md

@@ -61,9 +61,11 @@ The `additionalResolvers` section defines code for custom GraphQL queries which
 | SKILLLEVEL_SERVICE_URL | URL for skilllevel service GraphQL | http://host.docker.internal:8001/graphql                                   | http://localhost:3500/v1.0/invoke/skilllevel-service/method/graphql |
 | QUIZ_SERVICE_URL       | URL for quiz service GraphQL       | http://host.docker.internal:9001/graphql                                   | http://localhost:3500/v1.0/invoke/quiz-service/method/graphql       |                                                               |
 | ASSIGNMENT_SERVICE_URL | URL for assignment service GraphQL | http://host.docker.internal:11001/graphql                                  | http://localhost:3500/v1.0/invoke/assignment-service/method/graphql  |
+| GAMIFICATION_SERVICE_URL | URL for gamification service GraphQL | http://host.docker.internal:1201/graphql                                   | http://localhost:1200\v1.0/invoke/gamifiation-service/method/graphql  |
 | JWKS_URL               | URL for jwks keycloak              | http://host.docker.internal:9009/realms/GITS/protocol/openid-connect/certs | http://keycloak/keycloak/realms/GITS/protocol/openid-connect/certs  |
 
 
+
 ### Other properties
 | Name                   | Description                        | Value in Dev Environment                                                   | Value in Prod Environment                                           |
 |------------------------|------------------------------------|----------------------------------------------------------------------------|---------------------------------------------------------------------|

additionalResolvers/user.ts

@@ -0,0 +1,36 @@
+import { Resolvers } from "../.mesh";
+
+const resolvers: Resolvers = {
+    UserInfo: {
+        availableCourseMemberships: {
+            selectionSet: `{ id }`,
+            async resolve(root, args, context, info) {
+                return context.CourseService.Query._internal_noauth_courseMembershipsByUserId({
+                    root,
+                    args: {
+                        userId: root.id,
+                        availabilityFilter: true,
+                    },
+                    context,
+                    info,
+                });
+            }
+        },
+        unavailableCourseMemberships: {
+            selectionSet: `{ id }`,
+            async resolve(root, args, context, info) {
+                return context.CourseService.Query._internal_noauth_courseMembershipsByUserId({
+                    root,
+                    args: {
+                        userId: root.id,
+                        availabilityFilter: false,
+                    },
+                    context,
+                    info,
+                });
+            }
+        }
+    }
+};
+
+export default resolvers;

additionalTypeDefs/user.graphqls

@@ -12,27 +12,9 @@ extend type UserInfo {
     }
   )
 
-  availableCourseMemberships: [CourseMembership!]! @resolveTo(
-    sourceName: "CourseService",
-    sourceTypeName: "Query",
-    sourceFieldName: "_internal_noauth_courseMembershipsByUserId",
-    requiredSelectionSet: "{ id }",
-    sourceArgs: {
-      userId: "{root.id}",
-      availabilityFilter: true
-    }
-  )
+  availableCourseMemberships: [CourseMembership!]! # resolved in user.ts
 
-  unavailableCourseMemberships: [CourseMembership!]! @resolveTo(
-    sourceName: "CourseService",
-    sourceTypeName: "Query",
-    sourceFieldName: "_internal_noauth_courseMembershipsByUserId",
-    requiredSelectionSet: "{ id }",
-    sourceArgs: {
-      userId: "{root.id}",
-      availabilityFilter: false
-    }
-  )
+  unavailableCourseMemberships: [CourseMembership!]! # resolved in user.ts
 
   """
   Media records of this user.

docker-compose.yml

@@ -24,6 +24,7 @@ services:
       QUIZ_SERVICE_URL: http://app-quiz:9001/graphql
       DOCPROCAI_SERVICE_URL: http://app-docprocai:9901/graphql/
       ASSIGNMENT_SERVICE_URL: http://app-assignment:1101/graphql
+      GAMIFICATION_SERVICE_URL: http://app-gamification:1201/graphql
       DEBUG: 0
       ENABLE_LOGGING: 1 # Set to 1 to enable custom logging
     networks:

package.json

@@ -4,8 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "mesh dev",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node run.mjs"
   },
   "keywords": [],
   "author": "",
@@ -14,13 +13,15 @@
     "@whatwg-node/server": "^0.9.14",
     "@envelop/core": "^4.0.1",
     "@envelop/generic-auth": "^6.0.0",
-    "@graphql-mesh/runtime": "^0.96.4",
-    "@graphql-mesh/cli": "^0.87.6",
-    "@graphql-mesh/graphql": "^0.95.3",
-    "@graphql-mesh/transform-type-merging": "^0.95.3",
-    "@graphql-mesh/transform-hoist-field": "^0.95.3",
-    "@graphql-mesh/transform-filter-schema": "^0.95.3",
-    "graphql": "^16.8.0",
-    "jose": "^4.14.4"
+    "@graphql-mesh/runtime": "^0.106.6",
+    "@graphql-mesh/cli": "^0.100.7",
+    "@graphql-mesh/graphql": "^0.104.6",
+    "@graphql-mesh/transform-type-merging": "^0.104.6",
+    "@graphql-mesh/transform-hoist-field": "^0.105.7",
+    "@graphql-mesh/transform-filter-schema": "^0.104.6",
+    "graphql": "^16.11.0",
+    "jose": "^4.14.4",
+    "yaml": "^2.8.0",
+    "node-fetch": "^3.3.2"
   }
 }

run.mjs

@@ -0,0 +1,73 @@
+import { spawn } from 'child_process';
+import yaml from 'yaml';
+import fs from 'fs';
+import fetch from 'node-fetch';
+
+const sleep = ms => new Promise(r => setTimeout(r, ms));
+
+async function checkReachable(url) {
+    const res = await fetch(url, { 
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: `{ "query": "query {__schema {__typename}}" }`,
+    });
+    return res.ok;
+}
+
+// get urls of services we need to wait for
+const meshRc = fs.readFileSync('./.meshrc.yaml', 'utf8');
+const config = yaml.parse(meshRc);
+
+// replace env variables in urls
+const serviceEndpoints = []
+const reEnv = /{env\.(.+)}/g
+for (const service of config.sources) {
+    let url = service.handler.graphql.endpoint;
+    if (url) {
+        url = url.replace(reEnv, (_, envVar) => {
+            return process.env[envVar] || '';
+        });
+        serviceEndpoints.push({
+            name: service.name,
+            url: url,
+        });
+    }
+}
+
+// wait for urls to be reachable
+while (true) {
+    const notReachable = [];
+    for(const service of serviceEndpoints) {
+        try {
+            const reachable = await checkReachable(service.url);
+            if (!reachable) {
+                notReachable.push(service.name);
+            }
+        } catch (error) {
+            console.log('Failed trying to reach service:', error.message);
+            notReachable.push(service.name);
+        }
+    }
+
+    if (notReachable.length === 0) {
+        break;
+    } else {
+        console.log('Waiting for services to be reachable:', notReachable.join(', '));
+    }
+    console.log('Retrying in 5 seconds...');
+    await sleep(5000);
+}
+
+console.log('All services are reachable, starting mesh after 2 seconds...');
+await sleep(2000); // additional wait to ensure services are ready
+
+// run mesh
+const meshProcess = spawn('npx', ['mesh', 'dev'], {
+    stdio: 'inherit',
+    shell: true,
+});
+
+meshProcess.on('close', (code) => {
+    console.log(`Mesh process exited with code ${code}`);
+    process.exit(code ?? 0);
+});