@things-factory/integration-base 5.0.11 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "5.0.11",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "Module for managing integration scenario.",
   "publishConfig": {
     "access": "public",
@@ -26,11 +26,11 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^5.0.11",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/env": "^5.0.0",
-    "@things-factory/oauth2-client": "^5.0.11",
-    "@things-factory/shell": "^5.0.11",
+    "@things-factory/api": "^6.0.0-alpha.3",
+    "@things-factory/auth-base": "^6.0.0-alpha.3",
+    "@things-factory/env": "^6.0.0-alpha.3",
+    "@things-factory/oauth2-client": "^6.0.0-alpha.3",
+    "@things-factory/shell": "^6.0.0-alpha.3",
     "async-mqtt": "^2.5.0",
     "cron": "^1.7.2",
     "cross-fetch": "^3.0.4",
@@ -41,5 +41,5 @@
     "promise-socket": "^7.0.0",
     "vm2": "^3.9.2"
   },
-  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/engine/connection-manager.ts

@@ -1,8 +1,7 @@
 import moment from 'moment-timezone'
-import { getRepository } from 'typeorm'
 import { createLogger, format, transports } from 'winston'
 
-import { Domain, pubsub, PubSubLogTransport } from '@things-factory/shell'
+import { Domain, getRepository, pubsub, PubSubLogTransport } from '@things-factory/shell'
 
 import { Connection, ConnectionStatus } from '../service'
 import { Connector } from './types'

package/server/engine/connector/graphql-connector.ts

@@ -1,12 +1,12 @@
 import 'cross-fetch/polyfill'
 
-import { ApolloClient, ApolloLink, HttpLink, InMemoryCache, from } from '@apollo/client/core'
+import { ApolloClient, ApolloLink, from, HttpLink, InMemoryCache } from '@apollo/client/core'
+import { onError } from '@apollo/client/link/error'
+import { Oauth2Client } from '@things-factory/oauth2-client'
+import { getRepository } from '@things-factory/shell'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
-import { Oauth2Client } from '@things-factory/oauth2-client'
-import { getRepository } from 'typeorm'
-import { onError } from '@apollo/client/link/error'
 
 const defaultOptions: any = {
   watchQuery: {
@@ -50,7 +50,7 @@ export class GraphqlConnector implements Connector {
       }
     }
 
-    const oauth2Client: Oauth2Client = await getRepository(Oauth2Client).findOne(authClient)
+    const oauth2Client: Oauth2Client = await getRepository(Oauth2Client).findOneBy({ id: authClient })
 
     const authMiddleware = new ApolloLink((operation, forward) => {
       // add the authorization to the headers

package/server/engine/connector/http-connector.ts

@@ -1,8 +1,8 @@
-import { Connector } from '../types'
-import { ConnectionManager } from '../connection-manager'
-
-import { getRepository } from 'typeorm'
 import { Oauth2Client } from '@things-factory/oauth2-client'
+import { getRepository } from '@things-factory/shell'
+
+import { ConnectionManager } from '../connection-manager'
+import { Connector } from '../types'
 
 export class HttpConnector implements Connector {
   async ready(connectionConfigs) {
@@ -16,7 +16,7 @@ export class HttpConnector implements Connector {
     params.rejectUnauthorized = (params.rejectUnauthorized || 'Y') === 'Y'
 
     if (params.authClient) {
-      const oauth2Client: Oauth2Client = await getRepository(Oauth2Client).findOne(params.authClient)
+      const oauth2Client: Oauth2Client = await getRepository(Oauth2Client).findOneBy({ id: params.authClient })
       var authHeaders = oauth2Client.getAuthHeaders()
     }
 

package/server/engine/connector/oracle-connector.ts

@@ -26,7 +26,7 @@ export class OracleConnector implements Connector {
       throw new Error('oracledb module loading failed')
     }
 
-    //when oracle not using defualt port must add connection string with port like localhsot:port
+    //when oracle not using default port must add connection string with port like localhsot:port
     const client = await Client.getConnection({
       user,
       password,

package/server/engine/scenario-engine.ts

@@ -1,5 +1,5 @@
-import { getRepository } from 'typeorm'
-import { pubsub, GraphqlLocalClient } from '@things-factory/shell'
+import { getRepository, GraphqlLocalClient, pubsub } from '@things-factory/shell'
+
 import { Scenario, ScenarioInstance } from '../service'
 import { PendingQueue } from './pending-queue'
 

package/server/engine/task/local-graphql-mutate.ts

@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
-import { getRepository } from 'typeorm'
 import { VM } from 'vm2'
 
 import { User } from '@things-factory/auth-base'
+import { getRepository } from '@things-factory/shell'
 import { access } from '@things-factory/utils'
 
 import { TaskRegistry } from '../task-registry'
@@ -12,7 +12,8 @@ async function LocalGraphqlMutate(step, context) {
   var { mutation, variables: variablesAccessorMap } = params || {}
   var { client, domain, data, variables } = context
 
-  const user = await getRepository(User).findOne(updaterId, {
+  const user = await getRepository(User).findOne({
+    where: { id: updaterId },
     relations: ['domains']
   })
 

package/server/engine/task/local-graphql-query.ts

@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
-import { getRepository } from 'typeorm'
 import { VM } from 'vm2'
 
 import { User } from '@things-factory/auth-base'
+import { getRepository } from '@things-factory/shell'
 import { access } from '@things-factory/utils'
 
 import { TaskRegistry } from '../task-registry'
@@ -12,7 +12,8 @@ async function LocalGraphqlQuery(step, context) {
   var { query, variables: variablesAccessorMap } = params || {}
   var { client, domain, data, variables } = context
 
-  const user = await getRepository(User).findOne(updaterId, {
+  const user = await getRepository(User).findOne({
+    where: { id: updaterId },
     relations: ['domains']
   })
 

package/server/engine/task/pick-pending-scenario.ts

@@ -1,8 +1,9 @@
-import { TaskRegistry } from '../task-registry'
-import { Scenario } from '../../service'
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 import { sleep } from '@things-factory/utils'
+
+import { Scenario } from '../../service'
 import { ScenarioEngine } from '../scenario-engine'
+import { TaskRegistry } from '../task-registry'
 
 const debug = require('debug')('things-factory:integration-base:pick-pending-scenario')
 

package/server/engine/task/sub-scenario.ts

@@ -1,7 +1,8 @@
+import { getRepository } from '@things-factory/shell'
 import { access, deepClone } from '@things-factory/utils'
-import { TaskRegistry } from '../task-registry'
+
 import { Scenario } from '../../service'
-import { getRepository } from 'typeorm'
+import { TaskRegistry } from '../task-registry'
 
 async function SubScenario(step, context) {
   var { logger, load, data } = context

package/server/engine/task/switch-range-scenario.ts

@@ -1,5 +1,4 @@
-import { getRepository } from 'typeorm'
-
+import { getRepository } from '@things-factory/shell'
 import { access, deepClone } from '@things-factory/utils'
 
 import { Scenario } from '../../service'

package/server/engine/task/switch-scenario.ts

@@ -1,5 +1,4 @@
-import { getRepository } from 'typeorm'
-
+import { getRepository } from '@things-factory/shell'
 import { access, deepClone } from '@things-factory/utils'
 
 import { Scenario } from '../../service'

package/server/routers/scenario-view-router.ts

@@ -1,5 +1,7 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
+
 import { Scenario, Step } from '../service'
 
 export const scenarioViewRouter = new Router()
@@ -8,15 +10,13 @@ scenarioViewRouter.get('/scenario-view/:name', async (context, next) => {
   const { domain } = context.state
   const { name } = context.params
 
-  const scenario = await getRepository(Scenario).findOne(
-    {
-      domain,
+  const scenario = await getRepository(Scenario).findOne({
+    where: {
+      domain: { id: domain.id },
       name
     },
-    {
-      relations: ['steps']
-    }
-  )
+    relations: ['steps']
+  })
 
   const steps: Step[] = scenario.steps
   const nodes = {}

package/server/service/connection/connection-mutation.ts

@@ -1,5 +1,7 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
 
 import { ConnectionManager } from '../../engine/connection-manager'
 import { Connection, ConnectionPatch, ConnectionStatus, NewConnection } from './connection-type'
@@ -8,7 +10,10 @@ import { Connection, ConnectionPatch, ConnectionStatus, NewConnection } from './
 export class ConnectionMutation {
   @Directive('@transaction')
   @Mutation(returns => Connection, { description: 'To create new connection' })
-  async createConnection(@Arg('connection') connection: NewConnection, @Ctx() context: any): Promise<Connection> {
+  async createConnection(
+    @Arg('connection') connection: NewConnection,
+    @Ctx() context: ResolverContext
+  ): Promise<Connection> {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(Connection).save({
@@ -24,13 +29,13 @@ export class ConnectionMutation {
   async updateConnection(
     @Arg('name') name: string,
     @Arg('patch') patch: ConnectionPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Connection> {
     const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(Connection)
     const connection = await repository.findOne({
-      where: { domain, name }
+      where: { domain: { id: domain.id }, name }
     })
 
     return await repository.save({
@@ -44,7 +49,7 @@ export class ConnectionMutation {
   @Mutation(returns => [Connection], { description: "To modify multiple connections' information" })
   async updateMultipleConnection(
     @Arg('patches', type => [ConnectionPatch]) patches: ConnectionPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Connection[]> {
     const { domain, user, tx } = context.state
 
@@ -71,7 +76,7 @@ export class ConnectionMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const connection = await connectionRepo.findOne(newRecord.id)
+        const connection = await connectionRepo.findOneBy({ id: newRecord.id })
 
         const result = await connectionRepo.save({
           ...connection,
@@ -88,7 +93,7 @@ export class ConnectionMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete connection' })
-  async deleteConnection(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {
+  async deleteConnection(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(Connection).delete({ domain, name })
@@ -97,11 +102,14 @@ export class ConnectionMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete multiple connections' })
-  async deleteConnections(@Arg('names', type => [String]) names: string[], @Ctx() context: any): Promise<boolean> {
+  async deleteConnections(
+    @Arg('names', type => [String]) names: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(Connection).delete({
-      domain,
+      domain: { id: domain.id },
       name: In(names)
     })
 
@@ -109,11 +117,11 @@ export class ConnectionMutation {
   }
 
   @Mutation(returns => Connection, { description: 'To connect a connection' })
-  async connectConnection(@Arg('name') name: string, @Ctx() context: any): Promise<Connection> {
+  async connectConnection(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Connection> {
     const { domain } = context.state
     var repository = getRepository(Connection)
     var connection = await repository.findOne({
-      where: { domain: domain, name },
+      where: { domain: { id: domain.id }, name },
       relations: ['domain']
     })
 
@@ -129,12 +137,12 @@ export class ConnectionMutation {
   }
 
   @Mutation(returns => Connection, { description: 'To disconnect a connection' })
-  async disconnectConnection(@Arg('name') name: string, @Ctx() context: any) {
+  async disconnectConnection(@Arg('name') name: string, @Ctx() context: ResolverContext) {
     const { domain } = context.state
 
     var repository = getRepository(Connection)
     var connection = await repository.findOne({
-      where: { domain, name },
+      where: { domain: { id: domain.id }, name },
       relations: ['domain']
     })
 

package/server/service/connection/connection-query.ts

@@ -1,8 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { ConnectionManager } from '../../engine/connection-manager'
 import { Connection, ConnectionList, ConnectionState, ConnectionStatus } from './connection-type'
@@ -10,11 +9,11 @@ import { Connection, ConnectionList, ConnectionState, ConnectionStatus } from '.
 @Resolver(Connection)
 export class ConnectionQuery {
   @Query(returns => Connection, { description: 'To fetch a connection' })
-  async connection(@Arg('name') name: string, @Ctx() context: any): Promise<Connection> {
+  async connection(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Connection> {
     const { domain } = context.state
 
     var connection = await getRepository(Connection).findOne({
-      where: { domain, name },
+      where: { domain: { id: domain.id }, name },
       relations: ['domain']
     })
 
@@ -27,7 +26,7 @@ export class ConnectionQuery {
   }
 
   @Query(returns => ConnectionList, { description: 'To fetch multiple connections' })
-  async connections(@Args() params: ListParam, @Ctx() context: any): Promise<ConnectionList> {
+  async connections(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ConnectionList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -50,7 +49,7 @@ export class ConnectionQuery {
   }
 
   @Query(returns => ConnectionState, { description: 'To fetch the state of a connection' })
-  fetchConnectionState(@Arg('name') name: string, @Ctx() context: any): ConnectionState {
+  fetchConnectionState(@Arg('name') name: string, @Ctx() context: ResolverContext): ConnectionState {
     const { domain } = context.state
 
     var connection = ConnectionManager.getConnectionInstanceByName(domain, name)
@@ -63,16 +62,16 @@ export class ConnectionQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() connection: Connection) {
-    return connection.domain || (await getRepository(Domain).findOne(connection.domainId))
+    return connection.domain || (await getRepository(Domain).findOneBy({ id: connection.domainId }))
   }
 
   @FieldResolver(type => User)
   async updater(@Root() connection: Connection): Promise<User> {
-    return await getRepository(User).findOne(connection.updaterId)
+    return await getRepository(User).findOneBy({ id: connection.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() connection: Connection): Promise<User> {
-    return await getRepository(User).findOne(connection.creatorId)
+    return await getRepository(User).findOneBy({ id: connection.creatorId })
   }
 }

package/server/service/connection/connection-subscription.ts

@@ -1,9 +1,10 @@
-import { Resolver, Subscription, Root, Arg } from 'type-graphql'
-import { getRepository } from 'typeorm'
-import { Connection, ConnectionState, ConnectionStatus } from './connection-type'
-import { pubsub, Log } from '@things-factory/shell'
 import { withFilter } from 'graphql-subscriptions'
+import { Arg, Resolver, Root, Subscription } from 'type-graphql'
+
+import { getRepository, Log, pubsub } from '@things-factory/shell'
+
 import { ConnectionManager } from '../../engine/connection-manager'
+import { Connection, ConnectionState, ConnectionStatus } from './connection-type'
 
 const debug = require('debug')('things-factory:integration:connection-subscription')
 

package/server/service/connector/connector-query.ts

@@ -1,13 +1,15 @@
-import { Resolver, Query, Arg, Ctx } from 'type-graphql'
-import { getRepository } from 'typeorm'
-import { Connection } from '../connection/connection-type'
-import { ConnectorType, ConnectorList } from './connector-type'
+import { Arg, Ctx, Query, Resolver } from 'type-graphql'
+
+import { getRepository } from '@things-factory/shell'
+
 import { ConnectionManager } from '../../engine/connection-manager'
+import { Connection } from '../connection/connection-type'
+import { ConnectorList, ConnectorType } from './connector-type'
 
 @Resolver(ConnectorType)
 export class ConnectorQuery {
   @Query(returns => ConnectorType, { description: 'To fetch a connector' })
-  async connection(@Arg('name') name: string, @Ctx() context: any): Promise<ConnectorType> {
+  async connection(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<ConnectorType> {
     // @ts-ignore
     const { description, help, parameterSpec, taskPrefixes } = ConnectionManager.getConnector(name) || {}
 
@@ -47,12 +49,12 @@ export class ConnectorQuery {
   @Query(returns => ConnectorType, { description: 'To fetch the connector from a connection' })
   async connectorByConnection(
     @Arg('connectionName') connectionName: string,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<ConnectorType> {
     const { domain } = context.state
 
     var connection = await getRepository(Connection).findOne({
-      where: { domain, name: connectionName }
+      where: { domain: { id: domain.id }, name: connectionName }
     })
 
     return connection && (ConnectionManager.getConnector(connection.type) as any)

package/server/service/payload-log/payload-log-mutation.ts

@@ -1,17 +1,21 @@
-import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { In } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { logger } from '@things-factory/env'
+import { Domain, getRepository } from '@things-factory/shell'
+
 import { PayloadLog, PayloadType } from './payload-log'
 import { NewPayloadLog, PayloadLogPatch } from './payload-log-type'
-import { logger } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
-import { User } from '@things-factory/auth-base'
-import { Bizplace } from '@things-factory/biz-base'
 
 @Resolver(PayloadLog)
 export class PayloadLogMutation {
   @Directive('@transaction')
   @Mutation(returns => PayloadLog, { description: 'To create new PayloadLog' })
-  async createPayloadLog(@Arg('payloadLog') payloadLog: NewPayloadLog, @Ctx() context: any): Promise<PayloadLog> {
+  async createPayloadLog(
+    @Arg('payloadLog') payloadLog: NewPayloadLog,
+    @Ctx() context: ResolverContext
+  ): Promise<PayloadLog> {
     const { domain, user, tx } = context.state
 
     return await tx.getRepository(PayloadLog).save({
@@ -27,13 +31,13 @@ export class PayloadLogMutation {
   async updatePayloadLog(
     @Arg('id') id: string,
     @Arg('patch') patch: PayloadLogPatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<PayloadLog> {
     const { domain, user, tx } = context.state
 
     const repository = tx.getRepository(PayloadLog)
     const payloadLog = await repository.findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
 
     return await repository.save({
@@ -47,7 +51,7 @@ export class PayloadLogMutation {
   @Mutation(returns => [PayloadLog], { description: "To modify multiple PayloadLogs' information" })
   async updateMultiplePayloadLog(
     @Arg('patches', type => [PayloadLogPatch]) patches: PayloadLogPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<PayloadLog[]> {
     const { domain, user, tx } = context.state
 
@@ -74,7 +78,7 @@ export class PayloadLogMutation {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const payloadLog = await payloadLogRepo.findOne(newRecord.id)
+        const payloadLog = await payloadLogRepo.findOneBy({ id: newRecord.id })
 
         const result = await payloadLogRepo.save({
           ...payloadLog,
@@ -91,10 +95,10 @@ export class PayloadLogMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete PayloadLog' })
-  async deletePayloadLog(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+  async deletePayloadLog(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await tx.getRepository(PayloadLog).delete({ domain, id })
+    await tx.getRepository(PayloadLog).delete({ domain: { id: domain.id }, id })
     return true
   }
 
@@ -102,12 +106,12 @@ export class PayloadLogMutation {
   @Mutation(returns => Boolean, { description: 'To delete multiple payloadLogs' })
   async deletePayloadLogs(
     @Arg('ids', type => [String]) ids: string[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(PayloadLog).delete({
-      domain,
+      domain: { id: domain.id },
       id: In(ids)
     })
 
@@ -115,18 +119,19 @@ export class PayloadLogMutation {
   }
 }
 
-
 export async function createPayloadLog(
   name: string,
   endpoint: string,
   request: string,
   response: string,
   context: any,
-  type: PayloadType = PayloadType.EGESTION
+  type: PayloadType = PayloadType.EGESTION,
+  src: string = null
 ): Promise<void> {
   try {
     const { domain, user }: { domain: Domain; user: User } = context?.state
 
+    // disabled due to high db server usage
     await getRepository(PayloadLog).save({
       name,
       domain,
@@ -134,14 +139,13 @@ export async function createPayloadLog(
       request,
       response,
       type,
+      src,
       createdBy: user,
       updatedBy: user,
       createdAt: new Date(),
-      updatedAt: new Date(),
+      updatedAt: new Date()
     })
-
-
   } catch (error) {
     logger.error(`PayloadLog Error: ${error}`)
   }
-}
+}

package/server/service/payload-log/payload-log-query.ts

@@ -1,8 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'
 
 import { PayloadLog } from './payload-log'
 import { PayloadLogList } from './payload-log-type'
@@ -10,16 +9,16 @@ import { PayloadLogList } from './payload-log-type'
 @Resolver(PayloadLog)
 export class PayloadLogQuery {
   @Query(returns => PayloadLog, { description: 'To fetch a PayloadLog' })
-  async payloadLog(@Arg('id') id: string, @Ctx() context: any): Promise<PayloadLog> {
+  async payloadLog(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<PayloadLog> {
     const { domain } = context.state
 
     return await getRepository(PayloadLog).findOne({
-      where: { domain, id }
+      where: { domain: { id: domain.id }, id }
     })
   }
 
   @Query(returns => PayloadLogList, { description: 'To fetch multiple PayloadLogs' })
-  async payloadLogs(@Args() params: ListParam, @Ctx() context: any): Promise<PayloadLogList> {
+  async payloadLogs(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<PayloadLogList> {
     const { domain } = context.state
 
     const convertedParams = convertListParams(params, {
@@ -32,16 +31,16 @@ export class PayloadLogQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() payloadLog: PayloadLog): Promise<Domain> {
-    return await getRepository(Domain).findOne(payloadLog.domainId)
+    return await getRepository(Domain).findOneBy({ id: payloadLog.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() payloadLog: PayloadLog): Promise<User> {
-    return await getRepository(User).findOne(payloadLog.updaterId)
+    return await getRepository(User).findOneBy({ id: payloadLog.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() payloadLog: PayloadLog): Promise<User> {
-    return await getRepository(User).findOne(payloadLog.creatorId)
+    return await getRepository(User).findOneBy({ id: payloadLog.creatorId })
   }
 }

package/server/service/payload-log/payload-log.ts

@@ -20,11 +20,10 @@ const DATABASE_TYPE = ORMCONFIG.type
 
 export enum PayloadType {
   INGESTION = 'ingestion',
-  EGESTION = 'egestion',
+  EGESTION = 'egestion'
 }
 @Entity()
 @Index('ix_payload_log_0', (payloadLog: PayloadLog) => [payloadLog.domain])
-
 @Index('ix_payload_log_1', (payloadLog: PayloadLog) => [payloadLog.domain, payloadLog.endpoint])
 @ObjectType({ description: 'Entity for PayloadLog' })
 export class PayloadLog {
@@ -57,6 +56,10 @@ export class PayloadLog {
   @Field(type => String)
   type: PayloadType
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  src: string
+
   @Column()
   @Field()
   endpoint: string