Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/communes/communes.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { FindOneOptions, Repository } from 'typeorm';
import { VigieauLogger } from '../logger/vigieau.logger';
import { Commune } from '../zones/entities/commune.entity';
import { keyBy } from 'lodash';
Expand Down Expand Up @@ -34,7 +34,7 @@ export class CommunesService {

async findArretesMunicipaux() {
this.logger.log('LOADING COMMUNES ARRETES MUNICIPAUX');
return this.communeRepository.find({
return this.communeRepository.find(<FindOneOptions<Commune>>{
select: {
code: true,
arretesMunicipaux: {
Expand Down
11 changes: 11 additions & 0 deletions src/zones/entities/config.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { BaseEntity, Check, Column, Entity, PrimaryColumn } from 'typeorm';

@Entity()
@Check(`id = 1`)
export class Config extends BaseEntity {
@PrimaryColumn({ type: 'int', default: () => `1`, nullable: false })
id: number;

@Column({ type: 'timestamp', nullable: true })
computeZoneAlerteComputedDate: Date;
}
4 changes: 3 additions & 1 deletion src/zones/zones.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { DataModule } from '../data/data.module';
import { StatisticsModule } from '../statistics/statistics.module';
import { ArreteMunicipal } from './entities/arrete_municipal.entity';
import { CommunesModule } from '../communes/communes.module';
import { Config } from './entities/config.entity';

@Module({
imports: [
Expand All @@ -23,7 +24,8 @@ import { CommunesModule } from '../communes/communes.module';
Thematique,
ArreteCadre,
Fichier,
ArreteMunicipal
ArreteMunicipal,
Config
]),
DepartementsModule,
DataModule,
Expand Down
14 changes: 7 additions & 7 deletions src/zones/zones.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { DataService } from '../data/data.service';
import { ArreteMunicipal } from './entities/arrete_municipal.entity';
import { CommunesService } from '../communes/communes.service';
import { Commune } from './entities/commune.entity';
import { Config } from './entities/config.entity';

@Injectable()
export class ZonesService {
Expand All @@ -36,7 +37,9 @@ export class ZonesService {
private readonly dataService: DataService,
private readonly communesService: CommunesService,
@InjectRepository(ArreteMunicipal)
private readonly arreteMunicipalRepository: Repository<ArreteMunicipal>) {
private readonly arreteMunicipalRepository: Repository<ArreteMunicipal>,
@InjectRepository(Config)
private readonly configRepository: Repository<Config>) {
this.loadAllZones(true);
}

Expand Down Expand Up @@ -401,13 +404,10 @@ export class ZonesService {
if (this.loading || !this.lastUpdate) {
return;
}
const count = await this.zoneAlerteComputedRepository
.createQueryBuilder('zone_alerte_computed')
const count = await this.configRepository
.createQueryBuilder('config')
.where({
enabled: true,
})
.andWhere({
updatedAt: MoreThan(this.lastUpdate.toLocaleString('sv')),
computeZoneAlerteComputedDate: MoreThan(this.lastUpdate.toLocaleString('sv')),
})
.getCount();
if (count > 0) {
Expand Down
Loading