Merge pull request #202 from Edgeryders-Participio/remove-loomio

Remove loomio integration

Author: Powersource

api/package-lock.json

@@ -31,7 +31,6 @@
     "@sendgrid/mail": "^6.3.1",
     "apollo-server": "2.17.0",
     "apollo-server-express": "2.17.0",
-    "axios": "^0.18.0",
     "better-npm-run": "^0.1.0",
     "body-parser": "^1.18.2",
     "concurrently": "^3.5.1",
@@ -51,7 +50,6 @@
     "mime": "^2.0.3",
     "mocha": "^4.0.1",
     "neo4j-driver": "4.1.1",
-    "node-cron": "^2.0.3",
     "nodemon": "^1.12.4",
     "normalize-url": "^4.0.0",
     "path": "^0.12.7",

api/package.json

@@ -158,11 +158,12 @@ export function createResponsibility(driver, { title, needId }, { email, orgId }
   return runQueryAndGetRecord(driver.session(), query, queryParams);
 }
 
-export function addRealityHasDeliberation(driver, { from, to }) {
+export function addRealityHasDeliberation(driver, { from, to, orgId }) {
   const queryParams = {
     realityId: from.nodeId,
     infoUrl: to.url,
     infoId: uuidv4(),
+    orgId,
   };
   // Use cypher FOREACH hack to only set nodeId for info if it isn't already set
   const query = `
@@ -172,29 +173,14 @@ export function addRealityHasDeliberation(driver, { from, to }) {
     FOREACH (doThis IN CASE WHEN not(exists(info.nodeId)) THEN [1] ELSE [] END |
       SET info += {nodeId:$infoId, created:timestamp()})
     WITH reality, info
+    MATCH (org:Org {orgId:$orgId})
     MERGE (reality)-[:HAS_DELIBERATION]->(info)
+    MERGE (org)-[:HAS]->(info)
     RETURN reality as from, info as to
   `;
   return runQueryAndGetRecordWithFields(driver.session(), query, queryParams);
 }
 
-export function createInfo(driver, { title }, infoUrl) {
-  const queryParams = {
-    title,
-    url: infoUrl,
-    infoId: uuidv4(),
-  };
-  // Use cypher FOREACH hack to only set nodeId for info if it isn't already set
-  const query = `
-    MERGE (info:Info {url: $url})
-    FOREACH (doThis IN CASE WHEN not(exists(info.nodeId)) THEN [1] ELSE [] END |
-      SET info += {nodeId:$infoId, created:timestamp(), title: $title})
-    SET info.title = $title
-    RETURN info
-  `;
-  return runQueryAndGetRecord(driver.session(), query, queryParams);
-}
-
 export function createOrg(driver, { orgId }) {
   const query = `
     MERGE (org:Org {orgId:$orgId})

api/src/fetch/loomio.js

@@ -292,9 +292,9 @@ const resolvers = {
     ),
     addRealityHasDeliberation: combineResolvers(
       isAuthenticated,
-      (obj, { from, to }, { driver }) => {
+      (obj, { from, to }, { driver, viewedOrg: { orgId } }) => {
         const normalizedTo = { url: NormalizeUrl(to.url, { stripHash: true }) };
-        return addRealityHasDeliberation(driver, { from, to: normalizedTo });
+        return addRealityHasDeliberation(driver, { from, to: normalizedTo, orgId });
       },
     ),
     removeRealityHasDeliberation: combineResolvers(

api/src/graphql/connectors/index.js

@@ -90,10 +90,6 @@ const typeDefs = `
       from: _ResponsibilityInput!
       to: _ResponsibilityInput!
     ): _ResponsibilityDependsOnResponsibilitiesPayload
-    createInfo(
-      title: String
-      url: String!
-    ): Info
     updateInfo(
       url: String!
       title: String!

api/src/graphql/resolvers/index.js

@@ -6,7 +6,6 @@ import Keycloak from 'keycloak-connect';
 import { KeycloakContext, KeycloakSubscriptionContext, KeycloakSubscriptionHandler } from 'keycloak-connect-graphql';
 import createDriver from './db/neo4jDriver';
 import schema from './graphql/schema';
-import startSchedulers from './services/scheduler';
 import { getCoreModels, createOrgMembership } from './services/platoCore';
 import { createOrg } from './graphql/connectors';
 
@@ -104,7 +103,4 @@ createDriver().then((neo4jDriver) => {
     console.log(`GraphQL Server is now running on http://localhost:${API_PORT}/graphql`);
     console.log(`View GraphQL Playground at http://localhost:${API_PORT}/graphql`);
   });
-
-  // Start the schedulers that download data from various APIs.
-  startSchedulers();
 });

api/src/graphql/typeDefs.js

@@ -59,7 +59,7 @@ const DetailViewBody = ({ node }) => (
     </CardSection>
 
     <CardSection>
-      <LabelSpan>Discussions on Talk:</LabelSpan>
+      <LabelSpan>Related discussions:</LabelSpan>
       <Deliberations
         nodeType={node.__typename}
         nodeId={node.nodeId}

api/src/index.js

@@ -61,7 +61,7 @@ const FullscreenDetailViewBody = ({ node }) => (
     </CardSection>
 
     <CardSection>
-      <LabelSpan>Discussions on Talk:</LabelSpan>
+      <LabelSpan>Related discussions:</LabelSpan>
       <Deliberations
         nodeType={node.__typename}
         nodeId={node.nodeId}