Merge pull request #162 from mia-ajuda/fix/wrong-helpoffer-return

HOTFIX - Tela de minhas ofertas quebrando
mia-ajuda · Jul 8, 2023 · 5dddb0e · 5dddb0e
2 parents 00b3e1c + 37f484b
commit 5dddb0e
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 12 deletions.
diff --git a/src/models/Campaign.js b/src/models/Campaign.js
@@ -52,6 +52,11 @@ const campaignSchema = new mongoose.Schema({
     index: '2dsphere',
     required: false,
   },
+  index: {
+    type: Number,
+    default: 1,
+    unique: true,
+  },
 },
 {
   collection: 'campaign',
@@ -91,7 +96,11 @@ campaignSchema.virtual('distances')
 
 campaignSchema.virtual('distanceValue')
   .get(() => this.distanceValue);
+
 campaignSchema.virtual('distance')
   .get(() => this.distance);
 
+campaignSchema.virtual('type')
+  .get(() => 'campaign');
+
 module.exports = mongoose.model('Campaign', campaignSchema);
diff --git a/src/models/Help.js b/src/models/Help.js
@@ -63,6 +63,11 @@ const helpSchema = new mongoose.Schema(
       index: '2dsphere',
       required: false,
     },
+    index: {
+      type: Number,
+      default: 1,
+      unique: true,
+    },
   },
   {
     collection: 'userHelp',
@@ -103,7 +108,11 @@ helpSchema.virtual('distances')
 
 helpSchema.virtual('distanceValue')
   .get(() => this.distanceValue);
+
 helpSchema.virtual('distance')
   .get(() => this.distance);
 
+helpSchema.virtual('type')
+  .get(() => 'help');
+
 module.exports = mongoose.model('Help', helpSchema);
diff --git a/src/models/HelpOffer.js b/src/models/HelpOffer.js
@@ -60,6 +60,11 @@ const offeredHelpSchema = new Schema(
       index: '2dsphere',
       required: false,
     },
+    index: {
+      type: Number,
+      default: 1,
+      unique: true,
+    },
   },
   {
     collection: 'helpOffer',
@@ -111,4 +116,6 @@ offeredHelpSchema.virtual('distanceValue')
 offeredHelpSchema.virtual('distance')
   .get(() => this.distance);
 
+offeredHelpSchema.virtual('type').get(() => 'offer');
+
 module.exports = model('OfferedHelp', offeredHelpSchema);
diff --git a/src/repository/CampaignRepository.js b/src/repository/CampaignRepository.js
@@ -3,7 +3,6 @@ const BaseRepository = require('./BaseRepository');
 const Campaign = require('../models/Campaign');
 const EntitySchema = require('../models/Entity');
 const getLocation = require('../utils/getLocation');
-const addHelpTypeToList = require('../utils/addHelpTypeToList');
 
 class CampaignRepository extends BaseRepository {
   constructor() {
@@ -67,7 +66,7 @@ class CampaignRepository extends BaseRepository {
 
     campaignsWithDistances.sort((a, b) => a.distanceValue - b.distanceValue);
 
-    return addHelpTypeToList(campaignsWithDistances, 'campaign');
+    return campaignsWithDistances;
   }
 
   async getCampaignListByStatus(userId, statusList) {

diff --git a/src/repository/HelpOfferRepository.js b/src/repository/HelpOfferRepository.js
@@ -2,7 +2,6 @@ const { ObjectID } = require('mongodb');
 const BaseRepository = require('./BaseRepository');
 const OfferedHelp = require('../models/HelpOffer');
 const getLocation = require('../utils/getLocation');
-const addHelpTypeToList = require('../utils/addHelpTypeToList');
 
 class OfferdHelpRepository extends BaseRepository {
   constructor() {
@@ -89,6 +88,7 @@ class OfferdHelpRepository extends BaseRepository {
       'creationDate',
       'location',
       'description',
+      'index',
     ];
     const sort = { creationDate: -1 };
     const user = {
@@ -110,7 +110,7 @@ class OfferdHelpRepository extends BaseRepository {
 
     const populate = [user, categories, possibleHelpedUsers, possibleEntities];
 
-    let helpOffers = await super.$list(matchQuery, helpOfferFields, populate, sort);
+    const helpOffers = await super.$list(matchQuery, helpOfferFields, populate, sort);
 
     if (coords) {
       const helpOffersWithDistances = helpOffers.map((offer) => {
@@ -121,10 +121,9 @@ class OfferdHelpRepository extends BaseRepository {
 
       helpOffersWithDistances.sort((a, b) => a.distanceValue - b.distanceValue);
 
-      helpOffers = helpOffersWithDistances;
+      return helpOffersWithDistances;
     }
-
-    return addHelpTypeToList(helpOffers, 'offer');
+    return helpOffers;
   }
 
   getHelpOfferListQuery(

diff --git a/src/repository/HelpRepository.js b/src/repository/HelpRepository.js
@@ -3,7 +3,6 @@ const { ObjectID } = require('mongodb');
 const BaseRepository = require('./BaseRepository');
 const HelpSchema = require('../models/Help');
 const getLocation = require('../utils/getLocation');
-const addHelpTypeToList = require('../utils/addHelpTypeToList');
 
 class HelpRepository extends BaseRepository {
   constructor() {
@@ -115,6 +114,7 @@ class HelpRepository extends BaseRepository {
       'ownerId',
       'creationDate',
       'location',
+      'index',
     ];
     const user = {
       path: 'user',
@@ -133,7 +133,7 @@ class HelpRepository extends BaseRepository {
 
     helpsWithDistance.sort((a, b) => a.distanceValue - b.distanceValue);
 
-    return addHelpTypeToList(helpsWithDistance, 'help');
+    return helpsWithDistance;
   }
 
   async countDocuments(id) {

diff --git a/src/services/SocialNetworkService.js b/src/services/SocialNetworkService.js
@@ -114,7 +114,6 @@ class SocialNetworkService {
     );
 
     const offers = await this.offerdHelpRepository.list(
-      null,
       userId,
       false,
       categoryArray,

diff --git a/src/utils/addHelpTypeToList.js b/src/utils/addHelpTypeToList.js
diff --git a/src/utils/seed/HelpOfferCampaignSeed.js b/src/utils/seed/HelpOfferCampaignSeed.js
@@ -8,6 +8,7 @@ const Campaign = require('../../models/Campaign');
 const HelpOffer = require('../../models/HelpOffer');
 const mockedOfferInfo = require('./mockedInfos/mockedOfferInfo');
 const mockedHelpInfo = require('./mockedInfos/mockedHelpInfo');
+const addIndexToOldActivities = require('./addIndexToOldActivities');
 
 const status = [
   'waiting',
@@ -32,6 +33,10 @@ const seedHelp = async () => {
       || helpOfferCollection.length > 0
       || campaignCollection.length > 0
     ) {
+      // this will be removed after first run in production
+      addIndexToOldActivities(helpCollection);
+      addIndexToOldActivities(helpOfferCollection);
+      addIndexToOldActivities(campaignCollection);
       return;
     }
 

diff --git a/src/utils/seed/addIndexToOldActivities.js b/src/utils/seed/addIndexToOldActivities.js
@@ -0,0 +1,7 @@
+const addIndexToOldActivities = async (activityList) => {
+  activityList.forEach(async (activity, index) => {
+    activity.index = index;
+    await activity.save();
+  });
+};
+module.exports = addIndexToOldActivities;
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,6 @@ class SocialNetworkService { @@
         );
         const offers = await this.offerdHelpRepository.list(
-          null,
           userId,
           false,
           categoryArray,
@@ Expand Down @@