Merge pull request #229 from layerx-labs/dev

BEPRO 2.29

Author: moshmage

src/actions/get-bounty-closed-event.ts

@@ -178,11 +178,6 @@ export async function action(block: DecodedLog, query?: EventsQuery): Promise<Ev
 
   const {tokenAmount, fundingAmount, rewardAmount, rewardToken, transactional} = bounty;
 
-  const targets = [(await dbBounty.getUser({
-    attributes: ["email", "id"],
-    include: [{association: "user_settings"}]
-  })).get()]
-
   const AnalyticsEvent = {
     name: AnalyticEventName.BOUNTY_CLOSED,
     params: {
@@ -197,30 +192,7 @@ export async function action(block: DecodedLog, query?: EventsQuery): Promise<Ev
     }
   };
 
-  const NotificationEvent = {
-    name: AnalyticEventName.NOTIF_TASK_CLOSED,
-    params: {
-      targets,
-      task: {
-        title: dbBounty.title,
-        id: dbBounty.id,
-        createdAt: dbBounty.createdAt,
-        network: dbBounty.network.name,
-        link: `${dbBounty.network.name}/task/${dbBounty.id}`
-      },
-      proposal: {
-        id: dbProposal.id,
-        link: `${dbBounty.network.name}/task/${dbBounty.id}/proposal/${dbProposal.id}`,
-      },
-      deliverable: {
-        title: deliverable.title,
-        id: deliverable.id,
-        link: `${dbBounty.network.name}/task/${dbBounty.id}/deliverable/${dbProposal.id}`
-      },
-    }
-  }
-
-  Push.events([AnalyticsEvent, NotificationEvent]);
+  Push.events([AnalyticsEvent]);
 
   return eventsProcessed;
 }

src/actions/get-bounty-created-event.ts

@@ -22,6 +22,7 @@ import {Push} from "../services/analytics/push";
 import {AnalyticEventName} from "../services/analytics/types/events";
 import {getDeveloperAmount} from "src/modules/calculate-distributed-amounts";
 import {getCoinIconByChainAndContractAddress} from "src/services/coingecko";
+import { subscribeUserToTask } from "src/utils/notifications/subscribe-user-to-task";
 
 
 export const name = "getBountyCreatedEvents";
@@ -148,6 +149,8 @@ export async function action(block: DecodedLog<BountyCreatedEvent['returnValues'
 
   await dbBounty.save();
 
+  await subscribeUserToTask(dbBounty.id, dbBounty.user.address!);
+
   updateLeaderboardBounties();
   updateBountiesHeader();
 
@@ -182,6 +185,7 @@ export async function action(block: DecodedLog<BountyCreatedEvent['returnValues'
       ? AnalyticEventName.NOTIF_TASK_FUNDING_CREATED
       : AnalyticEventName.NOTIF_TASK_CREATED,
     params: {
+      bountyId: dbBounty.id,
       creator: {
         address: dbBounty.user?.address,
         username: dbBounty.user?.handle,

src/actions/get-proposal-created-event.ts

@@ -13,6 +13,7 @@ import {NETWORK_NOT_FOUND} from "../utils/messages.const";
 import {Push} from "../services/analytics/push";
 import {AnalyticEventName} from "../services/analytics/types/events";
 import updateSeoCardBounty from "src/modules/handle-seo-card";
+import { subscribeUserToTask } from "src/utils/notifications/subscribe-user-to-task";
 
 export const name = "getBountyProposalCreatedEvents";
 export const schedule = "*/13 * * * *";
@@ -88,6 +89,8 @@ export async function action(block: DecodedLog<BountyProposalCreatedEvent['retur
     sendMessageToTelegramChannels(BOUNTY_STATE_CHANGED(dbBounty.state, dbBounty));
   }
 
+  await subscribeUserToTask(dbBounty.id, dbBounty.user.address!);
+
   updateLeaderboardProposals();
   updateSeoCardBounty(dbBounty.id, name);
 
@@ -109,6 +112,7 @@ export async function action(block: DecodedLog<BountyProposalCreatedEvent['retur
   const NotificationEvent = {
     name: AnalyticEventName.NOTIF_PROPOSAL_OPEN,
     params: {
+      bountyId: dbBounty.id,
       creator: {
         address: createProposal.creator,
         username: createProposal.handle,

src/actions/get-pullrequest-created-event.ts

@@ -11,6 +11,7 @@ import {DELIVERABLE_OPEN} from "../integrations/telegram/messages";
 import {Push} from "../services/analytics/push";
 import {AnalyticEventName} from "../services/analytics/types/events";
 import updateSeoCardBounty from "src/modules/handle-seo-card";
+import { subscribeUserToTask } from "src/utils/notifications/subscribe-user-to-task";
 
 export const name = "getBountyPullRequestCreatedEvents";
 export const schedule = "*/10 * * * *";
@@ -33,7 +34,7 @@ export async function action(block: DecodedLog<BountyPullRequestCreatedEvent['re
 
   const dbBounty = await db.issues.findOne({
     where: {contractId: bountyId, network_id: network.id},
-    include: [{association: "network"}, {association: "chain"}]
+    include: [{association: "network"}, {association: "chain"}, {association: "user"}]
   });
 
   if (!dbBounty) {
@@ -61,15 +62,15 @@ export async function action(block: DecodedLog<BountyPullRequestCreatedEvent['re
   dbDeliverable.bountyId = bounty.id
   await dbDeliverable.save();
 
+  await subscribeUserToTask(dbBounty.id, dbBounty.user.address!);
+
   updateSeoCardBounty(dbBounty.id, name);
 
   eventsProcessed[network.name!] = {
     [dbBounty.id!.toString()]: {bounty: dbBounty, eventBlock: parseLogWithContext(block)}
   };
 
   sendMessageToTelegramChannels(DELIVERABLE_OPEN(dbBounty, dbDeliverable, dbDeliverable.id));
-  
-  const targets = [(await dbBounty.getUser({attributes: ["email", "id"], include:[{ association: "user_settings" }] })).get()]
 
   const AnalyticEvent = {
     name: AnalyticEventName.PULL_REQUEST_OPEN,
@@ -82,30 +83,7 @@ export async function action(block: DecodedLog<BountyPullRequestCreatedEvent['re
     }
   }
 
-  const NotificationEvent = {
-    name: AnalyticEventName.NOTIF_DELIVERABLE_CREATED,
-    params: {
-      targets,
-      creator: {
-        address: dbDeliverable.user.address,
-        id: dbDeliverable.user.id,
-        username: dbDeliverable.user.handle,
-      },
-      task: {
-        id: dbDeliverable.bountyId,
-        title: dbBounty.title,
-        network: dbBounty.network.name,
-      },
-      deliverable: {
-        title: dbDeliverable.title,
-        id: dbDeliverable.id,
-        createdAt: dbDeliverable.createdAt,
-        link: `${dbBounty.network.name}/task/${dbBounty.id}/deliverable/${dbDeliverable.id}`
-      }
-    }
-  }
-
-  Push.events([AnalyticEvent, NotificationEvent])
+  Push.events([AnalyticEvent]);
 
   return eventsProcessed;
 }

src/actions/get-pullrequest-ready-for-review.ts

@@ -10,7 +10,7 @@ import {BOUNTY_STATE_CHANGED} from "../integrations/telegram/messages";
 import {Push} from "../services/analytics/push";
 import {AnalyticEventName} from "../services/analytics/types/events";
 import updateSeoCardBounty from "src/modules/handle-seo-card";
-import {Op} from "sequelize";
+import {Op, Sequelize} from "sequelize";
 
 export const name = "getBountyPullRequestReadyForReviewEvents";
 export const schedule = "*/12 * * * *";
@@ -22,7 +22,6 @@ export async function action(block: DecodedLog<BountyPullRequestReadyForReviewEv
 
   const {returnValues: {bountyId, pullRequestId}, connection, address, chainId} = block;
 
-
   const bounty = await getBountyFromChain(connection, address, bountyId, name);
   if (!bounty)
     return eventsProcessed;
@@ -42,25 +41,23 @@ export async function action(block: DecodedLog<BountyPullRequestReadyForReviewEv
     return eventsProcessed;
   }
 
-
   const pullRequest = bounty.pullRequests[pullRequestId];
 
   const dbDeliverable = await db.deliverables.findOne({
-    where: {id: pullRequest.cid},
+    where: {id: pullRequest.cid, markedReadyForReview: false},
     include: {association: 'user'}
-  })
+  });
 
   if (!dbDeliverable) {
     logger.warn(`${name} No deliverable found with "draft" and id ${pullRequest.cid}, maybe it was already parsed?`);
     return eventsProcessed;
   }
 
-  dbDeliverable.canceled = pullRequest.canceled
-  dbDeliverable.markedReadyForReview = pullRequest?.ready
+  dbDeliverable.canceled = pullRequest.canceled;
+  dbDeliverable.markedReadyForReview = pullRequest?.ready;
 
   await dbDeliverable.save();
 
-
   if (!["canceled", "closed", "proposal"].includes(dbBounty.state!)) {
     dbBounty.state = "ready";
     await dbBounty.save();
@@ -77,12 +74,29 @@ export async function action(block: DecodedLog<BountyPullRequestReadyForReviewEv
   (async () => {
     const owner = await dbBounty!.getUser({attributes: ["email", "id"], include:[{ association: "user_settings" }] });
 
-    const curators = await dbBounty!.network.getCurators({
-      include: [{association: "user", attributes: ["email", "id"], include:[{association: "user_settings"}]}],
-        where: {userId: {[Op.not]: owner.id }, isCurrentlyCurator: true}
+    const curators = await db.curators.findAll({
+      include: [
+        {
+          association: "user", 
+          required: true,
+          attributes: ["email", "id"],
+          where: {
+            id: { 
+              [Op.not]: owner.id
+            },
+          },
+          on: Sequelize.where(Sequelize.fn("lower", Sequelize.col("curators.address")),
+                              "=",
+                              Sequelize.fn("lower", Sequelize.col("user.address"))),
+        }
+      ],
+      where: {
+        networkId: dbBounty.network_id,
+        isCurrentlyCurator: true
+      }
     });
 
-    const targets = curators.map(curators => curators.user.get())
+    const targets = curators.map(curators => curators.user);
 
     const AnalyticEvent = {
       name: AnalyticEventName.PULL_REQUEST_READY,
@@ -92,12 +106,13 @@ export async function action(block: DecodedLog<BountyPullRequestReadyForReviewEv
         deliverableId: dbDeliverable.id, deliverableContractId: pullRequestId,
         actor: pullRequest.creator,
       }
-    }
+    };
 
     const NotificationEvent = {
       name: AnalyticEventName.NOTIF_DELIVERABLE_READY,
       params: {
         targets: [...targets, owner],
+        bountyId: dbBounty.id,
         creator: {
           address: dbDeliverable.user.address,
           id: dbDeliverable.user.id,
@@ -114,9 +129,9 @@ export async function action(block: DecodedLog<BountyPullRequestReadyForReviewEv
           link: `${dbBounty.network.name}/task/${dbBounty.id}/deliverable/${dbDeliverable.id}`
         }
       }
-    }
+    };
 
-    Push.events([AnalyticEvent, NotificationEvent])
+    Push.events([AnalyticEvent, NotificationEvent]);
   })()
 
 

src/db/models/init-models.ts

@@ -33,6 +33,8 @@ import { network_tokens as _network_tokens } from "./network_tokens";
 import type { network_tokensAttributes, network_tokensCreationAttributes } from "./network_tokens";
 import { networks as _networks } from "./networks";
 import type { networksAttributes, networksCreationAttributes } from "./networks";
+import { notification_settings as _notification_settings } from "./notification_settings";
+import type { notification_settingsAttributes, notification_settingsCreationAttributes } from "./notification_settings";
 import { notifications as _notifications } from "./notifications";
 import type { notificationsAttributes, notificationsCreationAttributes } from "./notifications";
 import { points_base as _points_base } from "./points_base";
@@ -72,6 +74,7 @@ export {
   _merge_proposals as merge_proposals,
   _network_tokens as network_tokens,
   _networks as networks,
+  _notification_settings as notification_settings,
   _notifications as notifications,
   _points_base as points_base,
   _points_events as points_events,
@@ -119,6 +122,8 @@ export type {
   network_tokensCreationAttributes,
   networksAttributes,
   networksCreationAttributes,
+  notification_settingsAttributes,
+  notification_settingsCreationAttributes,
   notificationsAttributes,
   notificationsCreationAttributes,
   points_baseAttributes,
@@ -159,6 +164,7 @@ export function initModels(sequelize: Sequelize) {
   const merge_proposals = _merge_proposals.initModel(sequelize);
   const network_tokens = _network_tokens.initModel(sequelize);
   const networks = _networks.initModel(sequelize);
+  const notification_settings = _notification_settings.initModel(sequelize);
   const notifications = _notifications.initModel(sequelize);
   const points_base = _points_base.initModel(sequelize);
   const points_events = _points_events.initModel(sequelize);
@@ -240,6 +246,8 @@ export function initModels(sequelize: Sequelize) {
   users.hasMany(issues, { as: "issues", foreignKey: "userId"});
   kyc_sessions.belongsTo(users, { as: "user", foreignKey: "user_id"});
   users.hasMany(kyc_sessions, { as: "kyc_sessions", foreignKey: "user_id"});
+  notification_settings.belongsTo(users, { as: "user", foreignKey: "userId"});
+  users.hasOne(notification_settings, { as: "notification_setting", foreignKey: "userId"});
   notifications.belongsTo(users, { as: "user", foreignKey: "userId"});
   users.hasMany(notifications, { as: "notifications", foreignKey: "userId"});
   points_events.belongsTo(users, { as: "user", foreignKey: "userId"});
@@ -267,6 +275,7 @@ export function initModels(sequelize: Sequelize) {
     merge_proposals: merge_proposals,
     network_tokens: network_tokens,
     networks: networks,
+    notification_settings: notification_settings,
     notifications: notifications,
     points_base: points_base,
     points_events: points_events,