Add Blackmarket Functionality

Adding functionality to the Blackmarket.
Add shared objects to Plaza
Removed unused code from Fleamarket

Author: SalleeMatthew

api/src/api.ts

@@ -7,6 +7,7 @@ import morgan from 'morgan';
 import {
   adminRoutes,
   avatarRoutes,
+  blackmarketRoutes,
   blockRoutes,
   clubRoutes,
   colonyRoutes,
@@ -63,6 +64,7 @@ app.use('/api/messageboard', messageboardRoutes);
 app.use('/api/admin', adminRoutes);
 app.use('/api/inbox', inboxRoutes);
 app.use('/api/mall', mallRoutes);
+app.use('/api/blackmarket', blackmarketRoutes);
 app.use('/api/fleamarket', fleamarketRoutes);
 app.use('/api/club', clubRoutes);
 app.use('/api/vote', voteRoutes);

api/src/controllers/blackmarket.controller.ts

@@ -0,0 +1,41 @@
+import { Request, Response } from 'express';
+import { Container } from 'typedi';
+
+import {
+  MemberService,
+  BlackMarketService,
+} from '../services';
+
+class BlackmarketController {
+  constructor(
+    private memberService: MemberService,
+    private blackMarketService: BlackMarketService,
+
+  ) {}
+
+  public async canAdmin(request: Request, response: Response): Promise<void> {
+    const { apitoken } = request.headers;
+
+    try {
+      const session = this.memberService.decodeMemberToken(<string>apitoken);
+      if (!session || !(await this.blackMarketService.canAdmin(session.id))) {
+        response.status(400).json({
+          error: 'Invalid or missing token or access denied.',
+        });
+        return;
+      }
+      response.status(200).json({ status: 'success' });
+    } catch (error) {
+      console.error(error);
+      response.status(400).json({ error });
+    }
+  }
+
+
+}
+const memberService = Container.get(MemberService);
+const blackmarketService = Container.get(BlackMarketService);
+export const blackmarketController = new BlackmarketController(
+  memberService,
+  blackmarketService,
+);

api/src/controllers/index.ts

@@ -1,5 +1,6 @@
 export * from './admin.controller';
 export * from './avatar.controller';
+export * from './blackmarket.controller';
 export * from './block.controller';
 export * from './club.controller';
 export * from './colony.controller';

api/src/controllers/object-instance.controller.ts

@@ -1,6 +1,11 @@
 import { Request, Response } from 'express';
 import { Container } from 'typedi';
-import { MemberService, ObjectInstanceService, PlaceService, FleaMarketService } from '../services';
+import { 
+  MemberService, 
+  ObjectInstanceService, 
+  PlaceService, 
+  FleaMarketService, 
+  BlackMarketService } from '../services';
 import * as badwords from 'badwords-list';
 
 class ObjectInstanceController {
@@ -9,6 +14,7 @@ class ObjectInstanceController {
     private placeService: PlaceService,
     private memberService: MemberService,
     private fleaMarketService: FleaMarketService,
+    private blackMarketService: BlackMarketService,
   ) {}
 
   /** Stores the position of an object instance in the database */
@@ -36,6 +42,9 @@ class ObjectInstanceController {
       if(place.slug === 'fleamarket'){
         adminStatus = await this.fleaMarketService.canAdmin(session.id);
       }
+      if(place.slug === 'blackmarket'){
+        adminStatus = await this.blackMarketService.canAdmin(session.id);
+      }
       if (!adminStatus && objectInstance.member_id != session.id) {
         throw new Error('Not the owner of this object');
       }
@@ -74,11 +83,14 @@ class ObjectInstanceController {
       const objectInstance = await this.objectInstanceService.find(id);
       const place = await this.placeService.findById(Number.parseInt(request.body.placeId));
 
-      if (place.slug !== 'fleamarket' && place.member_id != session.id) {
+      if (
+        place.slug !== 'fleamarket' && 
+        place.slug !== 'blackmarket' && 
+        place.member_id !== session.id) {
         throw new Error('Not the owner of this place');
       }
 
-      if (objectInstance.member_id != session.id) {
+      if (objectInstance.member_id !== session.id) {
         throw new Error('Not the owner of this object');
       }
 
@@ -235,7 +247,9 @@ class ObjectInstanceController {
       if(place.slug === 'fleamarket'){
         adminStatus = await this.fleaMarketService.canAdmin(session.id);
       }
-
+      if(place.slug === 'blackmarket'){
+        adminStatus = await this.blackMarketService.canAdmin(session.id);
+      }
       if (!adminStatus && objectInstance.member_id != session.id) {
         throw new Error('Not the owner of this object');
       }
@@ -251,9 +265,11 @@ const objectInstanceService = Container.get(ObjectInstanceService);
 const placeService = Container.get(PlaceService);
 const memberService = Container.get(MemberService);
 const fleaMarketService = Container.get(FleaMarketService);
+const blackMarketService = Container.get(BlackMarketService);
 export const objectInstanceController = new ObjectInstanceController(
   objectInstanceService,
   placeService,
   memberService,
   fleaMarketService,
+  blackMarketService,
 );

api/src/routes/blackmarket.routes.ts

@@ -0,0 +1,10 @@
+import Router from 'express';
+
+import { blackmarketController } from '../controllers';
+
+
+const blackmarketRoutes = Router();
+blackmarketRoutes.get('/can_admin', (request, response) => 
+  blackmarketController.canAdmin(request, response));
+
+export { blackmarketRoutes };

api/src/routes/index.ts

@@ -1,5 +1,6 @@
 export * from './admin.routes';
 export * from './avatar.routes';
+export * from './blackmarket.routes';
 export * from './block.routes';
 export * from './club.routes';
 export * from './colony.routes';

api/src/services/blackmarket/blackmarket.service.ts

@@ -0,0 +1,35 @@
+import { Service } from 'typedi';
+
+import {
+  RoleAssignmentRepository,
+  RoleRepository,
+} from '../../repositories';
+
+/**
+ * Service for dealing with the black market.
+ * "Admin" access refers to members assigned one of the following roles:
+ * Admin, BlackMarketDeputy, or BlackMarketChief.
+ */
+@Service()
+export class BlackMarketService {
+  constructor(
+    private roleAssignmentRepository: RoleAssignmentRepository,
+    private roleRepository: RoleRepository,
+  ) {}
+
+  public async canAdmin(memberId: number): Promise<boolean> {
+    const roleAssignments = await this.roleAssignmentRepository.getByMemberId(memberId);
+    if (
+      roleAssignments.find(assignment => {
+        return [
+          this.roleRepository.roleMap.Admin,
+          this.roleRepository.roleMap.BlackMarketDeputy,
+          this.roleRepository.roleMap.BlackMarketChief,
+        ].includes(assignment.role_id);
+      })
+    ) {
+      return true;
+    }
+    return false;
+  }
+}

api/src/services/index.ts

@@ -1,5 +1,6 @@
 export * from './admin/admin.services';
 export * from './avatar/avatar.service';
+export * from './blackmarket/blackmarket.service';
 export * from './block/block.service';
 export * from './club/club.service';
 export * from './colony/colony.service';