Address pr review comments

- addressed pr review comments
- removed redundant filtering in FlyerRepo
- added checks for null return values in FlyerRepo
- alphabetized imports and exports

src/entities/Flyer.ts

@@ -19,10 +19,6 @@ export class Flyer {
   @Property()
   imageURL: string;
 
-  @Field()
-  @Property()
-  isFiltered: boolean;
-
   @Field()
   @Property({ default: false })
   isTrending: boolean;

src/repos/FlyerRepo.ts

@@ -1,23 +1,20 @@
 import Filter from 'bad-words';
-import { ObjectId } from 'mongodb';
 import Fuse from 'fuse.js';
-import { Flyer, FlyerModel } from '../entities/Flyer';
+
+import { ObjectId } from 'mongodb';
 import {
   DEFAULT_LIMIT,
   DEFAULT_OFFSET,
   FILTERED_WORDS,
   MAX_NUM_DAYS_OF_TRENDING_ARTICLES,
 } from '../common/constants';
+import { Flyer, FlyerModel } from '../entities/Flyer';
 import { OrganizationModel } from '../entities/Organization';
 
 const { IS_FILTER_ACTIVE } = process.env;
 
 function isFlyerFiltered(flyer: Flyer) {
   if (IS_FILTER_ACTIVE === 'true') {
-    if (flyer.isFiltered) {
-      // If the body has been checked already in microservice
-      return true;
-    }
     const filter = new Filter({ list: FILTERED_WORDS });
     return filter.isProfane(flyer.title);
   }
@@ -91,7 +88,7 @@ const getFlyersByOrganizationID = async (
     .skip(offset)
     .limit(limit)
     .then((flyers) => {
-      return flyers.filter((flyer) => !isFlyerFiltered(flyer));
+      return flyers.filter((flyer) => flyer !== null && !isFlyerFiltered(flyer));
     });
 };
 
@@ -101,7 +98,6 @@ const getFlyersByOrganizationIDs = async (
   offset: number = DEFAULT_OFFSET,
 ): Promise<Flyer[]> => {
   const uniqueOrgIDs = [...new Set(organizationIDs)].map((id) => new ObjectId(id));
-  console.log(uniqueOrgIDs);
   const orgSlugs = await OrganizationModel.find({ _id: { $in: uniqueOrgIDs } }).select('slug');
   return getFlyersByOrganizationSlugs(
     orgSlugs.map((org) => org.slug),
@@ -120,7 +116,7 @@ const getFlyersAfterDate = async (since: string, limit = DEFAULT_LIMIT): Promise
       .sort({ date: 'desc' })
       .limit(limit)
       .then((flyers) => {
-        return flyers.filter((flyer) => !isFlyerFiltered(flyer));
+        return flyers.filter((flyer) => flyer !== null && !isFlyerFiltered(flyer));
       })
   );
 };
@@ -222,8 +218,8 @@ export default {
   getFlyersByOrganizationIDs,
   getFlyersByOrganizationSlug,
   getFlyersByOrganizationSlugs,
-  searchFlyers,
   getTrendingFlyers,
   incrementShoutouts,
   refreshTrendingFlyers,
+  searchFlyers,
 };