@things-factory/integration-accounting 5.0.14 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/integration-accounting",
-  "version": "5.0.14",
+  "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 to manage integration with accounting service.",
   "publishConfig": {
     "access": "public",
@@ -25,19 +25,19 @@
     "test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^5.0.14",
-    "@things-factory/auth-ui": "^5.0.14",
-    "@things-factory/biz-base": "^5.0.14",
-    "@things-factory/code-ui": "^5.0.14",
-    "@things-factory/context-ui": "^5.0.14",
-    "@things-factory/grist-ui": "^5.0.14",
-    "@things-factory/i18n-base": "^5.0.14",
-    "@things-factory/integration-ui": "^5.0.14",
-    "@things-factory/more-ui": "^5.0.14",
-    "@things-factory/product-base": "^5.0.14",
-    "@things-factory/resource-ui": "^5.0.14",
-    "@things-factory/setting-ui": "^5.0.14",
-    "@things-factory/system-ui": "^5.0.14",
+    "@things-factory/apptool-ui": "^6.0.0-alpha.3",
+    "@things-factory/auth-ui": "^6.0.0-alpha.3",
+    "@things-factory/biz-base": "^6.0.0-alpha.3",
+    "@things-factory/code-ui": "^6.0.0-alpha.3",
+    "@things-factory/context-ui": "^6.0.0-alpha.3",
+    "@things-factory/grist-ui": "^6.0.0-alpha.3",
+    "@things-factory/i18n-base": "^6.0.0-alpha.3",
+    "@things-factory/integration-ui": "^6.0.0-alpha.3",
+    "@things-factory/more-ui": "^6.0.0-alpha.3",
+    "@things-factory/product-base": "^6.0.0-alpha.3",
+    "@things-factory/resource-ui": "^6.0.0-alpha.3",
+    "@things-factory/setting-ui": "^6.0.0-alpha.3",
+    "@things-factory/system-ui": "^6.0.0-alpha.3",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0"
   },
@@ -51,5 +51,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "9ceaa39746fcf42953e429fab2001353cd821ded"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/controllers/accounting-api/index.ts

@@ -1,4 +1,4 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
 
 import { Account } from '../../entities'
 import { api } from './decorators'

package/server/controllers/xero/xero.ts

@@ -1,6 +1,6 @@
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 
+import { getRepository } from '@things-factory/shell'
 import { parseJwt } from '@things-factory/utils'
 
 import { Account } from '../../entities/account'

package/server/engine/task/accounting-api.ts

@@ -1,8 +1,9 @@
 import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
+import { getRepository } from '@things-factory/shell'
 import { access } from '@things-factory/utils'
-import { getRepository } from 'typeorm'
-import { Account } from '../../entities'
+
 import { AccountingAPI as API } from '../../controllers/accounting-api'
+import { Account } from '../../entities'
 
 async function AccountingAPI(step, { logger, data, domain }) {
   var {

package/server/graphql/resolvers/accounting/account.ts

@@ -1,12 +1,13 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { Account } from '../../../entities'
 
 export const accountResolver = {
-  async account(_: any, { id }, context: any) {
+  async account(_: any, { id }, context: ResolverContext) {
     const repository = getRepository(Account)
 
     return await getRepository(Account).findOne({
-      where: { domain: context.state.domain, id },
+      where: { domain: { id: context.state.domain.id }, id },
       relations: ['domain', 'creator', 'updater']
     })
   }

package/server/graphql/resolvers/accounting/accounts.ts

@@ -1,11 +1,9 @@
-import { getRepository } from 'typeorm'
-
-import { convertListParams, ListParam } from '@things-factory/shell'
+import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { Account } from '../../../entities'
 
 export const accountsResolver = {
-  async accounts(_: any, params: ListParam, context: any) {
+  async accounts(_: any, params: ListParam, context: ResolverContext) {
     const { domain } = context.state
     const convertedParams = convertListParams(params, { domain })
     const [items, total] = await getRepository(Account).findAndCount({

package/server/graphql/resolvers/accounting/create-account.ts

@@ -1,15 +1,18 @@
-import { getRepository } from 'typeorm'
-import { Account } from '../../../entities'
+import { getRepository } from '@things-factory/shell'
+
 import { ACCOUNTING_STATUS } from '../../../controllers'
+import { Account } from '../../../entities'
 
 export const createAccount = {
-  async createAccount(_: any, { account }, context: any) {
+  async createAccount(_: any, { account }, context: ResolverContext) {
+    const { domain, user } = context.state
+
     return await getRepository(Account).save({
       status: ACCOUNTING_STATUS.INACTIVE,
       ...account,
-      domain: context.state.domain,
-      creator: context.state.user,
-      updater: context.state.user
+      domain,
+      creator: user,
+      updater: user
     })
   }
 }

package/server/graphql/resolvers/accounting/delete-account.ts

@@ -1,11 +1,12 @@
-import { getRepository } from 'typeorm'
-import { Account } from '../../../entities'
+import { getRepository } from '@things-factory/shell'
+
 import { ACCOUNTING_STATUS } from '../../../controllers'
+import { Account } from '../../../entities'
 
 export const deleteAccount = {
-  async deleteAccount(_: any, { id }, context: any) {
+  async deleteAccount(_: any, { id }, context: ResolverContext) {
     const foundAccount: Account = await getRepository(Account).findOne({
-      where: { domain: context.state.domain, id }
+      where: { domain: { id: context.state.domain.id }, id }
     })
 
     await getRepository(Account).save({

package/server/graphql/resolvers/accounting/delete-accounts.ts

@@ -1,11 +1,14 @@
-import { getRepository, In } from 'typeorm'
-import { Account } from '../../../entities'
+import { In } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
+
 import { ACCOUNTING_STATUS } from '../../../controllers'
+import { Account } from '../../../entities'
 
 export const deleteAccounts = {
-  async deleteAccounts(_: any, { ids }, context: any) {
+  async deleteAccounts(_: any, { ids }, context: ResolverContext) {
     let foundAccounts: Account[] = await getRepository(Account).find({
-      where: { domain: context.state.domain, id: In(ids) }
+      where: { domain: { id: context.state.domain.id }, id: In(ids) }
     })
 
     const updatedAccount = foundAccounts.map((account: Account) => {

package/server/graphql/resolvers/accounting/update-account.ts

@@ -1,11 +1,12 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { Account } from '../../../entities'
 
 export const updateAccount = {
-  async updateAccount(_: any, { name, patch }, context: any) {
+  async updateAccount(_: any, { name, patch }, context: ResolverContext) {
     const repository = getRepository(Account)
     const account: any = await repository.findOne({
-      where: { domain: context.state.domain, name }
+      where: { domain: { id: context.state.domain.id }, name }
     })
 
     return await repository.save({

package/server/graphql/resolvers/accounting/update-multiple-accounts.ts

@@ -1,8 +1,9 @@
-import { getRepository } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+
 import { Account } from '../../../entities'
 
 export const updateMultipleAccount = {
-  async updateMultipleAccount(_: any, { patches }, context: any) {
+  async updateMultipleAccount(_: any, { patches }, context: ResolverContext) {
     let results = []
     const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
     const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
@@ -26,7 +27,7 @@ export const updateMultipleAccount = {
     if (_updateRecords.length > 0) {
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const account: Account = await accountRepo.findOne(newRecord.id)
+        const account: Account = await accountRepo.findOneBy({ id: newRecord.id })
 
         const result = await accountRepo.save({
           ...account,

package/server/graphql/resolvers/accounting/xero/deactivate-xero-account.ts

@@ -1,15 +1,17 @@
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
-import { Account } from '../../../../entities'
+
+import { getRepository } from '@things-factory/shell'
+
 import { ACCOUNTING_STATUS } from '../../../../controllers'
+import { Account } from '../../../../entities'
 
 const debug = require('debug')('things-factory:integration-accounting:deactivate-xero-account')
 
 export const deactivateXeroAccount = {
-  async deactivateXeroAccount(_: any, { id }, context: any) {
+  async deactivateXeroAccount(_: any, { id }, context: ResolverContext) {
     const repository = getRepository(Account)
     const account: any = await repository.findOne({
-      where: { domain: context.state.domain, id }
+      where: { domain: { id: context.state.domain.id }, id }
     })
 
     try {

package/server/graphql/resolvers/accounting/xero/get-xero-auth-url.ts

@@ -1,18 +1,20 @@
-import { getRepository } from 'typeorm'
-import { config } from '@things-factory/env'
+import crypto from 'crypto'
+
 import { VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
+import { config } from '@things-factory/env'
+import { getRepository } from '@things-factory/shell'
+
 import { Xero } from '../../../../controllers/xero'
 
 const xeroConfig = config.get('accountingIntegrationXero', {})
 const { apiKey, apiSecret, callback } = xeroConfig
 
-import crypto from 'crypto'
 export function makeVerificationTokenForNonce() {
   return crypto.randomBytes(16).toString('hex')
 }
 
 export const getXeroAuthURL = {
-  async getXeroAuthURL(_: any, { accounting }, context: any) {
+  async getXeroAuthURL(_: any, { accounting }, context: ResolverContext) {
     const { user } = context.state
     const xero = new Xero({ apiKey, apiSecret, callback })
 

package/server/graphql/resolvers/accounting/xero/refresh-xero-access-token.ts

@@ -1,19 +1,21 @@
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
-import { Account } from '../../../../entities'
 
-import { parseJwt } from '@things-factory/utils'
 import { config } from '@things-factory/env'
+import { getRepository } from '@things-factory/shell'
+import { parseJwt } from '@things-factory/utils'
+
+import { Account } from '../../../../entities'
+
 const xeroConfig = config.get('accountingIntegrationXero', {})
 const { apiKey, apiSecret } = xeroConfig
 
 const debug = require('debug')('things-factory:integration-accounting:refresh-xero-access-token')
 
 export const refreshXeroAccessToken = {
-  async refreshXeroAccessToken(_: any, { id }, context: any) {
+  async refreshXeroAccessToken(_: any, { id }, context: ResolverContext) {
     const repository = getRepository(Account)
     const account: any = await repository.findOne({
-      where: { domain: context.state.domain, id }
+      where: { domain: { id: context.state.domain.id }, id }
     })
 
     const refreshRequestData = {

package/server/graphql/resolvers/accounting-api/accounting-invoice.ts

@@ -1,9 +1,9 @@
 import { AccountingAPI } from '../../../controllers/accounting-api'
 
 export const queryAccountingInvoice = {
-  async getAccountingInvoices(_: any, { accountingId, params: ListParam  }, context: any) {
+  async getAccountingInvoices(_: any, { accountingId, params: ListParam }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.getInvoices(accounting, {
       pagination: {
         page: 0,
@@ -12,9 +12,9 @@ export const queryAccountingInvoice = {
     })
   },
 
-  async getAccountingInvoice(_: any, { accountingId, invoiceNo }, context: any) {
+  async getAccountingInvoice(_: any, { accountingId, invoiceNo }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.getInvoice(accounting, {
       invoiceNo
     })
@@ -22,15 +22,15 @@ export const queryAccountingInvoice = {
 }
 
 export const mutateAccountingInvoice = {
-  async createAccountingInvoice(_: any, { accountingId, newInvoice }, context: any) {
+  async createAccountingInvoice(_: any, { accountingId, newInvoice }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.createInvoice(accounting, newInvoice)
   },
 
-  async updateAccountingInvoice(_: any, { accountingId, patch }, context: any) {
+  async updateAccountingInvoice(_: any, { accountingId, patch }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.updateInvoice(accounting, patch)
   }
-}
+}

package/server/graphql/resolvers/accounting-api/accounting-item.ts

@@ -1,10 +1,9 @@
-import { convertListParams, ListParam } from '@things-factory/shell'
 import { AccountingAPI } from '../../../controllers/accounting-api'
 
 export const queryAccountingItem = {
-  async getAccountingItems(_: any, { accountingId, params: ListParam }, context: any) {
+  async getAccountingItems(_: any, { accountingId, params: ListParam }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.getItems(accounting, {
       pagination: {
         page: 0,
@@ -13,9 +12,9 @@ export const queryAccountingItem = {
     })
   },
 
-  async getAccountingItem(_: any, { accountingId, itemId }, context: any) {
+  async getAccountingItem(_: any, { accountingId, itemId }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.getItem(accounting, {
       itemId
     })
@@ -23,21 +22,21 @@ export const queryAccountingItem = {
 }
 
 export const mutateAccountingItem = {
-  async createAccountingItem(_: any, { accountingId, newItem }, context: any) {
+  async createAccountingItem(_: any, { accountingId, newItem }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.createItem(accounting, newItem)
   },
 
-  async updateAccountingItem(_: any, { accountingId, patch }, context: any) {
+  async updateAccountingItem(_: any, { accountingId, patch }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.updateItem(accounting, patch)
   },
 
-  async deleteAccountingItem(_: any, { accountingId, itemId }, context: any) {
+  async deleteAccountingItem(_: any, { accountingId, itemId }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
-    
+
     return await AccountingAPI.deleteItem(accounting, itemId)
   }
-}
+}

package/server/graphql/resolvers/accounting-api/accounting-purchase-order.ts

@@ -1,7 +1,7 @@
 import { AccountingAPI } from '../../../controllers/accounting-api'
 
 export const queryAccountingPurchaseOrder = {
-  async getAccountingPurchaseOrders(_: any, { accountingId, params: ListParam }, context: any) {
+  async getAccountingPurchaseOrders(_: any, { accountingId, params: ListParam }, context: ResolverContext) {
     var accounting = await AccountingAPI.getAccounting(accountingId)
 
     return await AccountingAPI.getPurchaseOrders(accounting, {

package/server/routers/xero-router.ts

@@ -1,10 +1,9 @@
 import Router from 'koa-router'
 import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
 
 import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
-import { getUrlFromContext } from '@things-factory/shell'
+import { getRepository, getUrlFromContext } from '@things-factory/shell'
 import { parseJwt } from '@things-factory/utils'
 
 import { ACCOUNTING_STATUS, AccountingAPI } from '../controllers/accounting-api'
@@ -107,7 +106,7 @@ xeroRouter.get('/callback-xero', async (context, next) => {
       expiresIn: new Date(exp * 1000)
     }
 
-    var user = await getRepository(User).findOne(userId)
+    var user = await getRepository(User).findOneBy({ id: userId })
 
     account = await getRepository(Account).save({
       ...account,