Merge pull request #219 from ThatConference/feat/discord-info

feat: add DiscordInfo type to session base interface

package.json

@@ -1,6 +1,6 @@
 {
   "name": "that-api-sessions",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "THAT Conference Sessions Service.",
   "main": "index.js",
   "engines": {
@@ -20,14 +20,14 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@apollo/server": "^4.9.3",
-    "@apollo/subgraph": "^2.5.5",
-    "@google-cloud/firestore": "^6.7.0",
+    "@apollo/server": "^4.9.5",
+    "@apollo/subgraph": "^2.5.6",
+    "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/trace-agent": "^7.1.2",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.0",
-    "@graphql-tools/utils": "^10.0.6",
-    "@sentry/node": "^7.70.0",
+    "@graphql-tools/utils": "^10.0.7",
+    "@sentry/node": "^7.75.1",
     "@thatconference/api": "~4.3.0",
     "@thatconference/schema": "^4.0.0",
     "base32-encode": "~1.2.0",
@@ -38,39 +38,39 @@
     "debug": "^4.3.4",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "googleapis": "^126.0.1",
+    "googleapis": "^128.0.0",
     "graphql": "^16.8.1",
-    "graphql-scalars": "^1.22.2",
+    "graphql-scalars": "^1.22.4",
     "graphql-type-json": "^0.3.2",
     "ical-generator": "^5.0.1",
     "lodash": "^4.17.21",
     "node-fetch": "~2.6.13",
-    "postmark": "^3.0.19",
+    "postmark": "^3.1.1",
     "response-time": "^2.3.2",
     "slugify": "^1.6.6",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.20",
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.2",
     "@babel/eslint-parser": "^7.22.15",
     "@babel/node": "^7.22.19",
-    "@babel/preset-env": "^7.22.20",
+    "@babel/preset-env": "^7.23.2",
     "babel-jest": "^29.7.0",
-    "concurrently": "^8.2.1",
+    "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.50.0",
+    "eslint": "^8.52.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jest": "^27.4.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "husky": "^8.0.3",
     "jest-cli": "^29.7.0",
     "nodemon": "^3.0.1",
-    "prettier-eslint": "^15.0.1",
-    "prettier-eslint-cli": "^7.1.0"
+    "prettier-eslint": "^16.1.1",
+    "prettier-eslint-cli": "^8.0.1"
   },
   "jest": {
     "testEnvironment": "node",

src/constants.js

@@ -2,6 +2,9 @@ import { constants as apiConstants } from '@thatconference/api';
 
 const constants = {
   ...apiConstants,
+  discord: {
+    baseUrl: 'https://discord.com',
+  },
 };
 
 export default constants;

src/graphql/resolvers/queries/acceptedSession.js

@@ -2,6 +2,7 @@ import debug from 'debug';
 import favoriteStore from '../../../dataSources/cloudFirestore/favorite';
 import favoritedByFunc from '../shared/favoritedBy';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:query:AcceptedSession');
 
@@ -48,6 +49,7 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
     location: ({ location }) => location || null,
     secondaryLocations: ({ secondaryLocations }) => secondaryLocations || [],
   },

src/graphql/resolvers/queries/keynote.js

@@ -2,6 +2,7 @@ import debug from 'debug';
 import favoriteStore from '../../../dataSources/cloudFirestore/favorite';
 import favoritedByFunc from '../shared/favoritedBy';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:keynote');
 
@@ -35,6 +36,7 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
     admin: parent => parent,
     event: ({ eventId }) => ({ id: eventId }),
     location: ({ location }) => location || null,

src/graphql/resolvers/queries/mySession.js

@@ -1,5 +1,6 @@
 import debug from 'debug';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:query:MySession');
 
@@ -26,5 +27,6 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
   },
 };

src/graphql/resolvers/queries/openSpace.js

@@ -2,6 +2,7 @@ import debug from 'debug';
 import favoriteStore from '../../../dataSources/cloudFirestore/favorite';
 import favoritedByFunc from '../shared/favoritedBy';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:openspace');
 
@@ -35,6 +36,7 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
     admin: parent => parent,
     event: ({ eventId }) => ({ id: eventId }),
     location: ({ location }) => location || null,

src/graphql/resolvers/queries/panel.js

@@ -2,6 +2,7 @@ import debug from 'debug';
 import favoriteStore from '../../../dataSources/cloudFirestore/favorite';
 import favoritedByFunc from '../shared/favoritedBy';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:panel');
 
@@ -35,6 +36,7 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
     admin: parent => parent,
     event: ({ eventId }) => ({ id: eventId }),
     location: ({ location }) => location || null,

src/graphql/resolvers/queries/regular.js

@@ -2,6 +2,7 @@ import debug from 'debug';
 import favoriteStore from '../../../dataSources/cloudFirestore/favorite';
 import favoritedByFunc from '../shared/favoritedBy';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:regular');
 
@@ -35,6 +36,7 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
     admin: parent => parent,
     event: ({ eventId }) => ({ id: eventId }),
     location: ({ location }) => location || null,

src/graphql/resolvers/queries/workshop.js

@@ -2,6 +2,7 @@ import debug from 'debug';
 import favoriteStore from '../../../dataSources/cloudFirestore/favorite';
 import favoritedByFunc from '../shared/favoritedBy';
 import { findAssets } from '../shared/resolveSessionAssets';
+import { parseDiscordInfo } from '../shared/discordInfo';
 
 const dlog = debug('that:api:sessions:workshop');
 
@@ -35,6 +36,7 @@ export const fieldResolvers = {
       dlog('session assets requested');
       return findAssets({ entityId, firestore });
     },
+    discord: ({ discord }) => parseDiscordInfo(discord),
     admin: parent => parent,
     event: ({ eventId }) => ({ id: eventId }),
     location: ({ location }) => location || null,

src/graphql/resolvers/shared/discordInfo.js

@@ -0,0 +1,29 @@
+import constants from '../../../constants';
+
+export function parseDiscordInfo(discordInfo) {
+  let discordInfoResult = null;
+  if (discordInfo) {
+    const { guildId, channelId, guildScheduledEventId, inviteUrl } =
+      discordInfo;
+    discordInfoResult = {
+      guildId: guildId ?? '',
+      channelId: channelId ?? '',
+      guildScheduledEventId: guildScheduledEventId ?? null,
+      inviteUrl: inviteUrl ?? '',
+      channelUrl: null,
+      guildScheduledEventUrl: null,
+      guildScheduledEventInviteUrl: null,
+    };
+    if (guildId && channelId) {
+      discordInfoResult.channelUrl = `${constants.discord.baseUrl}/channels/${guildId}/${channelId}`;
+    }
+    if (guildId && guildScheduledEventId) {
+      discordInfoResult.guildScheduledEventUrl = `${constants.discord.baseUrl}/events/${guildId}/${guildScheduledEventId}`;
+    }
+    if (inviteUrl && guildScheduledEventId) {
+      discordInfoResult.guildScheduledEventInviteUrl = `${inviteUrl}?event=${guildScheduledEventId}`;
+    }
+  }
+
+  return discordInfoResult;
+}

src/graphql/typeDefs/dataTypes/discordInfo.graphql

@@ -0,0 +1,16 @@
+type DiscordInfo {
+  "Guild/server this information relates to"
+  guildId: String
+  "The voice channel setup for this session"
+  channelId: String
+  "The url pointing directly to the channel"
+  channelUrl: URL
+  "A discord channel invite for the referenced channel"
+  inviteUrl: URL
+  "The event setup for this session which references the channel"
+  guildScheduledEventId: String
+  "The url pointing directly to the guild scheduled event"
+  guildScheduledEventUrl: URL
+  "Event invite (same as channel with event id parameter)"
+  guildScheduledEventInviteUrl: URL
+}

src/graphql/typeDefs/dataTypes/interfaces/base.graphql

@@ -49,6 +49,8 @@ interface Base @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "Date time session created"
   createdAt: Date!
   "Date time session last updated"

src/graphql/typeDefs/dataTypes/session/acceptedSession.graphql

@@ -58,6 +58,8 @@ type AcceptedSession @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "FUTURE: possible rating holder"
   rating: [Rating]
   "Date time session last updated"

src/graphql/typeDefs/dataTypes/session/keynote.graphql

@@ -49,6 +49,8 @@ type Keynote implements EyesFront & Base @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "Date time session created"
   createdAt: Date!
   "Date time session last updated"

src/graphql/typeDefs/dataTypes/session/mySession.graphql

@@ -40,6 +40,8 @@ type MySession @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
 
   rating: [Rating]
   createdAt: Date!

src/graphql/typeDefs/dataTypes/session/openSpace.graphql

@@ -48,6 +48,8 @@ type OpenSpace implements Base @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "Date time session created"
   createdAt: Date!
   "Date time session last updated"

src/graphql/typeDefs/dataTypes/session/panel.graphql

@@ -49,6 +49,8 @@ type Panel implements EyesFront & Base @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "Date time session created"
   createdAt: Date!
   "Date time session last updated"

src/graphql/typeDefs/dataTypes/session/regular.graphql

@@ -49,6 +49,8 @@ type Regular implements EyesFront & Base @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "Date time session created"
   createdAt: Date!
   "Date time session last updated"

src/graphql/typeDefs/dataTypes/session/workshop.graphql

@@ -49,6 +49,8 @@ type Workshop implements EyesFront & Base @key(fields: "id") {
   communities: [Slug]
   "Assets assigned to this session"
   assets: [Asset]
+  "Discord channel information for hosting online session"
+  discord: DiscordInfo
   "Date time session created"
   createdAt: Date!
   "Date time session last updated"