fix: proper datetime name

lib/new-admin/graphql/resolvers/scalar.resolver.js

@@ -3,7 +3,7 @@ const { DateTimeISOResolver, JSONResolver, JSONObjectResolver } = require('graph
 const resolvers = {
   JSON: JSONResolver,
   JSONObject: JSONObjectResolver,
-  Date: DateTimeISOResolver
+  DateTimeISO: DateTimeISOResolver
 }
 
 module.exports = resolvers

lib/new-admin/graphql/types/bill.type.js

@@ -6,7 +6,7 @@ const typeDef = gql`
     fiat: Int
     fiatCode: String
     deviceId: ID
-    created: Date
+    created: DateTimeISO
     cashUnitOperationId: ID
   }
 

lib/new-admin/graphql/types/cashbox.type.js

@@ -4,7 +4,7 @@ const typeDef = gql`
   type CashboxBatch {
     id: ID
     deviceId: ID
-    created: Date
+    created: DateTimeISO
     operationType: String
     customBillCount: Int
     performedBy: String
@@ -14,7 +14,7 @@ const typeDef = gql`
 
   type Query {
     cashboxBatches: [CashboxBatch] @auth
-    cashboxBatchesCsv(from: Date, until: Date, timezone: String): String @auth
+    cashboxBatchesCsv(from: DateTimeISO, until: DateTimeISO, timezone: String): String @auth
   }
 
   type Mutation {

lib/new-admin/graphql/types/customInfoRequests.type.js

@@ -33,7 +33,7 @@ const typeDef = gql`
     customerId: ID
     infoRequestId: ID
     override: String
-    overrideAt: Date
+    overrideAt: DateTimeISO
     overrideBy: ID
     customerData: JSON
     customInfoRequest: CustomInfoRequest

lib/new-admin/graphql/types/customer.type.js

@@ -9,7 +9,7 @@ const typeDef = gql`
     newPhoto: Upload
     photoType: String
     frontCameraPath: String
-    frontCameraAt: Date
+    frontCameraAt: DateTimeISO
     frontCameraOverride: String
     phone: String
     email: String
@@ -17,19 +17,19 @@ const typeDef = gql`
     smsOverride: String
     idCardData: JSONObject
     idCardDataOverride: String
-    idCardDataExpiration: Date
+    idCardDataExpiration: DateTimeISO
     idCardPhoto: Upload
     idCardPhotoPath: String
     idCardPhotoOverride: String
-    idCardPhotoAt: Date
+    idCardPhotoAt: DateTimeISO
     usSsn: String
     usSsnOverride: String
     sanctions: Boolean
-    sanctionsAt: Date
+    sanctionsAt: DateTimeISO
     sanctionsOverride: String
     totalTxs: Int
     totalSpent: String
-    lastActive: Date
+    lastActive: DateTimeISO
     lastTxFiat: String
     lastTxFiatCode: String
     lastTxClass: String
@@ -53,21 +53,21 @@ const typeDef = gql`
     smsOverride: String
     idCardData: JSONObject
     idCardDataOverride: String
-    idCardDataExpiration: Date
+    idCardDataExpiration: DateTimeISO
     idCardPhotoPath: String
     idCardPhotoOverride: String
     usSsn: String
     usSsnOverride: String
     sanctions: Boolean
-    sanctionsAt: Date
+    sanctionsAt: DateTimeISO
     sanctionsOverride: String
     totalTxs: Int
     totalSpent: String
-    lastActive: Date
+    lastActive: DateTimeISO
     lastTxFiat: String
     lastTxFiatCode: String
     lastTxClass: String
-    suspendedUntil: Date
+    suspendedUntil: DateTimeISO
     subscriberInfo: Boolean
     phoneOverride: String
   }
@@ -82,8 +82,8 @@ const typeDef = gql`
   type CustomerNote {
     id: ID
     customerId: ID
-    created: Date
-    lastEditedAt: Date
+    created: DateTimeISO
+    lastEditedAt: DateTimeISO
     lastEditedBy: ID
     title: String
     content: String

lib/new-admin/graphql/types/log.type.js

@@ -4,22 +4,22 @@ const typeDef = gql`
   type MachineLog {
     id: ID!
     logLevel: String!
-    timestamp: Date!
+    timestamp: DateTimeISO!
     message: String!
   }
 
   type ServerLog {
     id: ID!
     logLevel: String!
-    timestamp: Date!
+    timestamp: DateTimeISO!
     message: String
   }
 
   type Query {
-    machineLogs(deviceId: ID!, from: Date, until: Date, limit: Int, offset: Int): [MachineLog] @auth
-    machineLogsCsv(deviceId: ID!, from: Date, until: Date, limit: Int, offset: Int, timezone: String): String @auth
-    serverLogs(from: Date, until: Date, limit: Int, offset: Int): [ServerLog] @auth
-    serverLogsCsv(from: Date, until: Date, limit: Int, offset: Int, timezone: String): String @auth
+    machineLogs(deviceId: ID!, from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int): [MachineLog] @auth
+    machineLogsCsv(deviceId: ID!, from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, timezone: String): String @auth
+    serverLogs(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int): [ServerLog] @auth
+    serverLogsCsv(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, timezone: String): String @auth
   }
 `
 

lib/new-admin/graphql/types/machine.type.js

@@ -10,8 +10,8 @@ const typeDef = gql`
     name: String!
     deviceId: ID!
     paired: Boolean!
-    lastPing: Date
-    pairedAt: Date
+    lastPing: DateTimeISO
+    pairedAt: DateTimeISO
     diagnostics: Diagnostics
     version: String
     model: String
@@ -26,9 +26,9 @@ const typeDef = gql`
   }
 
   type Diagnostics {
-    timestamp: Date
-    frontTimestamp: Date
-    scanTimestamp: Date
+    timestamp: DateTimeISO
+    frontTimestamp: DateTimeISO
+    scanTimestamp: DateTimeISO
   }
   
   type CashUnits {
@@ -64,8 +64,8 @@ const typeDef = gql`
     deviceId: ID!
     name: String
     model: String
-    paired: Date!
-    unpaired: Date!
+    paired: DateTimeISO!
+    unpaired: DateTimeISO!
   }
 
   type MachineEvent {
@@ -73,9 +73,9 @@ const typeDef = gql`
     deviceId: String
     eventType: String
     note: String
-    created: Date
+    created: DateTimeISO
     age: Float
-    deviceTime: Date
+    deviceTime: DateTimeISO
   }
 
   enum MachineAction {

lib/new-admin/graphql/types/notification.type.js

@@ -6,7 +6,7 @@ const typeDef = gql`
     type: String
     detail: JSON
     message: String
-    created: Date
+    created: DateTimeISO
     read: Boolean
     valid: Boolean
   }

lib/new-admin/graphql/types/scalar.type.js

@@ -3,7 +3,7 @@ const gql = require('graphql-tag')
 const typeDef = gql`
   scalar JSON
   scalar JSONObject
-  scalar Date
+  scalar DateTimeISO
   scalar Upload
 `
 

lib/new-admin/graphql/types/transaction.type.js

@@ -14,12 +14,12 @@ const typeDef = gql`
     txHash: String
     phone: String
     error: String
-    created: Date
+    created: DateTimeISO
     send: Boolean
     sendConfirmed: Boolean
     dispense: Boolean
     timedout: Boolean
-    sendTime: Date
+    sendTime: DateTimeISO
     errorCode: String
     operatorCompleted: Boolean
     sendPending: Boolean
@@ -35,7 +35,7 @@ const typeDef = gql`
     customerPhone: String
     customerEmail: String
     customerIdCardDataNumber: String
-    customerIdCardDataExpiration: Date
+    customerIdCardDataExpiration: DateTimeISO
     customerIdCardData: JSONObject
     customerName: String
     customerFrontCameraPath: String
@@ -44,9 +44,9 @@ const typeDef = gql`
     machineName: String
     discount: Int
     txCustomerPhotoPath: String
-    txCustomerPhotoAt: Date
+    txCustomerPhotoAt: DateTimeISO
     batched: Boolean
-    batchTime: Date
+    batchTime: DateTimeISO
     batchError: String
     walletScore: Int
     profit: String
@@ -60,8 +60,8 @@ const typeDef = gql`
   }
 
   type Query {
-    transactions(from: Date, until: Date, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, excludeTestingCustomers: Boolean): [Transaction] @auth
-    transactionsCsv(from: Date, until: Date, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, timezone: String, excludeTestingCustomers: Boolean, simplified: Boolean): String @auth
+    transactions(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, excludeTestingCustomers: Boolean): [Transaction] @auth
+    transactionsCsv(from: DateTimeISO, until: DateTimeISO, limit: Int, offset: Int, txClass: String, deviceId: String, customerName: String, fiatCode: String, cryptoCode: String, toAddress: String, status: String, swept: Boolean, timezone: String, excludeTestingCustomers: Boolean, simplified: Boolean): String @auth
     transactionCsv(id: ID, txClass: String, timezone: String): String @auth
     txAssociatedDataCsv(id: ID, txClass: String, timezone: String): String @auth
     transactionFilters: [Filter] @auth

lib/new-admin/graphql/types/users.type.js

@@ -45,7 +45,7 @@ const typeDef = `
   type UserSession {
     sid: String!
     sess: JSONObject!
-    expire: Date!
+    expire: DateTimeISO!
   }
 
   type User {
@@ -53,8 +53,8 @@ const typeDef = `
     username: String
     role: String
     enabled: Boolean
-    created: Date
-    last_accessed: Date
+    created: DateTimeISO
+    last_accessed: DateTimeISO
     last_accessed_from: String
     last_accessed_address: String
   }
@@ -68,14 +68,14 @@ const typeDef = `
   type ResetToken {
     token: String
     user_id: ID
-    expire: Date
+    expire: DateTimeISO
   }
 
   type RegistrationToken {
     token: String
     username: String
     role: String
-    expire: Date
+    expire: DateTimeISO
   }
 
   type Query {