Add info column to points events (#204)

* update models

* save info

* save info

* add more info

* save tokens prices too

Author: vhcsilva

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

@@ -115,9 +115,19 @@ export async function action(block: DecodedLog, query?: EventsQuery): Promise<Ev
   updateLeaderboardProposals("accepted");
   updateBountiesHeader();
   updateSeoCardBounty(dbBounty.id, name);
-  savePointEvent("accepted_proposal", transaction.from);
-  savePointEvent("created_proposal", dbProposal.creator!);
-  savePointEvent("created_deliverable", deliverable.user.address!);
+  savePointEvent("accepted_proposal", transaction.from, { 
+    taskId: dbBounty.id, 
+    proposalId: dbProposal.id, 
+    merger: transaction.from 
+  });
+  savePointEvent("created_proposal", dbProposal.creator!, { 
+    taskId: dbBounty.id, 
+    proposalId: dbProposal.id,
+  });
+  savePointEvent("created_deliverable", deliverable.user.address!, { 
+    taskId: dbBounty.id, 
+    deliverableId: deliverable.id,
+  });
 
   eventsProcessed[network.name!] = {
     [dbBounty.id!.toString()]: {bounty: dbBounty, eventBlock: parseLogWithContext(block)}

src/actions/get-bounty-moved-to-open.ts

@@ -88,7 +88,8 @@ export async function action(query?: EventsQuery): Promise<EventsProcessed> {
           const tokenPrice = await getOrUpdateLastTokenPrice(dbBounty.transactionalTokenId!, currency);
 
           await savePointEvent( "created_task", 
-                                dbBounty.user.address!,
+                                dbBounty.user.address!, 
+                                { taskId: dbBounty.id, taskAmount: dbBounty.amount, tokenPrice, currency },
                                 (pointsPerAction, scalingFactor) => pointsPerAction * scalingFactor * +dbBounty.amount! * tokenPrice);
 
           eventsProcessed[networkName!] = {

src/actions/get-network-registered-events.ts

@@ -49,7 +49,7 @@ export async function action(block: DecodedLog<NetworkCreatedEvent['returnValues
 
   await network.save();
 
-  savePointEvent("created_marketplace", creator);
+  savePointEvent("created_marketplace", creator, { networkId: network.id });
 
   updateNumberOfNetworkHeader();
 

src/actions/points-system/save-delegated-tokens-events.ts

@@ -17,22 +17,33 @@ export async function action() {
   const delegations = await db.delegations.findAll({
     include: [
       {
-        association: "network"
+        association: "network",
+        include: [
+          { association: "network_token_token" }
+        ]
       }
     ],
   });
 
   const totalConvertedByCurator = {};
+  const tokensPrices = {};
 
   for (const delegation of delegations) {
     const tokenPrice = await getOrUpdateLastTokenPrice(delegation.network.network_token_id!);
     const convertedAmount = +delegation.amount! * tokenPrice;
+    tokensPrices[delegation.network.network_token_token.symbol] = tokenPrice;
     totalConvertedByCurator[delegation.from] = (totalConvertedByCurator[delegation.from] || 0) + convertedAmount;
   }
 
   for (const address in totalConvertedByCurator) {
     await savePointEvent( "delegated",
                           address,
+                          { 
+                            tokensPrices,
+                            delegations: delegations
+                              .filter(c => c.from.toLowerCase() === address.toLowerCase())
+                              .map(({ from, to, amount, networkId }) => ({ from, to, amount, networkId })) 
+                          },
                           (pointsPerAction, scalingFActor) => pointsPerAction * scalingFActor * totalConvertedByCurator[address]);
   }
 

src/actions/points-system/save-locked-tokens-events.ts

@@ -22,22 +22,33 @@ export async function action() {
     },
     include: [
       {
-        association: "network"
+        association: "network",
+        include: [
+          { association: "network_token_token" }
+        ]
       }
     ],
   });
 
   const totalConvertedByCurator = {};
+  const tokensPrices = {};
 
   for (const curator of curators) {
     const tokenPrice = await getOrUpdateLastTokenPrice(curator.network.network_token_id!);
     const convertedAmount = +curator.tokensLocked! * tokenPrice;
+    tokensPrices[curator.network.network_token_token.symbol] = tokenPrice;
     totalConvertedByCurator[curator.address] = (totalConvertedByCurator[curator.address] || 0) + convertedAmount;
   }
 
   for (const address in totalConvertedByCurator) {
     await savePointEvent( "locked",
                           address,
+                          { 
+                            tokensPrices,
+                            curators: curators
+                              .filter(c => c.address.toLowerCase() === address.toLowerCase())
+                              .map(({ tokensLocked, networkId }) => ({ tokensLocked, networkId })) 
+                          },
                           (pointsPerAction, scalingFActor) => pointsPerAction * scalingFActor * totalConvertedByCurator[address]);
   }
 

src/db/models/points_events.ts

@@ -11,11 +11,12 @@ export interface points_eventsAttributes {
   pointsCounted?: boolean;
   createdAt: Date;
   updatedAt: Date;
+  info?: object;
 }
 
 export type points_eventsPk = "id";
 export type points_eventsId = points_events[points_eventsPk];
-export type points_eventsOptionalAttributes = "id" | "pointsCounted" | "createdAt" | "updatedAt";
+export type points_eventsOptionalAttributes = "id" | "pointsCounted" | "createdAt" | "updatedAt" | "info";
 export type points_eventsCreationAttributes = Optional<points_eventsAttributes, points_eventsOptionalAttributes>;
 
 export class points_events extends Model<points_eventsAttributes, points_eventsCreationAttributes> implements points_eventsAttributes {
@@ -26,6 +27,7 @@ export class points_events extends Model<points_eventsAttributes, points_eventsC
   pointsCounted?: boolean;
   createdAt!: Date;
   updatedAt!: Date;
+  info?: object;
 
   // points_events belongsTo points_base via actionName
   actionName_points_base!: points_base;
@@ -70,6 +72,10 @@ export class points_events extends Model<points_eventsAttributes, points_eventsC
       type: DataTypes.BOOLEAN,
       allowNull: true,
       defaultValue: false
+    },
+    info: {
+      type: DataTypes.JSON,
+      allowNull: true
     }
   }, {
     tableName: 'points_events',

src/db/models/users.ts

@@ -21,14 +21,14 @@ export interface usersAttributes {
   isEmailConfirmed?: boolean;
   emailVerificationCode?: string;
   emailVerificationSentAt?: Date;
+  totalPoints?: number;
   githubLink?: string;
   linkedInLink?: string;
-  totalPoints?: number;
 }
 
 export type usersPk = "id";
 export type usersId = users[usersPk];
-export type usersOptionalAttributes = "id" | "address" | "createdAt" | "updatedAt" | "handle" | "resetedAt" | "email" | "isEmailConfirmed" | "emailVerificationCode" | "emailVerificationSentAt" | "githubLink" | "linkedInLink" | "totalPoints";
+export type usersOptionalAttributes = "id" | "address" | "createdAt" | "updatedAt" | "handle" | "resetedAt" | "email" | "isEmailConfirmed" | "emailVerificationCode" | "emailVerificationSentAt" | "totalPoints" | "githubLink" | "linkedInLink";
 export type usersCreationAttributes = Optional<usersAttributes, usersOptionalAttributes>;
 
 export class users extends Model<usersAttributes, usersCreationAttributes> implements usersAttributes {
@@ -42,9 +42,9 @@ export class users extends Model<usersAttributes, usersCreationAttributes> imple
   isEmailConfirmed?: boolean;
   emailVerificationCode?: string;
   emailVerificationSentAt?: Date;
+  totalPoints?: number;
   githubLink?: string;
   linkedInLink?: string;
-  totalPoints?: number;
 
   // users hasMany comments via userId
   comments!: comments[];
@@ -195,18 +195,18 @@ export class users extends Model<usersAttributes, usersCreationAttributes> imple
       type: DataTypes.DATE,
       allowNull: true
     },
+    totalPoints: {
+      type: DataTypes.DOUBLE,
+      allowNull: true,
+      defaultValue: 0
+    },
     githubLink: {
       type: DataTypes.STRING(255),
       allowNull: true
     },
     linkedInLink: {
       type: DataTypes.STRING(255),
       allowNull: true
-    },
-    totalPoints: {
-      type: DataTypes.DOUBLE,
-      allowNull: true,
-      defaultValue: 0
     }
   }, {
     tableName: 'users',

src/modules/points-system/save-point-event.ts

@@ -7,7 +7,8 @@ type PointsEvents = "locked" | "delegated" | "created_marketplace" | "created_ta
   "created_proposal" | "accepted_proposal";
 
 export async function savePointEvent( event: PointsEvents, 
-                                      participantAddress: string, 
+                                      participantAddress: string,
+                                      info = {},
                                       calculateFunction = (pointsPerAction: number, scalingFactor: number) => pointsPerAction * scalingFactor ) {
   const pointsBase = await db.points_base.findOne({
     where: {
@@ -52,6 +53,7 @@ export async function savePointEvent( event: PointsEvents,
     userId: user.id,
     actionName: pointsBase.actionName,
     pointsWon: calculateFunction(pointsBase.pointsPerAction, pointsBase.scalingFactor || 1),
+    info,
   };
 
   await db.points_events.create(newEvent);