Merge branch 'main' of...

Merge branch 'main' of https://gitlab.engr.illinois.edu/ie421_high_frequency_trading_spring_2023/ie421_hft_spring_2023_group_04/group_04_project

src/netcap_api/node_modules/.prisma/client/index.d.ts

@@ -19,8 +19,8 @@ export type PrismaPromise<T> = runtime.Types.Public.PrismaPromise<T>
 export type PingPong = {
   id: number
   source_ip: string
-  ping_time: Date
-  pong_time: Date
+  ping_time: bigint
+  pong_time: bigint
   latency: number
 }
 
@@ -801,27 +801,31 @@ export namespace Prisma {
 
   export type PingPongAvgAggregateOutputType = {
     id: number | null
+    ping_time: number | null
+    pong_time: number | null
     latency: number | null
   }
 
   export type PingPongSumAggregateOutputType = {
     id: number | null
+    ping_time: bigint | null
+    pong_time: bigint | null
     latency: number | null
   }
 
   export type PingPongMinAggregateOutputType = {
     id: number | null
     source_ip: string | null
-    ping_time: Date | null
-    pong_time: Date | null
+    ping_time: bigint | null
+    pong_time: bigint | null
     latency: number | null
   }
 
   export type PingPongMaxAggregateOutputType = {
     id: number | null
     source_ip: string | null
-    ping_time: Date | null
-    pong_time: Date | null
+    ping_time: bigint | null
+    pong_time: bigint | null
     latency: number | null
   }
 
@@ -837,11 +841,15 @@ export namespace Prisma {
 
   export type PingPongAvgAggregateInputType = {
     id?: true
+    ping_time?: true
+    pong_time?: true
     latency?: true
   }
 
   export type PingPongSumAggregateInputType = {
     id?: true
+    ping_time?: true
+    pong_time?: true
     latency?: true
   }
 
@@ -960,8 +968,8 @@ export namespace Prisma {
   export type PingPongGroupByOutputType = {
     id: number
     source_ip: string
-    ping_time: Date
-    pong_time: Date
+    ping_time: bigint
+    pong_time: bigint
     latency: number
     _count: PingPongCountAggregateOutputType | null
     _avg: PingPongAvgAggregateOutputType | null
@@ -1753,8 +1761,8 @@ export namespace Prisma {
     NOT?: Enumerable<PingPongWhereInput>
     id?: IntFilter | number
     source_ip?: StringFilter | string
-    ping_time?: DateTimeFilter | Date | string
-    pong_time?: DateTimeFilter | Date | string
+    ping_time?: BigIntFilter | bigint | number
+    pong_time?: BigIntFilter | bigint | number
     latency?: FloatFilter | number
   }
 
@@ -1789,61 +1797,61 @@ export namespace Prisma {
     NOT?: Enumerable<PingPongScalarWhereWithAggregatesInput>
     id?: IntWithAggregatesFilter | number
     source_ip?: StringWithAggregatesFilter | string
-    ping_time?: DateTimeWithAggregatesFilter | Date | string
-    pong_time?: DateTimeWithAggregatesFilter | Date | string
+    ping_time?: BigIntWithAggregatesFilter | bigint | number
+    pong_time?: BigIntWithAggregatesFilter | bigint | number
     latency?: FloatWithAggregatesFilter | number
   }
 
   export type PingPongCreateInput = {
     source_ip: string
-    ping_time: Date | string
-    pong_time: Date | string
+    ping_time: bigint | number
+    pong_time: bigint | number
     latency: number
   }
 
   export type PingPongUncheckedCreateInput = {
     id?: number
     source_ip: string
-    ping_time: Date | string
-    pong_time: Date | string
+    ping_time: bigint | number
+    pong_time: bigint | number
     latency: number
   }
 
   export type PingPongUpdateInput = {
     source_ip?: StringFieldUpdateOperationsInput | string
-    ping_time?: DateTimeFieldUpdateOperationsInput | Date | string
-    pong_time?: DateTimeFieldUpdateOperationsInput | Date | string
+    ping_time?: BigIntFieldUpdateOperationsInput | bigint | number
+    pong_time?: BigIntFieldUpdateOperationsInput | bigint | number
     latency?: FloatFieldUpdateOperationsInput | number
   }
 
   export type PingPongUncheckedUpdateInput = {
     id?: IntFieldUpdateOperationsInput | number
     source_ip?: StringFieldUpdateOperationsInput | string
-    ping_time?: DateTimeFieldUpdateOperationsInput | Date | string
-    pong_time?: DateTimeFieldUpdateOperationsInput | Date | string
+    ping_time?: BigIntFieldUpdateOperationsInput | bigint | number
+    pong_time?: BigIntFieldUpdateOperationsInput | bigint | number
     latency?: FloatFieldUpdateOperationsInput | number
   }
 
   export type PingPongCreateManyInput = {
     id?: number
     source_ip: string
-    ping_time: Date | string
-    pong_time: Date | string
+    ping_time: bigint | number
+    pong_time: bigint | number
     latency: number
   }
 
   export type PingPongUpdateManyMutationInput = {
     source_ip?: StringFieldUpdateOperationsInput | string
-    ping_time?: DateTimeFieldUpdateOperationsInput | Date | string
-    pong_time?: DateTimeFieldUpdateOperationsInput | Date | string
+    ping_time?: BigIntFieldUpdateOperationsInput | bigint | number
+    pong_time?: BigIntFieldUpdateOperationsInput | bigint | number
     latency?: FloatFieldUpdateOperationsInput | number
   }
 
   export type PingPongUncheckedUpdateManyInput = {
     id?: IntFieldUpdateOperationsInput | number
     source_ip?: StringFieldUpdateOperationsInput | string
-    ping_time?: DateTimeFieldUpdateOperationsInput | Date | string
-    pong_time?: DateTimeFieldUpdateOperationsInput | Date | string
+    ping_time?: BigIntFieldUpdateOperationsInput | bigint | number
+    pong_time?: BigIntFieldUpdateOperationsInput | bigint | number
     latency?: FloatFieldUpdateOperationsInput | number
   }
 
@@ -1872,15 +1880,15 @@ export namespace Prisma {
     not?: NestedStringFilter | string
   }
 
-  export type DateTimeFilter = {
-    equals?: Date | string
-    in?: Enumerable<Date> | Enumerable<string>
-    notIn?: Enumerable<Date> | Enumerable<string>
-    lt?: Date | string
-    lte?: Date | string
-    gt?: Date | string
-    gte?: Date | string
-    not?: NestedDateTimeFilter | Date | string
+  export type BigIntFilter = {
+    equals?: bigint | number
+    in?: Enumerable<bigint> | Enumerable<number>
+    notIn?: Enumerable<bigint> | Enumerable<number>
+    lt?: bigint | number
+    lte?: bigint | number
+    gt?: bigint | number
+    gte?: bigint | number
+    not?: NestedBigIntFilter | bigint | number
   }
 
   export type FloatFilter = {
@@ -1904,6 +1912,8 @@ export namespace Prisma {
 
   export type PingPongAvgOrderByAggregateInput = {
     id?: SortOrder
+    ping_time?: SortOrder
+    pong_time?: SortOrder
     latency?: SortOrder
   }
 
@@ -1925,6 +1935,8 @@ export namespace Prisma {
 
   export type PingPongSumOrderByAggregateInput = {
     id?: SortOrder
+    ping_time?: SortOrder
+    pong_time?: SortOrder
     latency?: SortOrder
   }
 
@@ -1961,18 +1973,20 @@ export namespace Prisma {
     _max?: NestedStringFilter
   }
 
-  export type DateTimeWithAggregatesFilter = {
-    equals?: Date | string
-    in?: Enumerable<Date> | Enumerable<string>
-    notIn?: Enumerable<Date> | Enumerable<string>
-    lt?: Date | string
-    lte?: Date | string
-    gt?: Date | string
-    gte?: Date | string
-    not?: NestedDateTimeWithAggregatesFilter | Date | string
+  export type BigIntWithAggregatesFilter = {
+    equals?: bigint | number
+    in?: Enumerable<bigint> | Enumerable<number>
+    notIn?: Enumerable<bigint> | Enumerable<number>
+    lt?: bigint | number
+    lte?: bigint | number
+    gt?: bigint | number
+    gte?: bigint | number
+    not?: NestedBigIntWithAggregatesFilter | bigint | number
     _count?: NestedIntFilter
-    _min?: NestedDateTimeFilter
-    _max?: NestedDateTimeFilter
+    _avg?: NestedFloatFilter
+    _sum?: NestedBigIntFilter
+    _min?: NestedBigIntFilter
+    _max?: NestedBigIntFilter
   }
 
   export type FloatWithAggregatesFilter = {
@@ -1995,8 +2009,12 @@ export namespace Prisma {
     set?: string
   }
 
-  export type DateTimeFieldUpdateOperationsInput = {
-    set?: Date | string
+  export type BigIntFieldUpdateOperationsInput = {
+    set?: bigint | number
+    increment?: bigint | number
+    decrement?: bigint | number
+    multiply?: bigint | number
+    divide?: bigint | number
   }
 
   export type FloatFieldUpdateOperationsInput = {
@@ -2040,15 +2058,15 @@ export namespace Prisma {
     not?: NestedStringFilter | string
   }
 
-  export type NestedDateTimeFilter = {
-    equals?: Date | string
-    in?: Enumerable<Date> | Enumerable<string>
-    notIn?: Enumerable<Date> | Enumerable<string>
-    lt?: Date | string
-    lte?: Date | string
-    gt?: Date | string
-    gte?: Date | string
-    not?: NestedDateTimeFilter | Date | string
+  export type NestedBigIntFilter = {
+    equals?: bigint | number
+    in?: Enumerable<bigint> | Enumerable<number>
+    notIn?: Enumerable<bigint> | Enumerable<number>
+    lt?: bigint | number
+    lte?: bigint | number
+    gt?: bigint | number
+    gte?: bigint | number
+    not?: NestedBigIntFilter | bigint | number
   }
 
   export type NestedFloatFilter = {
@@ -2095,18 +2113,20 @@ export namespace Prisma {
     _max?: NestedStringFilter
   }
 
-  export type NestedDateTimeWithAggregatesFilter = {
-    equals?: Date | string
-    in?: Enumerable<Date> | Enumerable<string>
-    notIn?: Enumerable<Date> | Enumerable<string>
-    lt?: Date | string
-    lte?: Date | string
-    gt?: Date | string
-    gte?: Date | string
-    not?: NestedDateTimeWithAggregatesFilter | Date | string
+  export type NestedBigIntWithAggregatesFilter = {
+    equals?: bigint | number
+    in?: Enumerable<bigint> | Enumerable<number>
+    notIn?: Enumerable<bigint> | Enumerable<number>
+    lt?: bigint | number
+    lte?: bigint | number
+    gt?: bigint | number
+    gte?: bigint | number
+    not?: NestedBigIntWithAggregatesFilter | bigint | number
     _count?: NestedIntFilter
-    _min?: NestedDateTimeFilter
-    _max?: NestedDateTimeFilter
+    _avg?: NestedFloatFilter
+    _sum?: NestedBigIntFilter
+    _min?: NestedBigIntFilter
+    _max?: NestedBigIntFilter
   }
 
   export type NestedFloatWithAggregatesFilter = {

src/netcap_api/node_modules/.prisma/client/schema.prisma

@@ -14,14 +14,7 @@ datasource db {
 model PingPong {
   id        Int      @id @default(autoincrement())
   source_ip String   @db.VarChar(20)
-  ping_time DateTime @db.Timestamp(0)
-  pong_time DateTime @db.Timestamp(0)
+  ping_time BigInt   @db.BigInt
+  pong_time BigInt   @db.BigInt
   latency   Float    @db.Float
 }
-
-// model User {
-//   id        Int      @id @default(autoincrement())
-//   createdAt DateTime @default(now())
-//   email     String   @unique
-//   name      String?
-// }
\ No newline at end of file

src/netcap_api/prisma/schema.prisma

@@ -14,7 +14,7 @@ datasource db {
 model PingPong {
   id        Int      @id @default(autoincrement())
   source_ip String   @db.VarChar(20)
-  ping_time DateTime @db.Timestamp(0)
-  pong_time DateTime @db.Timestamp(0)
+  ping_time BigInt   @db.BigInt
+  pong_time BigInt   @db.BigInt
   latency   Float    @db.Float
 }

src/netcap_api/src/main.ts

@@ -6,3 +6,7 @@ async function bootstrap() {
   await app.listen(3000);
 }
 bootstrap();
+
+(BigInt.prototype as any).toJSON = function () {
+  return Number(this)
+};

src/netcap_api/src/pingPong.service.ts

@@ -36,8 +36,8 @@ export class PingPongService {
     return this.prisma.pingPong.create({
       data: {
         source_ip: data.source_ip,
-        ping_time: new Date(data.ping_time),
-        pong_time: new Date(data.pong_time),
+        ping_time: data.ping_time,
+        pong_time: data.pong_time,
         latency: data.latency
       },
     });