No repository as instance variables anymore.

src/index.ts

@@ -13,7 +13,7 @@ import { Controllers } from './controllers';
 import { useContainer as routingUseContainer } from 'routing-controllers';
 import { container } from 'tsyringe';
 
-import { loadServices, loadFirebase, loadORM, loadRepositories } from './loaders';
+import { loadServices, loadFirebase, loadORM } from './loaders';
 import morgan from 'morgan';
 
 const limiter = rateLimit({
@@ -23,7 +23,6 @@ const limiter = rateLimit({
 const port = process.env.PORT || 3001;
 
 loadServices();
-loadRepositories();
 
 loadORM().then(() => {
   loadFirebase();

src/loaders/index.ts

@@ -1,4 +1,3 @@
 export { loadFirebase } from './FirebaseLoader';
 export { loadServices } from './ServiceLoader';
 export { loadORM } from './ORMLoader';
-export { loadRepositories } from './RepositoryLoader';

src/mappers/AppUserMapper.ts

@@ -1,22 +1,16 @@
 import { AppUserEventRequest, AppUserEventResponse } from '@Payloads';
 import { AppUser } from '@Entities';
 import { AppUserService } from '@Services';
-import { AppUserRepositoryToken } from '@Repositories';
 
-import { Repository } from 'typeorm';
 import { classToPlain, plainToClass } from 'class-transformer';
 import { singleton, inject } from 'tsyringe';
+import { getRepository } from 'typeorm';
 
 @singleton()
 export class AppUserMapper {
-  private appUserRepository: Repository<AppUser>;
   private appUserService: AppUserService;
 
-  constructor(
-    @inject(AppUserRepositoryToken) appUserRepository: Repository<AppUser>,
-    @inject(AppUserService) appUserService: AppUserService
-  ) {
-    this.appUserRepository = appUserRepository;
+  constructor(@inject(AppUserService) appUserService: AppUserService) {
     this.appUserService = appUserService;
   }
 
@@ -28,8 +22,10 @@ export class AppUserMapper {
    * @returns {AppUser} A newly created AppUser entity.
    */
   requestToNewEntity(appUserRequest: AppUserEventRequest): AppUser {
+    const appUserRepository = getRepository(AppUser);
     const plainAppUserRequest: Object = classToPlain(appUserRequest);
-    return this.appUserRepository.create(plainAppUserRequest);
+
+    return appUserRepository.create(plainAppUserRequest);
   }
 
   /**
@@ -48,7 +44,8 @@ export class AppUserMapper {
     const appUserObj: AppUser = appUserRequest as AppUser;
     appUserObj.id = appUserId;
 
-    const appUser: AppUser = await this.appUserRepository.preload(appUserObj);
+    const appUserRepository = getRepository(AppUser);
+    const appUser: AppUser = await appUserRepository.preload(appUserObj);
 
     return appUser;
   }

src/mappers/EventMapper.ts

@@ -1,22 +1,17 @@
 import { EventRequest, EventResponse } from '@Payloads';
 import { Event } from '@Entities';
-import { EventRepositoryToken } from '@Repositories';
 
-import { Repository } from 'typeorm';
 import { classToPlain, plainToClass } from 'class-transformer';
-import { singleton, inject } from 'tsyringe';
+import { singleton } from 'tsyringe';
+import { getRepository } from 'typeorm';
 
 @singleton()
 export class EventMapper {
-  private eventRepository: Repository<Event>;
-
-  constructor(@inject(EventRepositoryToken) eventRepository: Repository<Event>) {
-    this.eventRepository = eventRepository;
-  }
-
   requestToNewEntity(eventRequest: EventRequest): Event {
+    const eventRepository = getRepository(Event);
     const plainEventRequest: object = classToPlain(eventRequest);
-    return this.eventRepository.create(plainEventRequest);
+
+    return eventRepository.create(plainEventRequest);
   }
 
   /**
@@ -33,7 +28,9 @@ export class EventMapper {
     const eventObj: Event = eventRequest as Event;
     eventObj.id = eventID; // preload expects an id.
 
-    const event: Event = await this.eventRepository.preload(eventObj);
+    const eventRepository = getRepository(Event);
+    const event: Event = await eventRepository.preload(eventObj);
+
     if (event === undefined) {
       return undefined;
     }

src/services/AppUserService.ts

@@ -1,15 +1,9 @@
 import { AppUser, AppUserRole } from '@Entities';
 import { singleton } from 'tsyringe';
-import { Any, Repository, getRepository } from 'typeorm';
+import { Any, getRepository } from 'typeorm';
 
 @singleton()
 export class AppUserService {
-  private appUserRepository: Repository<AppUser>;
-
-  constructor() {
-    this.appUserRepository = getRepository(AppUser);
-  }
-
   /**
    * Stores the AppUser passed in as a parameter to the
    * AppUser table.
@@ -18,7 +12,9 @@ export class AppUserService {
    * @returns {Promise} The saved AppUser entity.
    */
   async saveAppUser(appUser: AppUser): Promise<AppUser> {
-    return await this.appUserRepository.save(appUser);
+    const appUserRepository = getRepository(AppUser);
+
+    return await appUserRepository.save(appUser);
   }
 
   /**
@@ -28,7 +24,9 @@ export class AppUserService {
    * @returns {AppUser[]} Array of AppUser entities.
    */
   getMultipleAppUsers(ids: number[]): Promise<AppUser[]> {
-    return this.appUserRepository.find({ id: Any(ids) });
+    const appUserRepository = getRepository(AppUser);
+
+    return appUserRepository.find({ id: Any(ids) });
   }
 
   /**
@@ -38,7 +36,9 @@ export class AppUserService {
    * @returns {Promise} An AppUser entity if it exists in AppUser table.
    */
   getAppUserByEmail(email: string): Promise<AppUser | undefined> {
-    return this.appUserRepository.findOne({ email });
+    const appUserRepository = getRepository(AppUser);
+
+    return appUserRepository.findOne({ email });
   }
 
   /**

src/services/AttendanceService.ts

@@ -1,17 +1,10 @@
 import { Attendance, AppUser, AppUserRole, Event } from '@Entities';
-import { AttendanceRepositoryToken } from '@Repositories';
 
-import { Repository } from 'typeorm';
-import { singleton, inject } from 'tsyringe';
+import { getRepository } from 'typeorm';
+import { singleton } from 'tsyringe';
 
 @singleton()
 export class AttendanceService {
-  private attendanceRepository: Repository<Attendance>;
-
-  constructor(@inject(AttendanceRepositoryToken) attendanceRepository: Repository<Attendance>) {
-    this.attendanceRepository = attendanceRepository;
-  }
-
   /**
    * Creates a new Attendance entity, then attempts to insert it into the DB.
    *
@@ -20,12 +13,14 @@ export class AttendanceService {
    * @returns {Promise} A new Attendance entity, but undefined for duplicate Attendance entities.
    */
   async registerAttendance(event: Event, attendee: AppUser): Promise<Attendance | undefined> {
+    const attendanceRepository = getRepository(Attendance);
+
     const { role } = attendee;
     const attendance = { event, attendee, isInductee: role === AppUserRole.INDUCTEE };
-    const newAttendance = this.attendanceRepository.create(attendance);
+    const newAttendance = attendanceRepository.create(attendance);
 
     try {
-      await this.attendanceRepository.insert(newAttendance);
+      await attendanceRepository.insert(newAttendance);
     } catch {
       return undefined;
     }

src/services/EventService.ts

@@ -1,23 +1,19 @@
 import { Event, AppUser, Attendance, RSVP } from '@Entities';
-import { EventRepositoryToken } from '@Repositories';
 import { AttendanceService } from './AttendanceService';
 import { RSVPService } from './RSVPService';
 
-import { Repository } from 'typeorm';
 import { singleton, inject } from 'tsyringe';
+import { getRepository } from 'typeorm';
 
 @singleton()
 export class EventService {
-  private eventRepository: Repository<Event>;
   private attendanceService: AttendanceService;
   private rsvpService: RSVPService;
 
   constructor(
-    @inject(EventRepositoryToken) eventRepository: Repository<Event>,
     @inject(AttendanceService) attendanceService: AttendanceService,
     @inject(RSVPService) rsvpService: RSVPService
   ) {
-    this.eventRepository = eventRepository;
     this.attendanceService = attendanceService;
     this.rsvpService = rsvpService;
   }
@@ -28,7 +24,9 @@ export class EventService {
    * @returns {Promise} Saved event.
    */
   async saveEvent(event: Event): Promise<Event> {
-    return this.eventRepository.save(event);
+    const eventRepository = getRepository(Event);
+
+    return eventRepository.save(event);
   }
 
   /**
@@ -37,7 +35,9 @@ export class EventService {
    * @returns {Event[]} Array of all events.
    */
   getAllEvents(): Promise<Event[]> {
-    return this.eventRepository.find();
+    const eventRepository = getRepository(Event);
+
+    return eventRepository.find();
   }
 
   /**
@@ -47,7 +47,9 @@ export class EventService {
    * @returns {Promise} Event with given id.
    */
   getEventById(id: number): Promise<Event | undefined> {
-    return this.eventRepository.findOne({ id });
+    const eventRepository = getRepository(Event);
+
+    return eventRepository.findOne({ id });
   }
 
   /**
@@ -57,8 +59,10 @@ export class EventService {
    * @returns {Promise} Deleted event.
    */
   async deleteEvent(id: number): Promise<Event | undefined> {
-    const event = await this.eventRepository.findOne({ id });
-    return event ? this.eventRepository.remove(event) : undefined;
+    const eventRepository = getRepository(Event);
+    const event = await eventRepository.findOne({ id });
+
+    return event ? eventRepository.remove(event) : undefined;
   }
 
   /**
@@ -74,7 +78,8 @@ export class EventService {
     eventId: number,
     appUser: AppUser
   ): Promise<Attendance | undefined> {
-    const event = await this.eventRepository.findOne({ id: eventId });
+    const eventRepository = getRepository(Event);
+    const event = await eventRepository.findOne({ id: eventId });
     const newAttendance = await this.attendanceService.registerAttendance(event, appUser);
 
     return newAttendance;
@@ -89,7 +94,8 @@ export class EventService {
    * @returns {Promise} A new RSVP entity.
    */
   async registerEventRSVP(eventId: number, appUser: AppUser): Promise<RSVP> {
-    const event = await this.eventRepository.findOne({ id: eventId });
+    const eventRepository = getRepository(Event);
+    const event = await eventRepository.findOne({ id: eventId });
     const newRSVP = await this.rsvpService.registerRSVP(event, appUser);
 
     return newRSVP;

src/services/RSVPService.ts

@@ -1,17 +1,10 @@
-import { AppUser, Event, RSVP } from '@Entities';
-import { RSVPRepositoryToken } from '@Repositories';
+import { singleton } from 'tsyringe';
 
-import { Repository } from 'typeorm';
-import { singleton, inject } from 'tsyringe';
+import { AppUser, Event, RSVP } from '@Entities';
+import { getRepository } from 'typeorm';
 
 @singleton()
 export class RSVPService {
-  private rsvpRepository: Repository<RSVP>;
-
-  constructor(@inject(RSVPRepositoryToken) rsvpRepository: Repository<RSVP>) {
-    this.rsvpRepository = rsvpRepository;
-  }
-
   /**
    * Creates a new RSVP entity, then attempts to insert it into the DB.
    *
@@ -20,11 +13,12 @@ export class RSVPService {
    * @returns {Promise} A new RSVP entity, but undefined for duplicate RSVP.
    */
   async registerRSVP(event: Event, appUser: AppUser): Promise<RSVP | undefined> {
-    const RSVP = { event, appUser };
-    const newRSVP = this.rsvpRepository.create(RSVP);
+    const rsvpRepository = getRepository(RSVP);
+    const rsvpBeingProcessed = { event, appUser };
+    const newRSVP = rsvpRepository.create(rsvpBeingProcessed);
 
     try {
-      await this.rsvpRepository.insert(newRSVP);
+      await rsvpRepository.insert(newRSVP);
     } catch {
       return undefined;
     }