[optimize] simplify DB Store accessing

Author: TechQuery

source/controller/Announcement.ts

@@ -6,7 +6,6 @@ import {
     Get,
     HttpCode,
     JsonController,
-    NotFoundError,
     OnNull,
     OnUndefined,
     Param,
@@ -16,19 +15,10 @@ import {
 } from 'routing-controllers';
 import { ResponseSchema } from 'routing-controllers-openapi';
 
-import {
-    Announcement,
-    AnnouncementListChunk,
-    BaseFilter,
-    dataSource,
-    Hackathon,
-    User
-} from '../model';
+import { Announcement, AnnouncementListChunk, BaseFilter, User } from '../model';
 import { hackathonService, UserServiceWithLog } from '../service';
 import { searchConditionOf } from '../utility';
 
-const hackathonStore = dataSource.getRepository(Hackathon);
-
 @JsonController('/hackathon/:name/announcement')
 export class AnnouncementController {
     service = new UserServiceWithLog(Announcement, ['title', 'content']);
@@ -42,11 +32,7 @@ export class AnnouncementController {
         @Param('name') name: string,
         @Body() announcement: Announcement
     ) {
-        const hackathon = await hackathonStore.findOneBy({ name });
-
-        if (!hackathon) throw new NotFoundError();
-
-        await hackathonService.ensureAdmin(createdBy.id, name);
+        const hackathon = await hackathonService.ensureAdmin(createdBy.id, name);
 
         return this.service.createOne({ ...announcement, hackathon }, createdBy);
     }

source/controller/Award.ts

@@ -22,14 +22,10 @@ import {
     AwardAssignmentListChunk,
     AwardListChunk,
     BaseFilter,
-    dataSource,
-    Hackathon,
     User
 } from '../model';
 import { awardAssignmentService, awardService, hackathonService } from '../service';
 
-const hackathonStore = dataSource.getRepository(Hackathon);
-
 @JsonController('/hackathon/:name/award')
 export class AwardController {
     service = awardService;
@@ -43,11 +39,7 @@ export class AwardController {
         @Param('name') name: string,
         @Body() award: Award
     ) {
-        const hackathon = await hackathonStore.findOneBy({ name });
-
-        if (!hackathon) throw new NotFoundError(`Hackathon ${name} is not found`);
-
-        await hackathonService.ensureAdmin(createdBy.id, name);
+        const hackathon = await hackathonService.ensureAdmin(createdBy.id, name);
 
         return this.service.createOne({ ...award, hackathon }, createdBy);
     }
@@ -100,7 +92,6 @@ export class AwardController {
 @JsonController('/hackathon/:name/award/:aid/assignment')
 export class AwardAssignmentController {
     service = awardAssignmentService;
-    awardService = awardService;
 
     @Post()
     @Authorized()
@@ -112,7 +103,8 @@ export class AwardAssignmentController {
         @Param('aid') aid: number,
         @Body() assignment: AwardAssignment
     ) {
-        const award = await this.awardService.getOne(aid, ['hackathon']);
+        const award = await awardService.getOne(aid, ['hackathon']);
+
         if (!award) throw new NotFoundError(`Award "${aid}" is not found`);
 
         await hackathonService.ensureAdmin(currentUser.id, name);
@@ -140,7 +132,7 @@ export class AwardAssignmentController {
     @Get()
     @ResponseSchema(AwardAssignmentListChunk)
     getList(@Param('aid') aid: number, @QueryParams() { pageSize, pageIndex }: BaseFilter) {
-        return awardAssignmentService.getListByDimension('award', aid, pageSize, pageIndex);
+        return this.service.getListByDimension('award', aid, pageSize, pageIndex);
     }
 }
 

source/controller/Enrollment.ts

@@ -15,19 +15,15 @@ import {
 import { ResponseSchema } from 'routing-controllers-openapi';
 
 import {
-    dataSource,
     Enrollment,
     EnrollmentFilter,
     EnrollmentListChunk,
     EnrollmentStatus,
-    Hackathon,
     User
 } from '../model';
 import { enrollmentService, hackathonService } from '../service';
 import { searchConditionOf } from '../utility';
 
-const hackathonStore = dataSource.getRepository(Hackathon);
-
 @JsonController('/hackathon/:name/enrollment')
 export class EnrollmentController {
     service = enrollmentService;
@@ -64,7 +60,7 @@ export class EnrollmentController {
         @Param('name') name: string,
         @Body() { form }: Enrollment
     ) {
-        const hackathon = await hackathonStore.findOneBy({ name }),
+        const hackathon = await hackathonService.store.findOneBy({ name }),
             now = Date.now();
 
         if (!hackathon) throw new NotFoundError();

source/controller/Evaluation.ts

@@ -14,20 +14,10 @@ import {
 import { ResponseSchema } from 'routing-controllers-openapi';
 import { groupBy, sum } from 'web-utility';
 
-import {
-    BaseFilter,
-    dataSource,
-    Evaluation,
-    EvaluationListChunk,
-    Score,
-    Team,
-    User
-} from '../model';
-import { UserServiceWithLog } from '../service';
+import { BaseFilter, Evaluation, EvaluationListChunk, Score, User } from '../model';
+import { teamService, UserServiceWithLog } from '../service';
 import { searchConditionOf } from '../utility';
 
-const teamStore = dataSource.getRepository(Team);
-
 @JsonController('/hackathon/:name/team/:tid/evaluation')
 export class EvaluationController {
     service = new UserServiceWithLog(Evaluation, ['scores', 'comment']);
@@ -38,11 +28,10 @@ export class EvaluationController {
     @ResponseSchema(Evaluation)
     async createOne(
         @CurrentUser() createdBy: User,
-        @Param('name') name: string,
         @Param('tid') tid: number,
         @Body() evaluation: Evaluation
     ) {
-        const team = await teamStore.findOne({
+        const team = await teamService.store.findOne({
             where: { id: tid },
             relations: ['hackathon']
         });
@@ -57,7 +46,6 @@ export class EvaluationController {
             { ...evaluation, team, hackathon: team.hackathon },
             createdBy
         );
-
         const allScores = (await this.service.store.findBy({ team: { id: tid } }))
             .map(({ scores }) => scores)
             .flat();
@@ -71,7 +59,7 @@ export class EvaluationController {
         );
         const score = sum(...scores.map(({ score }) => score));
 
-        await teamStore.save({ ...team, scores, score });
+        await teamService.store.save({ ...team, scores, score });
 
         return saved;
     }

source/controller/GitTemplate.ts

@@ -1,4 +1,3 @@
-import { RepositoryModel } from 'mobx-github';
 import {
     Authorized,
     Body,
@@ -7,7 +6,6 @@ import {
     Get,
     HttpCode,
     JsonController,
-    NotFoundError,
     OnNull,
     OnUndefined,
     Param,
@@ -16,19 +14,10 @@ import {
 } from 'routing-controllers';
 import { ResponseSchema } from 'routing-controllers-openapi';
 
-import {
-    BaseFilter,
-    dataSource,
-    GitTemplate,
-    GitTemplateListChunk,
-    Hackathon,
-    User
-} from '../model';
+import { BaseFilter, GitTemplate, GitTemplateListChunk, User } from '../model';
 import { gitTemplateService, hackathonService } from '../service';
 import { searchConditionOf } from '../utility';
 
-const hackathonStore = dataSource.getRepository(Hackathon);
-
 @JsonController('/hackathon/:name/git-template')
 export class GitTemplateController {
     service = gitTemplateService;
@@ -42,11 +31,7 @@ export class GitTemplateController {
         @Param('name') name: string,
         @Body() { html_url }: GitTemplate
     ) {
-        const hackathon = await hackathonStore.findOneBy({ name });
-
-        if (!hackathon) throw new NotFoundError();
-
-        await hackathonService.ensureAdmin(createdBy.id, name);
+        const hackathon = await hackathonService.ensureAdmin(createdBy.id, name);
 
         const repository = await gitTemplateService.getRepository(html_url);
 

source/controller/Organizer.ts

@@ -6,7 +6,6 @@ import {
     Get,
     HttpCode,
     JsonController,
-    NotFoundError,
     OnUndefined,
     Param,
     Post,
@@ -15,21 +14,13 @@ import {
 } from 'routing-controllers';
 import { ResponseSchema } from 'routing-controllers-openapi';
 
-import {
-    dataSource,
-    Hackathon,
-    Organizer,
-    OrganizerFilter,
-    OrganizerListChunk,
-    User
-} from '../model';
+import { Organizer, OrganizerFilter, OrganizerListChunk, User } from '../model';
 import { hackathonService, UserServiceWithLog } from '../service';
 import { searchConditionOf } from '../utility';
 
 @JsonController('/hackathon/:name/organizer')
 export class OrganizerController {
     service = new UserServiceWithLog(Organizer, ['name', 'description', 'url']);
-    hackathonStore = dataSource.getRepository(Hackathon);
 
     @Post()
     @Authorized()
@@ -40,13 +31,7 @@ export class OrganizerController {
         @Param('name') name: string,
         @Body() organizer: Organizer
     ) {
-        const hackathon = await this.hackathonStore.findOne({
-            where: { name },
-            relations: ['createdBy']
-        });
-        if (!hackathon) throw new NotFoundError();
-
-        await hackathonService.ensureAdmin(createdBy.id, name);
+        const hackathon = await hackathonService.ensureAdmin(createdBy.id, name);
 
         return this.service.createOne({ ...organizer, hackathon }, createdBy);
     }

source/controller/PlatformAdmin.ts

@@ -14,22 +14,14 @@ import {
 } from 'routing-controllers';
 import { ResponseSchema } from 'routing-controllers-openapi';
 
-import {
-    BaseFilter,
-    dataSource,
-    PlatformAdmin,
-    PlatformAdminListChunk,
-    Role,
-    User
-} from '../model';
-import { platformAdminService } from '../service';
+import { BaseFilter, PlatformAdmin, PlatformAdminListChunk, Role, User } from '../model';
+import { platformAdminService, sessionService } from '../service';
 import { searchConditionOf } from '../utility';
 
-const userStore = dataSource.getRepository(User);
-
 @JsonController('/platform/admin')
 export class PlatformAdminController {
     service = platformAdminService;
+    userStore = sessionService.userStore;
 
     @Put('/:uid')
     @Authorized(Role.Administrator)
@@ -40,7 +32,7 @@ export class PlatformAdminController {
         @Param('uid') uid: number,
         @Body() { description }: PlatformAdmin
     ) {
-        const user = await userStore.findOneBy({ id: uid });
+        const user = await this.userStore.findOneBy({ id: uid });
 
         if (!user) throw new NotFoundError();
 
@@ -50,7 +42,7 @@ export class PlatformAdminController {
 
         user.roles.push(Role.Administrator);
 
-        await userStore.save(user);
+        await this.userStore.save(user);
 
         return this.service.createOne({ user, description }, createdBy);
     }
@@ -59,7 +51,7 @@ export class PlatformAdminController {
     @Authorized(Role.Administrator)
     @OnUndefined(204)
     async deleteOne(@CurrentUser() deletedBy: User, @Param('uid') uid: number) {
-        const user = await userStore.findOneBy({ id: uid });
+        const user = await this.userStore.findOneBy({ id: uid });
 
         if (!user) throw new NotFoundError();
 
@@ -69,7 +61,7 @@ export class PlatformAdminController {
 
         user.roles = user.roles.filter(role => role !== Role.Administrator);
 
-        await userStore.save(user);
+        await this.userStore.save(user);
 
         await this.service.deleteOne(admin.id, deletedBy);
     }

source/controller/Staff.ts

@@ -15,25 +15,16 @@ import {
 } from 'routing-controllers';
 import { ResponseSchema } from 'routing-controllers-openapi';
 
-import {
-    dataSource,
-    Hackathon,
-    Staff,
-    StaffFilter,
-    StaffListChunk,
-    StaffType,
-    User
-} from '../model';
-import { hackathonService,staffService } from '../service';
+import { Staff, StaffFilter, StaffListChunk, StaffType, User } from '../model';
+import { hackathonService, sessionService, staffService } from '../service';
 import { searchConditionOf } from '../utility';
 
-const userStore = dataSource.getRepository(User),
-    hackathonStore = dataSource.getRepository(Hackathon);
 const StaffTypeRegExp = Object.values(StaffType).join('|');
 
 @JsonController(`/hackathon/:name/:type(${StaffTypeRegExp})`)
 export class StaffController {
     service = staffService;
+    userStore = sessionService.userStore;
 
     @Put('/:uid')
     @HttpCode(201)
@@ -47,8 +38,8 @@ export class StaffController {
         @Body() staff: Staff
     ) {
         const [user, hackathon] = await Promise.all([
-            userStore.findOneBy({ id: uid }),
-            hackathonStore.findOneBy({ name })
+            this.userStore.findOneBy({ id: uid }),
+            hackathonService.store.findOneBy({ name })
         ]);
         if (!user || !hackathon || !StaffType[type]) throw new NotFoundError();