Skip to content

Commit

Permalink
fix: conflicts, lint and prettier errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Kingcedru committed Dec 10, 2024
1 parent 914788b commit 3de8814
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {MigrationInterface, QueryRunner, Table} from "typeorm";
import { MigrationInterface, QueryRunner, Table } from 'typeorm';

export class fileProcessingType1733820066628 implements MigrationInterface {

public async up(queryRunner: QueryRunner): Promise<void> {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.createTable(
new Table({
name: 'file_processing_jobs',
Expand All @@ -29,7 +28,7 @@ export class fileProcessingType1733820066628 implements MigrationInterface {
{
name: 'status',
type: 'enum',
enum: ['Pending', 'InProgress', 'Completed', 'Failed'],
enum: ['Pending', 'InProgress', 'Completed', 'Failed'],
},
{
name: 'type',
Expand All @@ -54,5 +53,5 @@ export class fileProcessingType1733820066628 implements MigrationInterface {

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.dropTable('file_processing_jobs');
}
}
}
4 changes: 2 additions & 2 deletions apps/drec-api/src/pods/file/file-processing.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export enum FileProcessingStatus {
}

export enum FileProcessingType {
AddMeterRead = "MeterRead",
DeviceCreation = "DeviceCreation",
AddMeterRead = 'MeterRead',
DeviceCreation = 'DeviceCreation',
}

@Entity('file_processing_jobs')
Expand Down
1 change: 0 additions & 1 deletion apps/drec-api/src/pods/reads/reads.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
HttpException,
BadRequestException,
Logger,
UnauthorizedException,
UseInterceptors,
UploadedFile,
} from '@nestjs/common';
Expand Down
9 changes: 0 additions & 9 deletions apps/drec-api/src/pods/reads/reads.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,28 @@ import { AggregateMeterRead } from './aggregate_readvalue.entity';
import { flattenDeep, values, groupBy, mean, sum } from 'lodash';
import { NewIntmediateMeterReadDTO } from './dto/intermediate_meter_read.dto';
import { IAggregateintermediate, ILoggedInUser } from '../../models';
import { InjectRepository } from '@nestjs/typeorm';
import { DeltaFirstRead } from './delta_firstread.entity';
import { flattenDeep, groupBy, mean, sum, values } from 'lodash';
import { DateTime } from 'luxon';
import { convertToWh } from 'src/utils/convert-to-power-units';
import { GenerationReadingStoredEvent } from '../../events/GenerationReadingStored.event';
import { writePoints } from '../../lib/influx-db';
import { IAggregateintermediate } from '../../models';
import { HistoryNextInssuanceStatus } from '../../utils/enums/history_next_issuance.enum';
import {
getFormattedOffSetFromOffsetAsJson,
getLocalTime,
getLocalTimeZoneFromDevice,
getOffsetFromTimeZoneName,
} from '../../utils/localTimeDetailsForDevice';
import { DeviceGroupService } from '../device-group/device-group.service';
import { DeviceService } from '../device/device.service';
import { DeviceDTO } from '../device/dto';
import { OrganizationService } from '../organization/organization.service';
import { AggregateMeterRead } from './aggregate_readvalue.entity';
import { BASE_READ_SERVICE } from './const';
import { DeltaFirstRead } from './delta_firstread.entity';
import {
FilterNoOffLimit,
AccumulationType,
} from './dto/filter-no-off-limit.dto';
import { FileService } from '../file';
import { InjectQueue } from '@nestjs/bull';
import { Queue } from 'bull';
import { NewIntmediateMeterReadDTO } from './dto/intermediate_meter_read.dto';
import { HistoryIntermediate_MeterRead } from './history_intermideate_meterread.entity';

export type TUserBaseEntity = ExtendedBaseEntity & IAggregateintermediate;

Expand Down

0 comments on commit 3de8814

Please sign in to comment.