Return removed stuff

Author: TatianaFomina

src/billing/cloudpayments.ts

@@ -343,34 +343,42 @@ export default class CloudPaymentsWebhooks {
 
     // let accountId = workspace.accountId;
 
-    // try {
-    //   if (!workspace.accountId) {
-    //     accountId = (await context.accounting.createAccount({
-    //       name: `WORKSPACE:${workspace.name}`,
-    //       type: AccountType.LIABILITY,
-    //       currency: Currency.RUB,
-    //     })).recordId;
-    //     await workspace.setAccountId(accountId);
-    //   }
-
-    //   await context.accounting.payOnce({
-    //     accountId: accountId,
-    //     amount: tariffPlan.monthlyCharge * PENNY_MULTIPLIER,
-    //     description: `Account replenishment to pay for the tariff plan with id ${tariffPlan._id}. CloudPayments transaction ID: ${body.TransactionId}`,
-    //   });
-
-    //   await context.accounting.purchase({
-    //     accountId,
-    //     amount: tariffPlan.monthlyCharge * PENNY_MULTIPLIER,
-    //     description: `Charging for tariff plan with id ${tariffPlan._id}. CloudPayments transaction ID: ${body.TransactionId}`,
-    //   });
-    // } catch (e) {
-    //   const error = e as Error;
+    /*
+     * try {
+     *   if (!workspace.accountId) {
+     *     accountId = (await context.accounting.createAccount({
+     *       name: `WORKSPACE:${workspace.name}`,
+     *       type: AccountType.LIABILITY,
+     *       currency: Currency.RUB,
+     *     })).recordId;
+     *     await workspace.setAccountId(accountId);
+     *   }
+     */
+
+    /*
+     *   await context.accounting.payOnce({
+     *     accountId: accountId,
+     *     amount: tariffPlan.monthlyCharge * PENNY_MULTIPLIER,
+     *     description: `Account replenishment to pay for the tariff plan with id ${tariffPlan._id}. CloudPayments transaction ID: ${body.TransactionId}`,
+     *   });
+     */
+
+    /*
+     *   await context.accounting.purchase({
+     *     accountId,
+     *     amount: tariffPlan.monthlyCharge * PENNY_MULTIPLIER,
+     *     description: `Charging for tariff plan with id ${tariffPlan._id}. CloudPayments transaction ID: ${body.TransactionId}`,
+     *   });
+     * } catch (e) {
+     *   const error = e as Error;
+     */
 
     //   this.sendError(res, PayCodes.SUCCESS, `[Billing / Pay] Error while creating operations in accounting ${error.toString()}`, body);
 
-    //   return;
-    // }
+    /*
+     *   return;
+     * }
+     */
 
     try {
       await publish('cron-tasks', 'cron-tasks/limiter', JSON.stringify({
@@ -481,7 +489,6 @@ export default class CloudPaymentsWebhooks {
     let user;
 
     if (!data.workspaceId || !data.userId || !data.tariffPlanId) {
-
       this.sendError(res, FailCodes.SUCCESS, `[Billing / Fail] No workspace or user id or plan id in request body`, body);
 
       return;

src/resolvers/billingNew.ts

@@ -9,6 +9,7 @@ import {
 } from '@hawk.so/types';
 import checksumService from '../utils/checksumService';
 import { UserInputError } from 'apollo-server-express';
+import cloudPaymentsApi, { CloudPaymentsJsonData } from '../utils/cloudPaymentsApi';
 
 /**
  * The amount we will debit to confirm the subscription.
@@ -154,7 +155,7 @@ export default {
         throw new UserInputError('There is no saved card with provided id');
       }
 
-      const jsonData: any = {
+      const jsonData: CloudPaymentsJsonData = {
         checksum: args.input.checksum,
       };
 
@@ -192,7 +193,15 @@ export default {
         amount = AMOUNT_FOR_CARD_VALIDATION;
       }
 
-      const operation = await factories.businessOperationsFactory.getBusinessOperationByTransactionId('foo');
+      const result = await cloudPaymentsApi.payByToken({
+        AccountId: user.id,
+        Amount: amount,
+        Token: token,
+        Currency: 'RUB',
+        JsonData: jsonData,
+      });
+
+      const operation = await factories.businessOperationsFactory.getBusinessOperationByTransactionId(result.Model.TransactionId.toString());
 
       return {
         recordId: operation?._id,

src/resolvers/event.js

@@ -1,6 +1,12 @@
 const EventsFactory = require('../models/eventsFactory');
 const { ObjectID } = require('mongodb');
+const asyncForEach = require('../utils/asyncForEach');
+const ProjectToWorkspace = require('../models/projectToWorkspace');
 const sendPersonalNotification = require('../utils/personalNotifications').default;
+const mongo = require('../mongo');
+const MongoWatchController = require('../utils/mongoWatchController');
+
+const watchController = new MongoWatchController();
 
 /**
  * See all types and fields here {@see ../typeDefs/event.graphql}
@@ -122,6 +128,53 @@ module.exports = {
       return release;
     },
   },
+  Subscription: {
+    eventOccurred: {
+      /**
+       * Subscribes user to events from his projects
+       * @param {ResolverObj} _obj
+       * @param {Object} _args - request variables (not used)
+       * @param {UserInContext} user - current authorized user {@see ../index.js}
+       * @param {ContextFactories} factories - factories for working with models
+       * @return {AsyncIterator<EventSchema>}
+       */
+      subscribe: async (_obj, _args, { user, factories }) => {
+        const userId = user.id;
+        const userModel = await factories.usersFactory.findById(userId);
+        // eslint-disable-next-line no-async-promise-executor
+        const eventsCollections = new Promise(async resolve => {
+          // @todo optimize query for getting all user's projects
+
+          // Find all user's workspaces
+          const allWorkspacesIds = await userModel.getWorkspacesIds();
+          const allProjects = [];
+
+          // Find all user's projects
+          await asyncForEach(allWorkspacesIds, async workspaceId => {
+            const allProjectsInWorkspace = await new ProjectToWorkspace(workspaceId).getProjects();
+
+            allProjects.push(...allProjectsInWorkspace);
+          });
+
+          resolve(allProjects.map(project =>
+            mongo.databases.events
+              .collection('events:' + project.id)
+          ));
+        });
+
+        return watchController.getAsyncIteratorForCollectionChangesEvents(eventsCollections);
+      },
+
+      /**
+       * Sends data to user about new events
+       * @param {Object} payload - subscription event payload (from mongoDB watch)
+       * @return {EventSchema}
+       */
+      resolve: (payload) => {
+        return payload.fullDocument;
+      },
+    },
+  },
   Mutation: {
     /**
      * Mark event as visited for current user

src/typeDefs/event.ts

@@ -394,6 +394,13 @@ type DailyEventInfo {
   lastRepetitionTime: Float!
 }
 
+type Subscription {
+  """
+  Sends new events from all user projects
+  """
+  eventOccurred: Event! @requireAuth
+}
+  
 """
 Event information per day with these events
 """