adapt ci to new structure

.github/workflows/ci_testing.yaml

@@ -104,3 +104,18 @@ jobs:
         run: npm --prefix frontend install
       - name: Check JavaScript formatting
         run: make check-format-frontend
+
+  build-web:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Nodejs
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+          cache: "npm"
+          cache-dependency-path: frontend/package-lock.json
+      - name: Install dependencies
+        run: npm --prefix frontend install
+      - name: Build web app
+        run: cd frontend && npx nx build web && cd ..

abrechnung/application/accounts.py

@@ -602,7 +602,7 @@ async def sync_account(
             conn=conn,
             user=user,
             group_id=account.group_id,
-            type=account.type,
+            type=account.type.value,
             name=account.name,
             description=account.description,
             owning_user_id=account.owning_user_id,

abrechnung/application/transactions.py

@@ -829,7 +829,7 @@ async def update_transaction(
                     billed_at=billed_at,
                     currency_symbol=currency_symbol,
                     currency_conversion_rate=currency_conversion_rate,
-                    debitor_shares=debu,
+                    debitor_shares=debitor_shares,
                     creditor_shares=creditor_shares,
                     positions=positions,
                     perform_commit=perform_commit,
@@ -850,7 +850,7 @@ async def update_transaction_positions(
                     user=user,
                     transaction_id=transaction_id,
                     can_write=True,
-                    transaction_type=TransactionType.purchase.value(),
+                    transaction_type=TransactionType.purchase.value,
                 )
                 revision_id = await self._get_or_create_revision(
                     conn=conn, user=user, transaction_id=transaction_id

abrechnung/http/accounts.py

@@ -59,7 +59,7 @@ async def sync_accounts(request: web.Request):
     updated_ids = await request.app["account_service"].sync_accounts(
         user=request["user"],
         group_id=int(request.match_info["group_id"]),
-        accounts=request["json"] # TODO: FIXME, convert to proper parameters
+        accounts=request["json"],  # TODO: FIXME, convert to proper parameters
     )
 
     await json_response(data=updated_ids)

abrechnung/http/transactions.py

@@ -6,7 +6,11 @@
 from marshmallow import Schema, fields
 
 from abrechnung.http.openapi import docs, json_schema
-from abrechnung.http.serializers import TransactionSchema, TransactionPositionSchema, SharesField
+from abrechnung.http.serializers import (
+    TransactionSchema,
+    TransactionPositionSchema,
+    SharesField,
+)
 from abrechnung.http.utils import json_response, PrefixedRouteTableDef
 
 routes = PrefixedRouteTableDef("/api")
@@ -75,17 +79,13 @@ async def list_transactions(request):
 
 
 @routes.post(r"/v1/groups/{group_id:\d+}/transactions/sync")
-@docs(
-    tags=["transactions"],
-    summary="sync a batch of transactions",
-    description=""
-)
+@docs(tags=["transactions"], summary="sync a batch of transactions", description="")
 @json_schema(TransactionUpdateScheme(many=True))
 async def sync_transactions(request: Request):
     updated_ids = await request.app["transaction_service"].sync_transactions(
         user=request["user"],
         group_id=int(request.match_info["group_id"]),
-        transactions=request["json"]  # TODO: FIXME, convert to proper parameters
+        transactions=request["json"],  # TODO: FIXME, convert to proper parameters
     )
 
     await json_response(data=updated_ids)

debian/build_virtualenv

@@ -64,9 +64,9 @@ interest dh-virtualenv-interpreter-update
 EOF
 
 export DESTDIR="debian/abrechnung"
-cd web && yarn install && yarn build && cd ..
+cd frontend && npm install && npx nx build web && cd ..
 mkdir -p $DESTDIR/usr/share/
-mv web/build $DESTDIR/usr/share/abrechnung_web
+mv frontend/dist/web $DESTDIR/usr/share/abrechnung_web
 
 #mkdir -p $DESTDIR/etc/abrechnung
 #mkdir -p $DESTDIR/etc/nginx/sites-available

debian/source/options

@@ -1,7 +1,6 @@
-tar-ignore = "web/node_modules"
+tar-ignore = "frontend/node_modules"
 tar-ignore = ".git"
 tar-ignore = ".pybuild"
-tar-ignore = "web/yarn-error.log"
 tar-ignore = "config.yaml"
 tar-ignore = ".idea"
 tar-ignore = "docs/_build"

frontend/apps/backend/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+    "extends": ["../../.eslintrc.json"],
+    "ignorePatterns": ["!**/*"],
+    "overrides": [
+        {
+            "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+            "rules": {}
+        },
+        {
+            "files": ["*.ts", "*.tsx"],
+            "rules": {}
+        },
+        {
+            "files": ["*.js", "*.jsx"],
+            "rules": {}
+        }
+    ]
+}

frontend/apps/backend/jest.config.ts

@@ -0,0 +1,16 @@
+/* eslint-disable */
+export default {
+    displayName: "backend",
+    preset: "../../jest.preset.js",
+    globals: {
+        "ts-jest": {
+            tsconfig: "<rootDir>/tsconfig.spec.json",
+        },
+    },
+    testEnvironment: "node",
+    transform: {
+        "^.+\\.[tj]s$": "ts-jest",
+    },
+    moduleFileExtensions: ["ts", "js", "html"],
+    coverageDirectory: "../../coverage/apps/backend",
+};

frontend/apps/backend/project.json

@@ -0,0 +1,60 @@
+{
+    "name": "backend",
+    "$schema": "../../node_modules/nx/schemas/project-schema.json",
+    "sourceRoot": "apps/backend/src",
+    "projectType": "application",
+    "targets": {
+        "build": {
+            "executor": "@nrwl/webpack:webpack",
+            "outputs": ["{options.outputPath}"],
+            "options": {
+                "target": "node",
+                "compiler": "tsc",
+                "outputPath": "dist/apps/backend",
+                "main": "apps/backend/src/main.ts",
+                "tsConfig": "apps/backend/tsconfig.app.json",
+                "assets": ["apps/backend/src/assets"]
+            },
+            "configurations": {
+                "production": {
+                    "optimization": true,
+                    "extractLicenses": true,
+                    "inspect": false,
+                    "fileReplacements": [
+                        {
+                            "replace": "apps/backend/src/environments/environment.ts",
+                            "with": "apps/backend/src/environments/environment.prod.ts"
+                        }
+                    ]
+                }
+            }
+        },
+        "serve": {
+            "executor": "@nrwl/js:node",
+            "options": {
+                "buildTarget": "backend:build"
+            },
+            "configurations": {
+                "production": {
+                    "buildTarget": "backend:build:production"
+                }
+            }
+        },
+        "lint": {
+            "executor": "@nrwl/linter:eslint",
+            "outputs": ["{options.outputFile}"],
+            "options": {
+                "lintFilePatterns": ["apps/backend/**/*.ts"]
+            }
+        },
+        "test": {
+            "executor": "@nrwl/jest:jest",
+            "outputs": ["coverage/apps/backend"],
+            "options": {
+                "jestConfig": "apps/backend/jest.config.ts",
+                "passWithNoTests": true
+            }
+        }
+    },
+    "tags": []
+}

frontend/apps/backend/src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+    production: true,
+};

frontend/apps/backend/src/environments/environment.ts

@@ -0,0 +1,3 @@
+export const environment = {
+    production: false,
+};

frontend/apps/backend/src/main.ts

@@ -0,0 +1,18 @@
+/**
+ * This is not a production server yet!
+ * This is only a minimal backend to get started.
+ */
+
+import * as express from "express";
+
+const app = express();
+
+app.get("/api", (req, res) => {
+    res.send({ message: "Welcome to backend!" });
+});
+
+const port = process.env.port || 3333;
+const server = app.listen(port, () => {
+    console.log(`Listening at http://localhost:${port}/api`);
+});
+server.on("error", console.error);

frontend/apps/backend/tsconfig.app.json

@@ -0,0 +1,10 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../dist/out-tsc",
+        "module": "commonjs",
+        "types": ["node", "express"]
+    },
+    "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"],
+    "include": ["**/*.ts"]
+}

frontend/apps/backend/tsconfig.json

@@ -0,0 +1,13 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "files": [],
+    "include": [],
+    "references": [
+        {
+            "path": "./tsconfig.app.json"
+        },
+        {
+            "path": "./tsconfig.spec.json"
+        }
+    ]
+}

frontend/apps/backend/tsconfig.spec.json

@@ -0,0 +1,9 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../dist/out-tsc",
+        "module": "commonjs",
+        "types": ["jest", "node"]
+    },
+    "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]
+}

frontend/apps/mobile/src/core/accounts.ts

@@ -4,6 +4,7 @@ import { accountNotifier, getAccount, getAccounts } from "./database/accounts";
 import { positionState, transactionState } from "./transactions";
 import { computeAccountBalances } from "@abrechnung/core";
 import { useNavigation } from "@react-navigation/native";
+import { RootDrawerNavigationProp } from "../navigation/types";
 
 function filterAccounts(account: Account[]): Account[] {
     return account.filter((a) => !a.deleted);

frontend/apps/mobile/src/core/database/accounts.ts

@@ -103,13 +103,29 @@ const saveAccountToDatabase = async (account: Account, conn?: Connection) => {
 };
 
 export const syncAccounts = async (groupID: number): Promise<Account[]> => {
-    const backendAccounts = await api.fetchAccounts(groupID);
+    let backendAccounts = await api.fetchAccounts(groupID);
     await db.transaction((conn: Connection) => {
         backendAccounts.forEach((account: Account) => {
             saveAccountToDatabase(account, conn);
         });
     });
-    // TODO: upload pending changes to server
+
+    // TODO: resolve conflicts after fetching accounts
+    const accounts = await getAccounts(groupID);
+    const accountsWithLocalChanges = accounts.filter((a: Account) => a.hasLocalChanges);
+    if (accountsWithLocalChanges.length > 0) {
+        await api.syncAccountsBatch(groupID, accountsWithLocalChanges);
+        backendAccounts = await api.fetchAccounts(groupID);
+        await db.transaction(async (conn: Connection) => {
+            await Promise.all(
+                backendAccounts.map((account: Account) => {
+                    return saveAccountToDatabase(account, conn);
+                })
+            );
+            await conn.execute(`delete from pending_account_changes where group_id = ?1`, [groupID]);
+        });
+    }
+
     accountNotifier.emit("changed", { groupID: groupID });
     return backendAccounts;
 };
@@ -266,7 +282,7 @@ export const pushPendingAccountChanges = async (groupID: number): Promise<void>
     });
 };
 
-export const pushLocalAccountChanges = async (account_id: number): Promise<Account> => {
+export const pushLocalAccountChanges = async (accountID: number): Promise<Account> => {
     if (!(await isOnline())) {
         console.log("cannot push changes to server as we are offline");
         throw Error("Cannot push local changes to server as we are offline");
@@ -284,15 +300,15 @@ export const pushLocalAccountChanges = async (account_id: number): Promise<Accou
             order by
                 event_time desc
             limit 1`,
-            [account_id]
+            [accountID]
         );
         if (accountQueryResult.rows.length === 0) {
             return;
         }
 
         console.log("pushing transaction detail plus position changes to server");
         const t = accountQueryResult.rows[0];
-        const account = accountFromEvent(account_id, t.group_id, t.event_time, JSON.parse(t.event_content));
+        const account = accountFromEvent(accountID, t.group_id, t.event_time, JSON.parse(t.event_content));
         const updatedAccount = await api.pushAccountChanges(account);
         await conn.execute(
             `
@@ -302,7 +318,7 @@ export const pushLocalAccountChanges = async (account_id: number): Promise<Accou
             where
                 account_id = ?1
         `,
-            [account_id]
+            [accountID]
         );
         await saveAccountToDatabase(updatedAccount, conn);
         console.log("successfully synced local changes with server and saved the result to local database");
@@ -410,12 +426,12 @@ export const createAccount = async (groupID: number, type: AccountType): Promise
     });
 };
 
-export const deleteAccount = async (group_id: number, account_id: number) => {
-    if (account_id < 0) {
-        return await deleteLocalAccountChanges(group_id, account_id);
+export const deleteAccount = async (groupID: number, accountID: number) => {
+    if (accountID < 0) {
+        return await deleteLocalAccountChanges(groupID, accountID);
     }
 
-    const account = await getAccount(group_id, account_id);
+    const account = await getAccount(groupID, accountID);
     account.deleted = true;
     return await updateAccount(account);
 };

frontend/apps/mobile/src/core/groups.ts

@@ -1,4 +1,4 @@
-import { atom, selector, selectorFamily, useRecoilValue } from "recoil";
+import { atom, RecoilState, selector, selectorFamily, useRecoilValue } from "recoil";
 import { getGroups, groupNotifier } from "./database/groups";
 import { Group } from "@abrechnung/types";
 import { useNavigation } from "@react-navigation/native";
@@ -8,7 +8,7 @@ export const activeGroupIDState = atom<number | null>({
     default: null,
 });
 
-export const groupState = atom<Group[]>({
+export const groupState: RecoilState<Group[]> = atom<Group[]>({
     key: "groupState",
     default: getGroups(),
     effects: [

frontend/apps/mobile/src/core/sync.ts

@@ -1,9 +1,10 @@
 import { syncGroups } from "./database/groups";
 import { syncAccounts } from "./database/accounts";
 import { syncTransactions } from "./database/transactions";
+import { Group } from "@abrechnung/types";
 
-export async function syncLocalState() {
-    await syncGroups();
+export async function syncLocalState(): Promise<Group[]> {
+    return await syncGroups();
 }
 
 export async function syncLocalGroupState(groupID: number) {