Develop (#20)

* feat: add reward convertation #15 (#16) * chore: remove unused * 1.3.0 * feat: do not lower rewards after gem chops (#19) * fix: price calcilation * hotfix: class/model names in forks (#22) * Fix forks (#23) * hotfix: class/model names in forks * feat: update deps, migrate to new fork manager * hotfix: models Co-authored-by: Igor Tkachenko <[email protected]>
communcom · Jul 21, 2020 · b007a1a · b007a1a
1 parent 439f25f
commit b007a1a
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 426 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "bytebuffer": "^5.0.1",
-    "cyberway-core-service": "^3.58.4",
+    "cyberway-core-service": "^3.59.3",
     "cyberwayjs": "^20.0.0-beta7",
     "eosjs-ecc": "latest",
     "mongodb": "^3.2.7",

diff --git a/src/controllers/Community.js b/src/controllers/Community.js
@@ -13,7 +13,7 @@ class Community extends BasicService {
 
         await this.registerForkChanges({
             type: 'create',
-            Model: CommunityModel,
+            Model: Community,
             documentId: newCommunity._id,
         });
     }
@@ -53,7 +53,7 @@ class Community extends BasicService {
 
         await this.registerForkChanges({
             type: 'update',
-            Model: CommunityModel,
+            Model: Community,
             documentId: previousModel._id,
             data: {
                 $set: {

diff --git a/src/controllers/Gallery.js b/src/controllers/Gallery.js
@@ -139,19 +139,27 @@ class Gallery extends Service {
     async handleMosaicState(state) {
         const { tracery } = state;
 
+        const collectionEnd = state.collection_end_date + 'Z';
+
+        let displayReward;
+        if (new Date(collectionEnd) > Date.now()) {
+            displayReward = state.reward;
+        }
+
         const previousModel = await Mosaic.findOneAndUpdate(
             {
                 tracery,
             },
             {
                 $set: {
                     tracery,
-                    collectionEnd: state.collection_end_date + 'Z',
+                    collectionEnd,
                     gemCount: state.gem_count,
                     shares: state.shares,
                     damnShares: state.damn_shares,
                     reward: state.reward,
                     banned: state.banned,
+                    displayReward,
                 },
             }
         );
@@ -169,6 +177,8 @@ class Gallery extends Service {
                         damnShares: previousModel.damnShares,
                         reward: previousModel.reward,
                         banned: previousModel.banned,
+                        // do not change display reward if it hasn't been changed
+                        displayReward: displayReward ? previousModel.displayReward : undefined,
                     },
                 },
             });

diff --git a/src/controllers/connector/Gallery.js b/src/controllers/connector/Gallery.js
@@ -56,6 +56,7 @@ class Gallery extends BasicController {
                 $project: {
                     topCount: 1,
                     reward: 1,
+                    displayReward: 1,
                     collectionEnd: 1,
                     tracery: 1,
                     _id: 0,
@@ -71,7 +72,7 @@ class Gallery extends BasicController {
         for (const mosaic of mosaics) {
             if (userId) {
                 const gems = await Gem.find(
-                    { 'contentId.userId': userId, tracery: mosaic.tracery, isClaimable: true },
+                    { 'contentId.userId': userId, tracery: mosaic.tracery },
                     { reward: 1 },
                     { lean: true }
                 );
@@ -97,6 +98,21 @@ class Gallery extends BasicController {
                     };
                 }
             }
+
+            const [rewardAmount, symbol] = mosaic.reward.split(' ');
+
+            if (parseFloat(rewardAmount) && this.pointsPrices) {
+                const cmn = parseFloat(rewardAmount / this.pointsPrices.prices[symbol]).toFixed(4);
+
+                // TODO get from price feed
+                const usd = parseFloat(cmn * env.COMMUN_PRICE).toFixed(2);
+
+                mosaic.convertedReward = {
+                    cmn,
+                    usd,
+                };
+            }
+
             mosaic.isClosed = Date.now() - mosaic.collectionEnd >= 0;
             mosaic.contentId = traceryContentIdMap.get(mosaic.tracery);
         }

diff --git a/src/models/Fork.js b/src/models/Fork.js
diff --git a/src/models/Mosaic.js b/src/models/Mosaic.js
@@ -23,6 +23,9 @@ module.exports = MongoDB.makeModel(
         reward: {
             type: String,
         },
+        displayReward: {
+            type: String,
+        },
         banned: {
             type: Boolean,
         },

diff --git a/src/services/Fork.js b/src/services/Fork.js