Bisonai · martinkersner · Mar 5, 2023 · Mar 5, 2023 · Mar 5, 2023 · Mar 5, 2023
@@ -10,7 +10,6 @@ CREATE TABLE "Chain" (
 CREATE TABLE "Feed" (
     "id" SERIAL NOT NULL,
     "name" TEXT NOT NULL,
-    "latestRound" INTEGER NOT NULL,
     "definition" JSONB NOT NULL,
     "adapterId" INTEGER NOT NULL,
 

@@ -19,7 +19,6 @@ model Chain {
 model Feed {
   id          Int     @id @default(autoincrement())
   name        String
-  latestRound Int
   definition  Json
   adapter     Adapter @relation(fields: [adapterId], references: [id], onDelete: Cascade)
   adapterId   Int

@@ -1,4 +1,4 @@
-import { Controller, Get, Post, Body, Param } from '@nestjs/common'
+import { Controller, Get, Post, Body, Param, Delete } from '@nestjs/common'
 import { Adapter as AdapterModel } from '@prisma/client'
 import { AdapterService } from './adapter.service'
 import { AdapterDto } from './dto/adapter.dto'
@@ -24,4 +24,9 @@ export class AdapterController {
   findOne(@Param('id') id: string) {
     return this.adapterService.findOne({ id: Number(id) })
   }
+
+  @Delete(':id')
+  async remove(@Param('id') id: string): Promise<AdapterModel> {
+    return this.adapterService.remove({ id: Number(id) })
+  }
 }
@@ -21,8 +21,7 @@ describe('AdapterService', () => {
     const feeds = [
       {
         name: 'Binance-BTC-USD',
-        latestRound: -1,
-        definition: JSON.stringify({
+        definition: {
           url: 'https://api.binance.us/api/v3/ticker/price?symbol=BTCUSD',
           headers: {
             'Content-Type': 'application/json'
@@ -41,12 +40,12 @@ describe('AdapterService', () => {
               function: 'ROUND'
             }
           ]
-        })
+        }
       }
     ]
 
     const { id } = await adapter.create({
-      adapterId: '0xe63985ed9d9aae887bdcfa03b53a1bea6fd1acc58b8cd51a9a69ede43eac6235',
+      id: '0xe63985ed9d9aae887bdcfa03b53a1bea6fd1acc58b8cd51a9a
F438
69ede43eac6235',
       name: 'BTC-USD',
       decimals: 8,
       feeds

@@ -8,17 +8,17 @@ export class AdapterService {
   constructor(private prisma: PrismaService) {}
 
   create(adapterDto: AdapterDto): Promise<Adapter> {
+    // TODO validate
+
     const data: Prisma.AdapterCreateInput = {
-      adapterId: adapterDto.adapterId,
+      adapterId: adapterDto.id,
       name: adapterDto.name,
       decimals: adapterDto.decimals,
       feeds: {
         create: adapterDto.feeds
       }
     }
 
-    // TODO validate
-
     return this.prisma.adapter.create({ data })
   }
 

@@ -3,7 +3,7 @@ import { FeedDto as Feed } from '../../feed/dto/feed.dto'
 
 export class AdapterDto {
   @ApiProperty()
-  adapterId: string
+  id: string
 
   @ApiProperty()
   name: string

@@ -1,7 +1,18 @@
-import { Controller, Get, Post, Body, Param } from '@nestjs/common'
+import {
+  Controller,
+  Get,
+  Post,
+  Body,
+  Delete,
+  Param,
+  HttpException,
+  HttpStatus
+} from '@nestjs/common'
 import { Aggregator as AggregatorModel } from '@prisma/client'
 import { AggregatorService } from './aggregator.service'
 import { AggregatorDto } from './dto/aggregator.dto'
+import { AggregatorWhereDto } from './dto/aggregator-where.dto'
+import { PRISMA_ERRORS } from '../errors'
 
 @Controller({
   path: 'aggregator',
@@ -11,17 +22,34 @@ export class AggregatorController {
   constructor(private readonly aggregatorService: AggregatorService) {}
 
   @Post()
-  create(@Body() aggregatorDto: AggregatorDto): Promise<AggregatorModel> {
-    return this.aggregatorService.create(aggregatorDto)
+  async create(@Body() aggregatorDto: AggregatorDto) {
+    return await this.aggregatorService.create(aggregatorDto).catch((err) => {
+      throw new HttpException(
+        {
+          message: PRISMA_ERRORS[err.code](err.meta)
+        },
+        HttpStatus.BAD_REQUEST
+      )
+    })
   }
 
   @Get()
-  findAll() {
-    return this.aggregatorService.findAll({})
+  findAll(@Body() whereDto: AggregatorWhereDto) {
+    return this.aggregatorService.findAll({
+      where: {
+        chain: { name: whereDto.chain },
+        active: whereDto.active
+      }
+    })
   }
 
   @Get(':id')
   findOne(@Param('id') id: string) {
     return this.aggregatorService.findOne({ id: Number(id) })
   }
+
+  @Delete(':id')
+  async remove(@Param('id') id: string): Promise<AggregatorModel> {
+    return this.aggregatorService.remove({ id: Number(id) })
+  }
 }
@@ -31,8 +31,7 @@ describe('AggregatorService', () => {
     const feeds = [
       {
         name: 'Binance-BTC-USD',
-        latestRound: -1,
-        definition: JSON.stringify({
+        definition: {
           url: 'https://api.binance.us/api/v3/ticker/price?symbol=BTCUSD',
           headers: {
             'Content-Type': 'application/json'
@@ -51,27 +50,27 @@ describe('AggregatorService', () => {
               function: 'ROUND'
             }
           ]
-        })
+        }
       }
     ]
     const adapterObj = await adapter.create({
-      adapterId: 'adapterId-aggregator-test',
+      id: 'adapterId-aggregator-test',
       name: 'BTC-USD',
       decimals: 8,
       feeds
     })
 
     // Aggregator
     const aggregatorData = {
-      aggregatorId: 'aggregatorId-aggregator-test',
+      id: 'aggregatorId-aggregator-test',
       active: false,
       name: 'ETH-USD',
       address: '0x',
       heartbeat: 10_000,
       threshold: 0.04,
       absoluteThreshold: 0.1,
       adapterId: adapterObj.adapterId,
-      chainName: chainObj.name
+      chain: chainObj.name
     }
     const aggregatorObj = await aggregator.create(aggregatorData)
 

@@ -9,15 +9,15 @@ export class AggregatorService {
 
   async create(aggregatorDto: AggregatorDto): Promise<Aggregator> {
     const chain = await this.prisma.chain.findUnique({
-      where: { name: aggregatorDto.chainName }
+      where: { name: aggregatorDto.chain }
     })
 
     const adapter = await this.prisma.adapter.findUnique({
       where: { adapterId: aggregatorDto.adapterId }
     })
 
     const data: Prisma.AggregatorUncheckedCreateInput = {
-      aggregatorId: aggregatorDto.aggregatorId,
+      aggregatorId: aggregatorDto.id,
       active: aggregatorDto.active,
       name: aggregatorDto.name,
       address: aggregatorDto.address,
@@ -28,7 +28,7 @@ export class AggregatorService {
       chainId: chain.id
     }
 
-    return this.prisma.aggregator.create({ data })
+    return await this.prisma.aggregator.create({ data })
   }
 
   async findAll(params: {

@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger'
+
+export class AggregatorWhereDto {
+  @ApiProperty()
+  active?: boolean
+
+  @ApiProperty()
+  chain?: string
+}
@@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger'
 
 export class AggregatorDto {
   @ApiProperty()
-  aggregatorId: string
+  id: string
 
   @ApiProperty()
   active: boolean
@@ -26,5 +26,5 @@ export class AggregatorDto {
   adapterId: string
 
   @ApiProperty()
-  chainName: string
+  chain: string
 }
@@ -34,8 +34,7 @@ describe('DataService', () => {
     const feeds = [
       {
         name: 'Binance-BTC-USD',
-        latestRound: -1,
-        definition: JSON.stringify({
+        definition: {
           url: 'https://api.binance.us/api/v3/ticker/price?symbol=BTCUSD',
           headers: {
             'Content-Type': 'application/json'
@@ -54,27 +53,27 @@ describe('DataService', () => {
               function: 'ROUND'
             }
           ]
-        })
+        }
       }
     ]
     const adapterObj = await adapter.create({
-      adapterId: 'adapterId-data-test',
+      id: 'adapterId-data-test',
       name: 'BTC-USD',
       decimals: 8,
       feeds
     })
 
     // Aggregator
     const aggregatorData = {
-      aggregatorId: 'aggregatorId-data-test',
+      id: 'aggregatorId-data-test',
       active: false,
       name: 'ETH-USD',
       address: '0x',
       heartbeat: 10_000,
       threshold: 0.04,
       absoluteThreshold: 0.1,
       adapterId: adapterObj.adapterId,
-      chainName: chainObj.name
+      chain: chainObj.name
     }
     const aggregatorObj = await aggregator.create(aggregatorData)
 

@@ -0,0 +1,4 @@
+// https://www.prisma.io/docs/reference/api-reference/error-reference
+export const PRISMA_ERRORS = {
+  P2002: (meta) => `Unique constraint failed on the ${meta.target}`
+}
@@ -5,8 +5,5 @@ export class FeedDto {
   name: string
 
   @ApiProperty()
-  latestRound: number
-
-  @ApiProperty()
-  definition: string
+  definition: any
 }