feat: sync fixes, framework integration (getBank) (#85)

antonstjernquist · web-flow · commit 9be4e7289ee7 · 2022-09-18T23:59:05.000+02:00
* feat: take initial value from export, when frameworkIntegration is enabled

* feat: accounts configure options, syncInitialBankBalance

* fix(sync/optimisations): sync newAccountBalance

* fix: renam NewAccountBalance broadcast

* feat: changedDefaultAccount event, updated export to getBank
diff --git a/config.json b/config.json
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "build": "yarn nx run-many --target=build --all",
     "lint": "yarn nx run-many --target=lint --all",
     "dev": "yarn nx run-many --target=dev --all",
+    "tsc": "yarn nx run-many --target=tsc --all",
     "dev:ingame": "yarn nx run-many --target=dev:ingame --all",
     "dev:mobile": "yarn nx run-many --target=dev:mobile --all",
     "pre-release": "yarn build && sh ./scripts/prerelease.sh",
diff --git a/src/client/cl_events.ts b/src/client/cl_events.ts
@@ -52,6 +52,14 @@ const SendBankUIMessage = (data: object) => {
   }
 };
 
+onNet(Broadcasts.NewAccount, (payload: Account) => {
+  SendBankUIMessage({ type: Broadcasts.NewAccount, payload });
+});
+
+onNet(Broadcasts.NewAccountBalance, (balance: number) => {
+  SendBankUIMessage({ type: Broadcasts.NewAccountBalance, payload: balance });
+});
+
 onNet(Broadcasts.NewTransaction, (payload: Transaction) => {
   SendBankUIMessage({ type: Broadcasts.NewTransaction, payload });
 });
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -28,7 +28,6 @@ import { mockedResourceName } from './globals.server';
 import { config } from './utils/server-config';
 import { UserService } from './services/user/user.service';
 import { container } from 'tsyringe';
-// import { InvoiceController } from './services/invoice/invoice.controller';
 
 const hotReloadConfig = {
   resourceName: GetCurrentResourceName(),
@@ -125,6 +124,20 @@ if (isMocking) {
 }
 
 const debug = async () => {
+  // RegisterCommand(
+  //   'giveBankBalance',
+  //   (src: number) => {
+  //     const accountService = container.resolve(AccountService);
+  //     const amount = Math.ceil(Math.random() * 1000);
+  //     console.log('---------------');
+  //     console.log('---------------');
+  //     console.log({ amount });
+  //     console.log('---------------');
+  //     console.log('---------------');
+  //     accountService.setMoney({ data: { amount }, source: src });
+  //   },
+  //   false,
+  // );
   //
   //
   //
diff --git a/src/server/services/account/account.model.ts b/src/server/services/account/account.model.ts
@@ -46,7 +46,7 @@ AccountModel.init(
     },
     balance: {
       type: DataTypes.INTEGER,
-      defaultValue: config?.accounts?.startAmount ?? 0,
+      defaultValue: config?.accounts?.otherAccountStartBalance ?? 0,
     },
     type: {
       type: DataTypes.STRING,
diff --git a/src/server/services/account/account.service.ts b/src/server/services/account/account.service.ts
@@ -36,8 +36,12 @@ import {
 } from '@typings/Errors';
 import { SharedAccountDB } from '@services/accountShared/sharedAccount.db';
 import { AccountEvents, Broadcasts } from '@server/../../typings/Events';
+import { getFrameworkExports } from '@server/utils/frameworkIntegration';
 
 const logger = mainLogger.child({ module: 'accounts' });
+const { enabled = false, syncInitialBankBalance = false } = config.frameworkIntegration ?? {};
+const { firstAccountStartBalance } = config.accounts ?? {};
+const isFrameworkIntegrationEnabled = enabled;
 
 @singleton()
 export class AccountService {
@@ -212,12 +216,24 @@ export class AccountService {
       return defaultAccount.toJSON();
     }
 
-    logger.debug('Creating initial account ...');
+    let balance = firstAccountStartBalance;
+    if (isFrameworkIntegrationEnabled && syncInitialBankBalance) {
+      logger.info('Syncing initial bank balance from framework.');
+
+      const exports = getFrameworkExports();
+      balance = exports.getBank(source);
+
+      logger.info('Moving bank balance from export to initial account.');
+      logger.info({ identifier, balance });
+    }
+
+    logger.debug('Creating initial account .. ');
     const initialAccount = await this._accountDB.createAccount({
       isDefault: true,
       accountName: i18next.t('Personal account'),
       ownerIdentifier: user.getIdentifier(),
       type: AccountType.Personal,
+      balance,
     });
 
     logger.debug('Successfully created initial account.');
@@ -518,8 +534,12 @@ export class AccountService {
         throw new Error('This is already the default account');
       }
 
-      await defaultAccount?.update({ isDefault: false });
-      await newDefaultAccount.update({ isDefault: true });
+      await defaultAccount?.update({ isDefault: false }, { transaction: t });
+      await newDefaultAccount.update({ isDefault: true }, { transaction: t });
+
+      t.afterCommit(() => {
+        emit(AccountEvents.UpdatedDefaultAccount, newDefaultAccount.toJSON());
+      });
 
       t.commit();
       return newDefaultAccount;
diff --git a/src/server/services/broadcast/broadcast.controller.ts b/src/server/services/broadcast/broadcast.controller.ts
@@ -19,6 +19,11 @@ export class BroadcastController {
     this.broadcastService.broadcastNewDefaultAccountBalance(account);
   }
 
+  @Event(AccountEvents.NewBalance)
+  async onNewAccountBalance(account: Account) {
+    this.broadcastService.broadcastNewAccountBalance(account);
+  }
+
   @Event(AccountEvents.NewAccountCreated)
   async onNewAccountCreation(account: Account) {
     this.broadcastService.broadcastUpdatedAccount(account);
diff --git a/src/server/services/broadcast/broadcast.service.ts b/src/server/services/broadcast/broadcast.service.ts
@@ -4,19 +4,26 @@ import { mainLogger } from '@server/sv_logger';
 import { UserService } from '../user/user.service';
 import { Broadcasts } from '@typings/Events';
 import { TransactionDB } from '../transaction/transaction.db';
-import { Account } from '@server/../../typings/Account';
+import { Account, AccountType } from '@server/../../typings/Account';
 import { Cash } from '@server/../../typings/Cash';
+import { AccountService } from '../account/account.service';
 
 const logger = mainLogger.child({ module: 'broadcastService' });
 
 @singleton()
 export class BroadcastService {
   _transactionDB: TransactionDB;
   _userService: UserService;
+  _accountService: AccountService;
 
-  constructor(transactionDB: TransactionDB, userService: UserService) {
+  constructor(
+    transactionDB: TransactionDB,
+    userService: UserService,
+    accountService: AccountService,
+  ) {
     this._transactionDB = transactionDB;
     this._userService = userService;
+    this._accountService = accountService;
   }
 
   async broadcastUpdatedAccount(account: Account) {
@@ -64,6 +71,46 @@ export class BroadcastService {
     }
   }
 
+  async broadcastNewAccountBalance(account: Account) {
+    logger.silly('Broadcasting new balance for account ..');
+
+    const isShared = account.type === AccountType.Shared;
+    const identifier = account.ownerIdentifier;
+    const user = this._userService.getUserByIdentifier(identifier);
+    const onlineUsers = this._userService.getAllUsers();
+
+    if (isShared) {
+      const users = await this._accountService.getUsersFromShared({
+        data: { accountId: account.id },
+        source: 0,
+      });
+
+      const identifiers = users.map((user) => user.userIdentifier);
+
+      onlineUsers.forEach((user) => {
+        if (!identifiers.includes(user.getIdentifier())) {
+          return;
+        }
+
+        emitNet(Broadcasts.NewAccountBalance, user.getSource(), account);
+
+        logger.silly('Broadcasted new balance for shared account:');
+        logger.silly({ identifier, source: user.getSource(), balance: account.balance });
+      });
+      return;
+    }
+
+    if (!user) {
+      /* User is probably offline */
+      return;
+    }
+
+    emitNet(Broadcasts.NewAccountBalance, user?.getSource(), account);
+
+    logger.silly('Broadcasted new balance for personal account:');
+    logger.silly({ identifier, source: user.getSource(), balance: account.balance });
+  }
+
   async broadcastNewDefaultAccountBalance(account: Account) {
     /* Do not broadcast updated values for none default account */
     if (!account.isDefault) {
diff --git a/src/server/utils/frameworkIntegration.ts b/src/server/utils/frameworkIntegration.ts
@@ -12,6 +12,7 @@ const frameworkIntegrationKeys: FrameworkIntegrationFunction[] = [
   'addCash',
   'removeCash',
   'getCash',
+  'getBank',
 ];
 
 export const validateResourceExports = (resourceExports: FrameworkIntegrationExports): boolean => {
diff --git a/typings/Account.ts b/typings/Account.ts
@@ -46,6 +46,7 @@ export interface CreateAccountInput {
   type: AccountType;
   isDefault?: boolean;
   number?: string;
+  balance?: number;
 }
 
 export interface SharedAccount {
diff --git a/typings/Events.ts b/typings/Events.ts
@@ -21,6 +21,7 @@ export enum AccountEvents {
   RenameAccount = 'pefcl:renameAccount',
   CreateAccountResponse = 'pefcl:createAccountResponse',
   SetDefaultAccount = 'pefcl:setDefaultAccount',
+  ChangedDefaultAccount = 'pefcl:changedDefaultAccount',
   DeleteAccount = 'pefcl:deleteAccount',
   DepositMoney = 'pefcl:depositMoney',
   WithdrawMoney = 'pefcl:withdrawMoney',
@@ -46,6 +47,8 @@ export enum Broadcasts {
   NewInvoice = 'pefcl:newInvoiceBroadcast',
   NewSharedUser = 'pefcl:newSharedUser',
   RemovedSharedUser = 'pefcl:removedSharedUser',
+  NewAccount = 'pefcl:newAccountBroadcast',
+  NewAccountBalance = 'pefcl:newAccountBalanceBroadcast',
   NewDefaultAccountBalance = 'pefcl:newDefaultAccountBalance',
   NewCashAmount = 'pefcl:newCashAmount',
 }
diff --git a/typings/config.ts b/typings/config.ts
@@ -33,6 +33,7 @@ export interface ResourceConfig {
   frameworkIntegration: {
     enabled: boolean;
     resource: string;
+    syncInitialBankBalance: boolean;
   };
   database: {
     profileQueries: boolean;
@@ -42,7 +43,8 @@ export interface ResourceConfig {
     newAccount: number;
   };
   accounts: {
-    startAmount: number;
+    firstAccountStartBalance: number;
+    otherAccountStartBalance: number;
     clearingNumber: string | number;
     maximumNumberOfAccounts: number;
   };
diff --git a/typings/exports.ts b/typings/exports.ts
@@ -7,6 +7,14 @@ export interface FrameworkIntegrationExports {
   getCash(source: number): number;
   addCash: (source: number, amount: number) => void;
   removeCash: (source: number, amount: number) => void;
+  /**
+   *
+   *  Move the bank balance from existing bank upon initial account creation.
+   *  The point is to move balance from framework to PEFCL, as an initial solution.
+   *
+   *  This export should probably remove old bank balance as well.
+   */
+  getBank: (source: number) => number;
 }
 
 export type FrameworkIntegrationFunction = keyof FrameworkIntegrationExports;
diff --git a/web/package.json b/web/package.json
@@ -52,7 +52,8 @@
     "eject": "react-scripts eject",
     "test": "jest --silent",
     "test:watch": "jest --watch",
-    "lint": "eslint src"
+    "lint": "eslint src",
+    "tsc": "tsc"
   },
   "eslintConfig": {
     "extends": [
diff --git a/web/src/components/Modals/CreateAccount.tsx b/web/src/components/Modals/CreateAccount.tsx
@@ -26,7 +26,7 @@ interface CreateAccountForm {
 const CreateAccountModal: React.FC<{ onClose(): void }> = ({ onClose }) => {
   const { t } = useTranslation();
   const config = useConfig();
-  const [accounts, updateAccounts] = useAtom(accountsAtom);
+  const [accounts] = useAtom(accountsAtom);
   const [, updateTransactions] = useAtom(transactionBaseAtom);
   const [defaultAccount] = useAtom(defaultAccountAtom);
 
@@ -46,7 +46,6 @@ const CreateAccountModal: React.FC<{ onClose(): void }> = ({ onClose }) => {
 
   const onSubmit = async (values: CreateAccountForm) => {
     await fetchNui(AccountEvents.CreateAccount, values);
-    await updateAccounts();
     await updateTransactions();
     onClose();
   };
diff --git a/web/src/data/accounts.ts b/web/src/data/accounts.ts
@@ -18,14 +18,14 @@ const getAccounts = async (): Promise<Account[]> => {
   }
 };
 
-const rawAccountAtom = atom<Account[]>([]);
-export const accountsAtom = atom(
+export const rawAccountAtom = atom<Account[]>([]);
+export const accountsAtom = atom<Promise<Account[]>, Account[] | undefined, Promise<void>>(
   async (get) => {
     const accounts = get(rawAccountAtom).length === 0 ? await getAccounts() : get(rawAccountAtom);
     return accounts;
   },
-  async (_get, set) => {
-    return set(rawAccountAtom, await getAccounts());
+  async (_get, set, by) => {
+    return set(rawAccountAtom, by ?? (await getAccounts()));
   },
 );
 
diff --git a/web/src/hooks/useBroadcasts.ts b/web/src/hooks/useBroadcasts.ts
@@ -1,20 +1,28 @@
 import { accountsAtom } from '@data/accounts';
 import { invoicesAtom } from '@data/invoices';
 import { transactionBaseAtom } from '@data/transactions';
+import { Account } from '@typings/Account';
 import { Broadcasts } from '@typings/Events';
-import { useAtom } from 'jotai';
+import { updateAccount } from '@utils/account';
+import { useAtom, useSetAtom } from 'jotai';
 import { useNuiEvent } from 'react-fivem-hooks';
 
 export const useBroadcasts = () => {
-  const [, updateInvoices] = useAtom(invoicesAtom);
-  const [, updateTransactions] = useAtom(transactionBaseAtom);
-  const [, updateAccounts] = useAtom(accountsAtom);
+  const updateInvoices = useSetAtom(invoicesAtom);
+  const updateTransactions = useSetAtom(transactionBaseAtom);
+  const [accounts, updateAccounts] = useAtom(accountsAtom);
 
   useNuiEvent({
     event: Broadcasts.NewTransaction,
     callback: () => {
       updateTransactions();
-      updateAccounts();
+    },
+  });
+
+  useNuiEvent({
+    event: Broadcasts.NewAccount,
+    callback: (account: Account) => {
+      updateAccounts([...accounts, account]);
     },
   });
 
@@ -25,6 +33,13 @@ export const useBroadcasts = () => {
     },
   });
 
+  useNuiEvent({
+    event: Broadcasts.NewAccountBalance,
+    callback: (account: Account) => {
+      updateAccounts(updateAccount(accounts, account));
+    },
+  });
+
   useNuiEvent({
     event: Broadcasts.NewInvoice,
     callback: () => {
diff --git a/web/src/utils/account.ts b/web/src/utils/account.ts
@@ -11,3 +11,16 @@ export const getIsOwner = (account: Account) => {
 export const getIsShared = (account: Account) => {
   return account.type === AccountType.Shared;
 };
+
+export const updateAccount = (accounts: Account[], updatedAccount: Account): Account[] => {
+  const existingAccount = accounts.find((acc) => acc.id === updatedAccount.id);
+  if (!existingAccount) {
+    return accounts;
+  }
+
+  const newAccounts = [...accounts];
+  const index = accounts.findIndex((acc) => acc.id === existingAccount.id);
+  newAccounts.splice(index, 1, updatedAccount);
+
+  return newAccounts;
+};
diff --git a/web/src/views/ATM/ATM.tsx b/web/src/views/ATM/ATM.tsx
@@ -74,8 +74,9 @@ const ATM = () => {
     };
 
     setIsLoading(true);
+    // TODO: Update this with cards implementation
     fetchNui(AccountEvents.WithdrawMoney, payload)
-      .then(updateAccounts)
+      .then(() => updateAccounts())
       .finally(() => setIsLoading(false));
   };
 
diff --git a/web/src/views/Deposit/Deposit.tsx b/web/src/views/Deposit/Deposit.tsx
diff --git a/web/src/views/Withdraw/Withdraw.tsx b/web/src/views/Withdraw/Withdraw.tsx
diff --git a/web/src/views/accounts/Accounts.tsx b/web/src/views/accounts/Accounts.tsx
diff --git a/web/src/views/accounts/SharedSettings.tsx b/web/src/views/accounts/SharedSettings.tsx

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ export interface CreateAccountInput {`
`46`	`46`	`type: AccountType;`
`47`	`47`	`isDefault?: boolean;`
`48`	`48`	`number?: string;`
	`49`	`+ balance?: number;`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`export interface SharedAccount {`