@things-factory/integration-accounting 5.0.7 → 6.0.0-alpha.0

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,