Chore/modules

package.json

@@ -23,7 +23,7 @@
     "check-types": "tsc"
   },
   "dependencies": {
-    "@nestjs/common": "^8.0.0",
+    "@nestjs/common": "^9.4.3",
     "@nestjs/config": "^1.1.6",
     "@nestjs/core": "^8.0.0",
     "@nestjs/platform-express": "^8.0.0",
@@ -32,6 +32,7 @@
     "class-validator": "^0.13.2",
     "dayjs": "^1.10.7",
     "lodash.orderby": "^4.6.0",
+    "nestjs": "^0.0.1",
     "object-hash": "^2.2.0",
     "pg": "^8.7.1",
     "reflect-metadata": "^0.1.13",

src/app.module.ts

@@ -5,20 +5,19 @@ import { DriverController } from './controllers/driver.controller';
 import { DriverService } from './service/driver.service';
 import { DriverRepository } from './repository/driver.repository';
 import { AppProperties } from './config/app-properties.config';
-import { CarTypeRepository } from './repository/car-type.repository';
-import { CarTypeController } from './controllers/car-type.controller';
-import { CarTypeService } from './service/car-type.service';
+import { CarTypeRepository } from './modules/car-type/car-type.repository';
+import { CarTypeService } from './modules/car-type/car-type.service';
 import { DistanceCalculator } from './service/distance-calculator.service';
 import { InvoiceRepository } from './repository/invoice.repository';
 import { InvoiceGenerator } from './service/invoice-generator.service';
 import { DriverNotificationService } from './service/driver-notification.service';
 import { GeocodingService } from './service/geocoding.service';
 import { ClaimNumberGenerator } from './service/claim-number-generator.service';
-import { ClaimRepository } from './repository/claim.repository';
+import { ClaimRepository } from './modules/claim/claim.repository';
 import { ClientNotificationService } from './service/client-notification.service';
-import { ClientService } from './service/client.service';
-import { ClientRepository } from './repository/client.repository';
-import { ClientController } from './controllers/client.controller';
+import { ClientService } from './modules/client/client.service';
+import { ClientRepository } from './modules/client/client.repository';
+import { ClientController } from './modules/client/client.controller';
 import { DriverSessionService } from './service/driver-session.service';
 import { DriverSessionRepository } from './repository/driver-session.repository';
 import { DriverSessionController } from './controllers/driver-session.controller';
@@ -31,21 +30,22 @@ import { DriverTrackingController } from './controllers/driver-tracking.controll
 import { ClaimAttachmentRepository } from './repository/claim-attachment.repository';
 import { AddressRepository } from './repository/address.repository';
 import { DriverAttributeRepository } from './repository/driver-attribute.repository';
-import { AwardedMilesRepository } from './repository/awarded-miles.repository';
-import { AwardsAccountRepository } from './repository/awards-account.repository';
+import { AwardedMilesRepository } from './modules/awards-account/awarded-miles.repository';
+import { AwardsAccountRepository } from './modules/awards-account/awards-account.repository';
 import { ContractAttachmentRepository } from './repository/contract-attachment.repository';
 import { ContractRepository } from './repository/contract.repository';
 import { TransitAnalyzerService } from './service/transit-analyzer.service';
-import { AwardsService } from './service/awards.service';
-import { ClaimService } from './service/claim.service';
+import { AwardsService } from './modules/awards-account/awards.service';
+import { ClaimService } from './modules/claim/claim.service';
 import { ContractService } from './service/contract.service';
 import { TransitService } from './service/transit.service';
 import { TransitAnalyzerController } from './controllers/transit-analyzer.controller';
 import { TransitController } from './controllers/transit.controller';
-import { AwardsAccountController } from './controllers/awards-account.controller';
-import { ClaimController } from './controllers/claim.controller';
+import { ClaimController } from './modules/claim/claim.controller';
 import { ContractController } from './controllers/contract.controller';
 import { DriverReportController } from './controllers/driver-report.controller';
+import { CarTypeController } from './modules/car-type/car-type.controller';
+import { AwardsAccountController } from './modules/awards-account/awards-account.controller';
 
 @Module({
   imports: [

src/controllers/driver-report.controller.ts

@@ -1,7 +1,7 @@
 import { DriverService } from '../service/driver.service';
 import { DriverRepository } from '../repository/driver.repository';
 import { InjectRepository } from '@nestjs/typeorm';
-import { ClaimRepository } from '../repository/claim.repository';
+import { ClaimRepository } from '../modules/claim/claim.repository';
 import { DriverSessionRepository } from '../repository/driver-session.repository';
 import {
   Body,
@@ -17,7 +17,7 @@ import * as dayjs from 'dayjs';
 import { DriverSessionDto } from '../dto/driver-session.dto';
 import { TransitDto } from '../dto/transit.dto';
 import { Status, Transit } from '../entity/transit.entity';
-import { ClaimDto } from '../dto/claim.dto';
+import { ClaimDto } from '../modules/claim/claim.dto';
 
 @Controller('driverreport')
 export class DriverReportController {

src/dto/create-car-type.dto.ts

@@ -1,5 +1,5 @@
 import { IsEnum } from 'class-validator';
-import { CarClass } from '../entity/car-type.entity';
+import { CarClass } from '../modules/car-type/car-type.entity';
 
 export class CreateCarTypeDto {
   public description: string;

src/dto/create-client.dto.ts

@@ -1,4 +1,4 @@
-import { PaymentType, Type } from '../entity/client.entity';
+import { PaymentType, Type } from '../modules/client/client.entity';
 import { IsEnum, IsNotEmpty } from 'class-validator';
 
 export class CreateClientDto {

src/dto/create-driver-session.dto.ts

@@ -1,5 +1,5 @@
 import { IsEnum, IsNotEmpty } from 'class-validator';
-import { CarClass } from '../entity/car-type.entity';
+import { CarClass } from '../modules/car-type/car-type.entity';
 
 export class CreateDriverSessionDto {
   @IsNotEmpty()

src/dto/create-transit.dto.ts

@@ -1,5 +1,5 @@
 import { IsEnum, IsNotEmpty } from 'class-validator';
-import { CarClass } from '../entity/car-type.entity';
+import { CarClass } from '../modules/car-type/car-type.entity';
 
 export interface Address {
   country: string;

src/dto/driver-session.dto.ts

@@ -1,4 +1,4 @@
-import { CarClass } from '../entity/car-type.entity';
+import { CarClass } from '../modules/car-type/car-type.entity';
 import { DriverSession } from '../entity/driver-session.entity';
 
 export class DriverSessionDto {

src/dto/transit.dto.ts

@@ -1,9 +1,9 @@
 import { DayOfWeek, Status, Transit } from '../entity/transit.entity';
 import { DriverDto } from './driver.dto';
-import { ClaimDto } from './claim.dto';
+import { ClaimDto } from '../modules/claim/claim.dto';
 import { AddressDto } from './address.dto';
-import { CarClass } from '../entity/car-type.entity';
-import { ClientDto } from './client.dto';
+import { CarClass } from '../modules/car-type/car-type.entity';
+import { ClientDto } from '../modules/client/client.dto';
 import * as dayjs from 'dayjs';
 import * as dayOfYear from 'dayjs/plugin/dayOfYear';
 import { NotAcceptableException } from '@nestjs/common';

src/entity/awarded-miles.entity.ts

@@ -1,6 +1,6 @@
 import { BaseEntity } from '../common/base.entity';
 import { Column, Entity, ManyToOne } from 'typeorm';
-import { Client } from './client.entity';
+import { Client } from '../modules/client/client.entity';
 import { Transit } from './transit.entity';
 
 @Entity()

src/entity/claim-attachment.entity.ts

@@ -1,6 +1,6 @@
 import { BaseEntity } from '../common/base.entity';
 import { Column, Entity, ManyToOne } from 'typeorm';
-import { Claim } from './claim.entity';
+import { Claim } from '../modules/claim/claim.entity';
 
 @Entity()
 export class ClaimAttachment extends BaseEntity {

src/entity/driver-session.entity.ts

@@ -1,7 +1,7 @@
 import { BaseEntity } from '../common/base.entity';
 import { Column, Entity, ManyToOne } from 'typeorm';
 import { Driver } from './driver.entity';
-import { CarClass } from './car-type.entity';
+import { CarClass } from '../modules/car-type/car-type.entity';
 
 @Entity()
 export class DriverSession extends BaseEntity {

src/entity/transit.entity.ts

@@ -2,9 +2,9 @@ import { ForbiddenException } from '@nestjs/common';
 import { BaseEntity } from '../common/base.entity';
 import { Column, Entity, JoinColumn, ManyToMany, ManyToOne } from 'typeorm';
 import { Driver } from './driver.entity';
-import { Client, PaymentType } from './client.entity';
+import { Client, PaymentType } from '../modules/client/client.entity';
 import { Address } from './address.entity';
-import { CarClass } from './car-type.entity';
+import { CarClass } from '../modules/car-type/car-type.entity';
 
 export enum Status {
   DRAFT = 'draft',

src/repository/awarded-miles.repository.ts → src/modules/awards-account/awarded-miles.repository.ts

@@ -1,6 +1,6 @@
+import { AwardedMiles } from 'src/entity/awarded-miles.entity';
+import { Client } from 'src/modules/client/client.entity';
 import { EntityRepository, Repository } from 'typeorm';
-import { AwardedMiles } from '../entity/awarded-miles.entity';
-import { Client } from '../entity/client.entity';
 
 @EntityRepository(AwardedMiles)
 export class AwardedMilesRepository extends Repository<AwardedMiles> {

src/controllers/awards-account.controller.ts → src/modules/awards-account/awards-account.controller.ts

@@ -1,6 +1,6 @@
-import { AwardsService } from '../service/awards.service';
 import { Controller, Get, Param, Post } from '@nestjs/common';
-import { AwardsAccountDto } from '../dto/awards-account.dto';
+import { AwardsAccountDto } from 'src/modules/awards-account/awards-account.dto';
+import { AwardsService } from 'src/modules/awards-account/awards.service';
 
 @Controller('clients')
 export class AwardsAccountController {

src/dto/awards-account.dto.ts → src/modules/awards-account/awards-account.dto.ts

@@ -1,5 +1,5 @@
-import { ClientDto } from './client.dto';
-import { AwardsAccount } from '../entity/awards-account.entity';
+import { ClientDto } from '../client/client.dto';
+import { AwardsAccount } from './awards-account.entity';
 
 export class AwardsAccountDto {
   private client: ClientDto;

src/entity/awards-account.entity.ts → src/modules/awards-account/awards-account.entity.ts

@@ -1,6 +1,6 @@
-import { BaseEntity } from '../common/base.entity';
+import { BaseEntity } from '../../common/base.entity';
 import { Column, Entity, JoinColumn, OneToOne } from 'typeorm';
-import { Client } from './client.entity';
+import { Client } from '../client/client.entity';
 
 @Entity()
 export class AwardsAccount extends BaseEntity {

src/repository/awards-account.repository.ts → src/modules/awards-account/awards-account.repository.ts

@@ -1,6 +1,6 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { AwardsAccount } from '../entity/awards-account.entity';
-import { Client } from '../entity/client.entity';
+import { AwardsAccount } from './awards-account.entity';
+import { Client } from '../client/client.entity';
 
 @EntityRepository(AwardsAccount)
 export class AwardsAccountRepository extends Repository<AwardsAccount> {

src/service/awards.service.ts → src/modules/awards-account/awards.service.ts

@@ -1,20 +1,21 @@
-import { AwardsAccountDto } from '../dto/awards-account.dto';
-import { AwardedMiles } from '../entity/awarded-miles.entity';
 import {
   Injectable,
   NotFoundException,
   NotAcceptableException,
 } from '@nestjs/common';
+import { Type } from '../client/client.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { ClientRepository } from '../repository/client.repository';
-import { TransitRepository } from '../repository/transit.repository';
-import { AppProperties } from '../config/app-properties.config';
-import { AwardsAccountRepository } from '../repository/awards-account.repository';
-import { AwardedMilesRepository } from '../repository/awarded-miles.repository';
-import { AwardsAccount } from '../entity/awards-account.entity';
+import { AppProperties } from '../../config/app-properties.config';
 import dayjs from 'dayjs';
-import { Client, Type } from '../entity/client.entity';
 import orderBy from 'lodash.orderby';
+import { AwardedMiles } from 'src/entity/awarded-miles.entity';
+import { Client } from 'src/modules/client/client.entity';
+import { ClientRepository } from 'src/modules/client/client.repository';
+import { TransitRepository } from 'src/repository/transit.repository';
+import { AwardedMilesRepository } from './awarded-miles.repository';
+import { AwardsAccountDto } from './awards-account.dto';
+import { AwardsAccount } from './awards-account.entity';
+import { AwardsAccountRepository } from './awards-account.repository';
 
 export interface IAwardsService {
   findBy: (clientId: string) => Promise<AwardsAccountDto>;

src/controllers/car-type.controller.ts → src/modules/car-type/car-type.controller.ts

@@ -10,10 +10,10 @@ import {
   Get,
 } from '@nestjs/common';
 import { Response } from 'express';
-import { CarTypeService } from '../service/car-type.service';
-import { CreateCarTypeDto } from '../dto/create-car-type.dto';
-import { CarTypeDto } from '../dto/car-type.dto';
-import { CarClass } from '../entity/car-type.entity';
+import { CreateCarTypeDto } from 'src/dto/create-car-type.dto';
+import { CarTypeDto } from './car-type.dto';
+import { CarClass } from './car-type.entity';
+import { CarTypeService } from './car-type.service';
 
 @Controller('cartypes')
 export class CarTypeController {

src/dto/car-type.dto.ts → src/modules/car-type/car-type.dto.ts

@@ -1,4 +1,4 @@
-import { CarClass, CarStatus, CarType } from '../entity/car-type.entity';
+import { CarClass, CarStatus, CarType } from './car-type.entity';
 
 export class CarTypeDto {
   private id: string;

src/entity/car-type.entity.ts → src/modules/car-type/car-type.entity.ts

@@ -1,6 +1,6 @@
 import { NotAcceptableException } from '@nestjs/common';
 import { Column, Entity } from 'typeorm';
-import { BaseEntity } from '../common/base.entity';
+import { BaseEntity } from '../../common/base.entity';
 
 export enum CarClass {
   ECO = 'eco',

src/repository/car-type.repository.ts → src/modules/car-type/car-type.repository.ts

@@ -1,5 +1,5 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { CarClass, CarStatus, CarType } from '../entity/car-type.entity';
+import { CarClass, CarStatus, CarType } from './car-type.entity';
 import { NotFoundException } from '@nestjs/common';
 
 @EntityRepository(CarType)

src/service/car-type.service.ts → src/modules/car-type/car-type.service.ts

@@ -1,10 +1,10 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { CarTypeRepository } from '../repository/car-type.repository';
-import { AppProperties } from '../config/app-properties.config';
-import { CarClass, CarStatus, CarType } from '../entity/car-type.entity';
-import { CreateCarTypeDto } from '../dto/create-car-type.dto';
-import { CarTypeDto } from '../dto/car-type.dto';
+import { CarTypeRepository } from './car-type.repository';
+import { AppProperties } from '../../config/app-properties.config';
+import { CarClass, CarStatus, CarType } from './car-type.entity';
+import { CreateCarTypeDto } from '../../dto/create-car-type.dto';
+import { CarTypeDto } from './car-type.dto';
 
 @Injectable()
 export class CarTypeService {

src/controllers/claim.controller.ts → src/modules/claim/claim.controller.ts

@@ -1,8 +1,8 @@
-import { ClaimService } from '../service/claim.service';
+import { ClaimService } from './claim.service';
 import { Body, Controller, Get, Param, Post } from '@nestjs/common';
-import { ClaimDto } from '../dto/claim.dto';
-import { Claim, ClaimStatus } from '../entity/claim.entity';
-import { CreateClaimDto } from '../dto/create-claim.dto';
+import { ClaimDto } from './claim.dto';
+import { Claim, ClaimStatus } from './claim.entity';
+import { CreateClaimDto } from '../../dto/create-claim.dto';
 
 @Controller('claims')
 export class ClaimController {

src/dto/claim.dto.ts → src/modules/claim/claim.dto.ts

@@ -1,5 +1,5 @@
-import { Claim, ClaimStatus, CompletionMode } from '../entity/claim.entity';
-import { CreateClaimDto } from './create-claim.dto';
+import { Claim, ClaimStatus, CompletionMode } from './claim.entity';
+import { CreateClaimDto } from '../../dto/create-claim.dto';
 
 export class ClaimDto {
   private claimID: string;

src/entity/claim.entity.ts → src/modules/claim/claim.entity.ts

@@ -1,7 +1,7 @@
-import { BaseEntity } from '../common/base.entity';
-import { Client } from './client.entity';
+import { BaseEntity } from '../../common/base.entity';
+import { Client } from '../client/client.entity';
 import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from 'typeorm';
-import { Transit } from './transit.entity';
+import { Transit } from '../../entity/transit.entity';
 
 export enum ClaimStatus {
   DRAFT = 'draft',

src/repository/claim.repository.ts → src/modules/claim/claim.repository.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Claim } from '../entity/claim.entity';
-import { Client } from '../entity/client.entity';
-import { Transit } from '../entity/transit.entity';
+import { Claim } from './claim.entity';
+import { Client } from '../client/client.entity';
+import { Transit } from '../../entity/transit.entity';
 
 @EntityRepository(Claim)
 export class ClaimRepository extends Repository<Claim> {

src/service/claim.service.ts → src/modules/claim/claim.service.ts

@@ -1,16 +1,16 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { ClientRepository } from '../repository/client.repository';
-import { TransitRepository } from '../repository/transit.repository';
-import { AppProperties } from '../config/app-properties.config';
-import { ClaimRepository } from '../repository/claim.repository';
-import { ClaimNumberGenerator } from './claim-number-generator.service';
-import { AwardsService } from './awards.service';
-import { ClientNotificationService } from './client-notification.service';
-import { DriverNotificationService } from './driver-notification.service';
-import { ClaimDto } from '../dto/claim.dto';
-import { Claim, ClaimStatus, CompletionMode } from '../entity/claim.entity';
-import { Type } from '../entity/client.entity';
+import { ClientRepository } from '../client/client.repository';
+import { TransitRepository } from '../../repository/transit.repository';
+import { AppProperties } from '../../config/app-properties.config';
+import { ClaimRepository } from './claim.repository';
+import { ClaimNumberGenerator } from '../../service/claim-number-generator.service';
+import { AwardsService } from '../awards-account/awards.service';
+import { ClientNotificationService } from '../../service/client-notification.service';
+import { DriverNotificationService } from '../../service/driver-notification.service';
+import { ClaimDto } from './claim.dto';
+import { Claim, ClaimStatus, CompletionMode } from './claim.entity';
+import { Type } from 'src/modules/client/client.entity';
 
 @Injectable()
 export class ClaimService {

src/controllers/client.controller.ts → src/modules/client/client.controller.ts

@@ -7,9 +7,9 @@ import {
   UsePipes,
   ValidationPipe,
 } from '@nestjs/common';
-import { ClientService } from '../service/client.service';
-import { CreateClientDto } from '../dto/create-client.dto';
-import { ClientDto } from '../dto/client.dto';
+import { ClientService } from './client.service';
+import { CreateClientDto } from '../../dto/create-client.dto';
+import { ClientDto } from './client.dto';
 
 @Controller('clients')
 export class ClientController {

src/dto/client.dto.ts → src/modules/client/client.dto.ts

@@ -1,4 +1,4 @@
-import { Client, ClientType, PaymentType, Type } from '../entity/client.entity';
+import { Client, ClientType, PaymentType, Type } from './client.entity';
 
 export class ClientDto {
   private id: string;

src/entity/client.entity.ts → src/modules/client/client.entity.ts

@@ -1,6 +1,6 @@
-import { BaseEntity } from '../common/base.entity';
+import { BaseEntity } from '../../common/base.entity';
 import { Column, Entity, OneToMany } from 'typeorm';
-import { Claim } from './claim.entity';
+import { Claim } from '../claim/claim.entity';
 
 export enum ClientType {
   INDIVIDUAL = 'individual',