Merge pull request #406 from smile0711:access-updates-and-issue-369

Access updates and issue 369

Author: smile0711

api/src/repositories/place/place.repository.ts

@@ -2,14 +2,14 @@ import { Service } from 'typedi';
 
 import { Db } from '../../db/db.class';
 import { knex } from '../../db';
-import {Place, Store} from '../../types/models';
+import { Place, Store } from '../../types/models';
 
 /** Repository for fetching/interacting with place data in the database. */
 @Service()
 export class PlaceRepository {
 
-  constructor(private db: Db) {}
-  
+  constructor(private db: Db) { }
+
   /**
    * Count number of clubs where type is Public or Private
    * and where member_id is equal to the member_id
@@ -20,11 +20,12 @@ export class PlaceRepository {
     const count = await knex
       .from('place')
       .count('id as count')
-      .where({member_id: memberId})
+      .where({ member_id: memberId })
+      .andWhere('status', 1)
       .whereIn('type', ['club']);
     return count[0].count;
   }
-  
+
   /**
    * Finds a place record with the given id.
    * @param id id of place to look for
@@ -42,10 +43,10 @@ export class PlaceRepository {
   public async findAllStores(orderBy: string): Promise<Store[]> {
     return this.db.knex
       .table('place')
-      .where({type: 'shop', status: 1})
-      .orderBy(orderBy,'asc');
+      .where({ type: 'shop', status: 1 })
+      .orderBy(orderBy, 'asc');
   }
-  
+
   /**
    * Finds a place record with the given name
    * @param name name of place to look for
@@ -68,7 +69,7 @@ export class PlaceRepository {
   public async findStorageByUserID(memberId: number): Promise<any> {
     return this.db.place
       .select('place.name', 'place.id')
-      .where({type: 'storage', member_id: memberId, status: 1})
+      .where({ type: 'storage', member_id: memberId, status: 1 })
       .orderBy('place.name', 'asc');
   }
 
@@ -146,16 +147,16 @@ export class PlaceRepository {
     limit: number,
     offset: number): Promise<any> {
     return this.db.place
-      .where('type',compare, type)
+      .where('type', compare, type)
       .where(this.like('name', search))
       .limit(limit)
       .offset(offset);
   }
-  
+
   public searchClubs(
-    search: string, 
-    limit: number, 
-    offset: number, 
+    search: string,
+    limit: number,
+    offset: number,
     orderBy: string,
     order: string,
   ): Promise<any> {
@@ -178,7 +179,7 @@ export class PlaceRepository {
       .limit(limit)
       .offset(offset);
   }
-  
+
   public async searchClubsTotal(search: string): Promise<any> {
     return this.db.place
       .count('id as count')
@@ -196,19 +197,19 @@ export class PlaceRepository {
   public async getSearchTotal(search: string, compare: string, type: string): Promise<any> {
     return this.db.place
       .count('id as count')
-      .where('type',compare, type)
+      .where('type', compare, type)
       .where(this.like('place.name', search));
   }
 
-  public async getUserPlaceTotal(id:number,type: string): Promise<any> {
+  public async getUserPlaceTotal(id: number, type: string): Promise<any> {
     return await this.db.place
       .count('id as count')
       .where('type', type)
       .andWhere('member_id', id);
   }
 
   private like(field: string, value: string) {
-    return function() {
+    return function () {
       this.whereRaw('?? LIKE ?', [field, `%${value}%`]);
     };
   }

api/src/services/colony/colony.service.ts

@@ -8,7 +8,7 @@ import {
 } from '../../repositories';
 import { Place } from '../../types/models';
 import * as console from 'console';
-import {includes} from 'lodash';
+import { includes } from 'lodash';
 
 /** Service for dealing with colony */
 @Service()
@@ -18,16 +18,16 @@ export class ColonyService {
     private roleAssignmentRepository: RoleAssignmentRepository,
     private roleRepository: RoleRepository,
     private memberRepository: MemberRepository,
-  ) {}
-  
+  ) { }
+
   public async find(colonyId: number): Promise<Place> {
     return await this.colonyRepository.find(colonyId);
   }
 
   public async getHoods(colonyId: number): Promise<any> {
     return await this.colonyRepository.getHoods(colonyId);
   }
-  
+
   public async getAccessInfoByUsername(colonyId: number): Promise<object> {
     const deputyCode = await this.roleRepository.roleMap.ColonyDeputy;
     const ownerCode = await this.roleRepository.roleMap.ColonyLeader;
@@ -50,8 +50,8 @@ export class ColonyService {
     const ownerCode = await this.roleRepository.roleMap.ColonyLeader;
     let oldOwner = null;
     let newOwner = 0;
-    const oldDeputies = [0,0,0,0,0,0,0,0];
-    const newDeputies = [0,0,0,0,0,0,0,0];
+    const oldDeputies = [0, 0, 0, 0, 0, 0, 0, 0];
+    const newDeputies = [0, 0, 0, 0, 0, 0, 0, 0];
     const data = await this
       .roleAssignmentRepository
       .getAccessInfoByID(colonyId, ownerCode, deputyCode);
@@ -72,8 +72,8 @@ export class ColonyService {
         const response: any = await this.memberRepository.getPrimaryRoleName(oldOwner);
         if (response.length !== 0) {
           const primaryRoleId = response[0].primary_role_id;
-          if (ownerCode === primaryRoleId){
-            await this.memberRepository.update(oldOwner, {primary_role_id: null});
+          if (ownerCode === primaryRoleId) {
+            await this.memberRepository.update(oldOwner, { primary_role_id: null });
           }
         }
       }
@@ -84,8 +84,8 @@ export class ColonyService {
         const response: any = await this.memberRepository.getPrimaryRoleName(oldOwner);
         if (response.length !== 0) {
           const primaryRoleId = response[0].primary_role_id;
-          if (ownerCode === primaryRoleId){
-            await this.memberRepository.update(oldOwner, {primary_role_id: null});
+          if (ownerCode === primaryRoleId) {
+            await this.memberRepository.update(oldOwner, { primary_role_id: null });
           }
         }
       }
@@ -110,7 +110,7 @@ export class ColonyService {
                 if (response.length !== 0) {
                   const primaryRoleId = response[0].primary_role_id;
                   if (primaryRoleId && deputyCode === primaryRoleId) {
-                    this.memberRepository.update(oldDeputies, {primary_role_id: null});
+                    this.memberRepository.update(oldDeputies, { primary_role_id: null });
                   }
                 }
               });
@@ -123,7 +123,7 @@ export class ColonyService {
                 if (response.length !== 0) {
                   const primaryRoleId = response[0].primary_role_id;
                   if (deputyCode === primaryRoleId) {
-                    this.memberRepository.update(oldDeputies, {primary_role_id: null});
+                    this.memberRepository.update(oldDeputies, { primary_role_id: null });
                   }
                 }
               });
@@ -146,8 +146,6 @@ export class ColonyService {
         return (
           [
             this.roleRepository.roleMap.Admin,
-            this.roleRepository.roleMap.CityMayor,
-            this.roleRepository.roleMap.DeputyMayor,
             this.roleRepository.roleMap.ColonyRepresentative,
           ].includes(assignment.role_id) ||
           ([

api/src/services/inbox/inbox.service.ts

@@ -1,30 +1,25 @@
 import { Service } from 'typedi';
 
-import { InboxRepository, ColonyRepository } from '../../repositories';
+import { InboxRepository } from '../../repositories';
 import sanitizeHtml from 'sanitize-html';
-import { stringify } from 'ts-jest';
-import {forEach} from 'lodash';
 
 /** Service for dealing with messages on message boards */
 @Service()
 export class InboxService {
-  public static readonly MAX_QUERY_LIMIT = 1000;
-  public static readonly VALID_ORDERS = ['id', 'date'];
-  public static readonly VALID_ORDER_DIRECTIONS = ['asc', 'desc'];
 
-  constructor(private inboxRepository: InboxRepository) {}
+  constructor(private inboxRepository: InboxRepository) { }
 
   public async changeInboxIntro(placeId, Intro): Promise<any> {
     console.log(`Service${placeId}`);
     return await this.inboxRepository.changeInboxIntro(placeId, Intro);
   }
 
- public async deleteInboxMessages(
-   messageIds: number[],
-   placeId: number,
- ): Promise<any> {
-   return this.inboxRepository.deleteInboxMessages(messageIds, placeId);
- }
+  public async deleteInboxMessages(
+    messageIds: number[],
+    placeId: number,
+  ): Promise<any> {
+    return this.inboxRepository.deleteInboxMessages(messageIds, placeId);
+  }
 
   public async getAdminInfo(placeId, memberId): Promise<any> {
     return await this.inboxRepository.getAdminInfo(placeId, memberId);
@@ -45,7 +40,7 @@ export class InboxService {
   ): Promise<any> {
     return await this.inboxRepository.postInboxMessage(memberId, placeId, subject, message);
   }
-  
+
   public async postInboxAllMessage(
     memberId: number,
     locations: number[],
@@ -80,8 +75,6 @@ export class InboxService {
     );
   }
 
-
-
   public async sanitize(uncleanInfo: string): Promise<any> {
     const cleanInfo = sanitizeHtml(uncleanInfo, {
       allowedTags: [
@@ -167,8 +160,8 @@ export class InboxService {
         a: ['href', 'name', 'target'],
         img: ['src', 'srcset', 'alt', 'title', 'width', 'height', 'usemap'],
         font: ['color', 'size'],
-        map: [ 'name' ],
-        area: [ 'alt', 'title', 'href', 'coords', 'shape', 'target', 'class' ],
+        map: ['name'],
+        area: ['alt', 'title', 'href', 'coords', 'shape', 'target', 'class'],
         marquee: ['width', 'height', 'direction'],
       },
     });