Merge pull request #58 from ti-broish/towns-code

Номенклатурни кодове на градовете вместо вътрешни идентификатори
ti-broish · Jun 22, 2021 · a360e26 · a360e26
2 parents 38d9399 + 92d1210
commit a360e26
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/sections/api/town-exists.constraint.ts b/src/sections/api/town-exists.constraint.ts
@@ -16,20 +16,20 @@ export class IsTownExistsConstraint implements ValidatorConstraintInterface {
     @Inject(TownsRepository) private readonly repo: TownsRepository,
   ) {}
 
-  async validate(townId?: number): Promise<boolean> {
-    if (!townId) {
+  async validate(townCode?: number): Promise<boolean> {
+    if (!townCode) {
       return true;
     }
 
-    if (typeof townId !== 'number' || townId <= 0) {
+    if (typeof townCode !== 'number' || townCode <= 0) {
       return false;
     }
 
-    return !!(await this.repo.findOne(townId));
+    return !!(await this.repo.findOneByCode(townCode));
   }
 
   defaultMessage?(validationArguments?: ValidationArguments): string {
-    return `Town with ID "${validationArguments.value}" does not exist!`;
+    return `Town with code "${validationArguments.value}" does not exist!`;
   }
 }
 

diff --git a/src/sections/api/town.dto.ts b/src/sections/api/town.dto.ts
@@ -11,7 +11,7 @@ import { IsTownExists } from './town-exists.constraint';
 @Exclude()
 export class TownDto {
   @ApiProperty()
-  @Expose({ groups: ['read', 'create'] })
+  @Expose({ name: 'code', groups: ['read', 'create'] })
   @IsTownExists({ groups: ['create'] })
   @IsNumber({}, { groups: ['create'] })
   @Min(1, { groups: ['create'] })

diff --git a/src/sections/entities/sections.repository.ts b/src/sections/entities/sections.repository.ts
@@ -39,7 +39,7 @@ export class SectionsRepository {
   }
 
   findByTownAndCityRegion(
-    townId: number,
+    townCode: number,
     cityRegionCode?: string,
   ): Promise<Section[]> {
     return this.repo.find({
@@ -50,7 +50,7 @@ export class SectionsRepository {
         },
       },
       where: (qb: SelectQueryBuilder<Section>): void => {
-        qb.where({ town: townId });
+        qb.andWhere('town.code = :townCode', { townCode });
 
         if (cityRegionCode) {
           qb.innerJoinAndSelect(

diff --git a/src/sections/entities/towns.repository.ts b/src/sections/entities/towns.repository.ts
@@ -10,12 +10,12 @@ export class TownsRepository {
     private repo: Repository<Town>,
   ) {}
 
-  findOne(id: number): Promise<Town> {
-    return this.repo.findOne(id);
+  findOneByCode(code: number): Promise<Town> {
+    return this.repo.findOne({ code });
   }
 
-  findOneOrFail(id: number): Promise<Town> {
-    return this.repo.findOneOrFail(id);
+  findOneByCodeOrFail(code: number): Promise<Town> {
+    return this.repo.findOneOrFail({ code });
   }
 
   filter(

diff --git a/src/violations/api/violations-filters.dto.ts b/src/violations/api/violations-filters.dto.ts
@@ -16,7 +16,7 @@ export class ViolationsFilters extends PageDTO {
   author: string;
 
   @Optional()
-  town: string;
+  town: number;
 
   @Optional()
   organization: number;

diff --git a/src/violations/entities/violations.repository.ts b/src/violations/entities/violations.repository.ts
@@ -57,7 +57,7 @@ export class ViolationsRepository {
     }
 
     if (filters.town) {
-      qb.andWhere('town.id = :town', { town: filters.town });
+      qb.andWhere('town.code = :town', { town: filters.town });
     }
 
     if (filters.author || filters.organization) {