Moved Maker API service into its own module

matthewpetro · Mar 3, 2024 · 35bb982 · 35bb982
1 parent e8c7794
commit 35bb982
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 22 deletions.
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -6,6 +6,7 @@ import { IrrigationEventsModule } from './irrigation-events/irrigation-events.mo
 import { DevtoolsModule } from '@nestjs/devtools-integration'
 import { SunriseSunsetModule } from './sunrise-sunset/sunrise-sunset.module'
 import { IrrigationProgramsModule } from './irrigation-programs/irrigation-programs.module'
+import { MakerApiModule } from './maker-api/maker-api.module'
 
 @Module({
   imports: [
@@ -14,6 +15,7 @@ import { IrrigationProgramsModule } from './irrigation-programs/irrigation-progr
     IrrigationEventsModule,
     SunriseSunsetModule,
     IrrigationProgramsModule,
+    MakerApiModule,
   ],
   controllers: [AppController],
   providers: [AppService],

diff --git a/...on-events/enums/device-state.interface.ts → src/enums/device-state.interface.ts b/...on-events/enums/device-state.interface.ts → src/enums/device-state.interface.ts
diff --git a/src/irrigation-events/dto/maker-api-event.dto.ts b/src/irrigation-events/dto/maker-api-event.dto.ts
@@ -1,4 +1,4 @@
-import { DeviceState } from '../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { Equals, IsNumber, IsString, IsEnum } from 'class-validator'
 
 export class MakerApiEventDto {

diff --git a/src/irrigation-events/entities/irrigation-event.entity.ts b/src/irrigation-events/entities/irrigation-event.entity.ts
@@ -1,5 +1,5 @@
 import { IdentifiedDocument } from 'nano'
-import { DeviceState } from '../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 
 export class IrrigationEventDocument implements IdentifiedDocument {
   _id: string

diff --git a/src/irrigation-events/interfaces/device-events.interface.ts b/src/irrigation-events/interfaces/device-events.interface.ts
@@ -1,4 +1,4 @@
-import { DeviceState } from '../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { IrrigationEvent } from './irrigation-event.interface'
 
 export interface DeviceEvents {

diff --git a/src/irrigation-events/interfaces/irrigation-event.interface.ts b/src/irrigation-events/interfaces/irrigation-event.interface.ts
@@ -1,4 +1,4 @@
-import { DeviceState } from '../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 
 export interface IrrigationEvent {
   timestamp: Date

diff --git a/src/irrigation-events/irrigation-events.controller.spec.ts b/src/irrigation-events/irrigation-events.controller.spec.ts
@@ -1,14 +1,14 @@
 import { Test, TestingModule } from '@nestjs/testing'
 import { IrrigationEventsController } from '@/irrigation-events/irrigation-events.controller'
-import { MakerApiService } from './maker-api.service'
+import { MakerApiService } from '@/maker-api/maker-api.service'
 import { ViewmodelTransformService } from './viewmodel-transform.service'
 import { IrrigationEventsService } from './irrigation-events.service'
 import { ConfigModule } from '@nestjs/config'
-import { DeviceState } from './enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { MakerApiEventDto } from './dto/maker-api-event.dto'
 import { IrrigationEvent } from './interfaces/irrigation-event.interface'
 import { parseISO } from 'date-fns'
-import { DeviceStates } from './interfaces/device-states.interface'
+import { DeviceStates } from '@/maker-api/interfaces/device-states.interface'
 import { IrrigationEventViewmodel } from './dto/irrigation-event-viewmodel.dto'
 
 describe('IrrigationEventsController', () => {

diff --git a/src/irrigation-events/irrigation-events.controller.ts b/src/irrigation-events/irrigation-events.controller.ts
@@ -4,8 +4,8 @@ import { isWithinInterval, parseISO } from 'date-fns'
 import { IrrigationEventsService } from './irrigation-events.service'
 import { IrrigationEvent } from './interfaces/irrigation-event.interface'
 import { MakerApiEventDto } from './dto/maker-api-event.dto'
-import { DeviceState } from './enums/device-state.interface'
-import { MakerApiService } from './maker-api.service'
+import { DeviceState } from '@/enums/device-state.interface'
+import { MakerApiService } from '@/maker-api/maker-api.service'
 import { ViewmodelTransformService } from './viewmodel-transform.service'
 import { DeviceEvents } from './interfaces/device-events.interface'
 

diff --git a/src/irrigation-events/irrigation-events.module.ts b/src/irrigation-events/irrigation-events.module.ts
@@ -1,14 +1,14 @@
 import { Module } from '@nestjs/common'
 import { ConfigModule } from '@nestjs/config'
+import { MakerApiModule } from '@/maker-api/maker-api.module'
 import { IrrigationEventsService } from '@/irrigation-events/irrigation-events.service'
 import { IrrigationEventsController } from '@/irrigation-events/irrigation-events.controller'
-import { MakerApiService } from './maker-api.service'
 import { ViewmodelTransformService } from './viewmodel-transform.service'
 import { DatabaseModule } from '@/database/database.module'
 
 @Module({
-  imports: [ConfigModule, DatabaseModule],
+  imports: [ConfigModule, DatabaseModule, MakerApiModule],
   controllers: [IrrigationEventsController],
-  providers: [IrrigationEventsService, MakerApiService, ViewmodelTransformService],
+  providers: [IrrigationEventsService, ViewmodelTransformService],
 })
 export class IrrigationEventsModule {}
diff --git a/src/irrigation-events/irrigation-events.service.spec.ts b/src/irrigation-events/irrigation-events.service.spec.ts
@@ -2,7 +2,7 @@ import { Test, TestingModule } from '@nestjs/testing'
 import { IrrigationEvent } from './interfaces/irrigation-event.interface'
 import { IrrigationEventDocument } from './entities/irrigation-event.entity'
 import { MakerApiEventDto } from './dto/maker-api-event.dto'
-import { DeviceState } from './enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { ConfigModule } from '@nestjs/config'
 import { parseISO } from 'date-fns'
 

diff --git a/src/irrigation-events/mocks/viewmodel-transform/device-currently-on.mocks.ts b/src/irrigation-events/mocks/viewmodel-transform/device-currently-on.mocks.ts
@@ -1,5 +1,5 @@
 import { IrrigationEvent } from '../../interfaces/irrigation-event.interface'
-import { DeviceState } from '../../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { DeviceEvents } from '../../interfaces/device-events.interface'
 import { IrrigationEventViewmodel } from '../../dto/irrigation-event-viewmodel.dto'
 

diff --git a/src/irrigation-events/mocks/viewmodel-transform/happy-path.mocks.ts b/src/irrigation-events/mocks/viewmodel-transform/happy-path.mocks.ts
@@ -1,5 +1,5 @@
 import { IrrigationEvent } from '../../interfaces/irrigation-event.interface'
-import { DeviceState } from '../../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { DeviceEvents } from '../../interfaces/device-events.interface'
 import { IrrigationEventViewmodel } from '../../dto/irrigation-event-viewmodel.dto'
 

diff --git a/src/irrigation-events/mocks/viewmodel-transform/missing-final-off.mocks.ts b/src/irrigation-events/mocks/viewmodel-transform/missing-final-off.mocks.ts
@@ -1,5 +1,5 @@
 import { IrrigationEvent } from '../../interfaces/irrigation-event.interface'
-import { DeviceState } from '../../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { Warning } from '../../enums/warning.interface'
 import { DeviceEvents } from '../../interfaces/device-events.interface'
 import { IrrigationEventViewmodel } from '../../dto/irrigation-event-viewmodel.dto'

diff --git a/src/irrigation-events/mocks/viewmodel-transform/missing-off.mocks.ts b/src/irrigation-events/mocks/viewmodel-transform/missing-off.mocks.ts
@@ -1,5 +1,5 @@
 import { IrrigationEvent } from '../../interfaces/irrigation-event.interface'
-import { DeviceState } from '../../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { Warning } from '../../enums/warning.interface'
 import { DeviceEvents } from '../../interfaces/device-events.interface'
 import { IrrigationEventViewmodel } from '../../dto/irrigation-event-viewmodel.dto'

diff --git a/src/irrigation-events/mocks/viewmodel-transform/missing-on.mocks.ts b/src/irrigation-events/mocks/viewmodel-transform/missing-on.mocks.ts
@@ -1,5 +1,5 @@
 import { IrrigationEvent } from '../../interfaces/irrigation-event.interface'
-import { DeviceState } from '../../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { Warning } from '../../enums/warning.interface'
 import { DeviceEvents } from '../../interfaces/device-events.interface'
 import { IrrigationEventViewmodel } from '../../dto/irrigation-event-viewmodel.dto'

diff --git a/src/irrigation-events/viewmodel-transform.service.ts b/src/irrigation-events/viewmodel-transform.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common'
 import { compareAsc, roundToNearestMinutes } from 'date-fns'
 import { IrrigationEventViewmodel } from './dto/irrigation-event-viewmodel.dto'
-import { DeviceState } from './enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 import { Warning } from './enums/warning.interface'
 import { DeviceEvents } from './interfaces/device-events.interface'
 

diff --git a/...nts/interfaces/device-states.interface.ts → ...api/interfaces/device-states.interface.ts b/...nts/interfaces/device-states.interface.ts → ...api/interfaces/device-states.interface.ts
@@ -1,4 +1,4 @@
-import { DeviceState } from '../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 
 export interface DeviceStates {
   [deviceId: number]: DeviceState | undefined

diff --git a/...erfaces/maker-device-details.interface.ts → ...erfaces/maker-device-details.interface.ts b/...erfaces/maker-device-details.interface.ts → ...erfaces/maker-device-details.interface.ts
@@ -1,4 +1,4 @@
-import { DeviceState } from '../enums/device-state.interface'
+import { DeviceState } from '@/enums/device-state.interface'
 
 export interface MakerDeviceDetails {
   id: string

diff --git a/src/maker-api/maker-api.module.ts b/src/maker-api/maker-api.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common'
+import { MakerApiService } from './maker-api.service'
+import { ConfigModule } from '@nestjs/config'
+
+@Module({
+  imports: [ConfigModule],
+  providers: [MakerApiService],
+  exports: [MakerApiService],
+})
+export class MakerApiModule {}
diff --git a/...rigation-events/maker-api.service.spec.ts → src/maker-api/maker-api.service.spec.ts b/...rigation-events/maker-api.service.spec.ts → src/maker-api/maker-api.service.spec.ts
@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing'
-import { MakerApiService } from '@/irrigation-events/maker-api.service'
+import { MakerApiService } from './maker-api.service'
 import { ConfigModule } from '@nestjs/config'
 import mockData from './mocks/maker-api.mocks.json'
 import axios from 'axios'

diff --git a/src/irrigation-events/maker-api.service.ts → src/maker-api/maker-api.service.ts b/src/irrigation-events/maker-api.service.ts → src/maker-api/maker-api.service.ts
diff --git a/...igation-events/mocks/maker-api.mocks.json → src/maker-api/mocks/maker-api.mocks.json b/...igation-events/mocks/maker-api.mocks.json → src/maker-api/mocks/maker-api.mocks.json