feat: wip attachments

.env.example

@@ -75,17 +75,31 @@ PLAID_ENV=sandbox
 # Your Plaid keys, which can be found in the Plaid Dashboard.
 # https://dashboard.plaid.com/account/keys
 PLAID_CLIENT_ID=
-PLAID_SECRET=
+PLAID_SECRET_DEVELOPMENT=
+PLAID_SECRET_SANDBOX=
+
 PLAID_LINK_WEBHOOK=
 
+# (Optional) Redirect URI settings section
+# Only required for OAuth redirect URI testing (not common on desktop):
+# Sandbox Mode:
+# Set the PLAID_SANDBOX_REDIRECT_URI below to 'http://localhost:3001/oauth-link'.
+# The OAuth redirect flow requires an endpoint on the developer's website
+# that the bank website should redirect to. You will also need to configure
+# this redirect URI for your client ID through the Plaid developer dashboard
+# at https://dashboard.plaid.com/team/api.
+# Development mode:
+# When running in development mode, you must use an https:// url.
+# You will need to configure this https:// redirect URI in the Plaid developer dashboard.
+# Instructions to create a self-signed certificate for localhost can be found at
+# https://github.com/plaid/pattern/blob/master/README.md#testing-oauth.
+# If your system is not set up to run localhost with https://, you will be unable to test
+# the OAuth in development and should leave the PLAID_DEVELOPMENT_REDIRECT_URI blank.
+
+PLAID_SANDBOX_REDIRECT_URI=
+PLAID_DEVELOPMENT_REDIRECT_URI=
+
 # https://docs.lemonsqueezy.com/guides/developer-guide/getting-started#create-an-api-key
 LEMONSQUEEZY_API_KEY=
 LEMONSQUEEZY_STORE_ID=
 LEMONSQUEEZY_WEBHOOK_SECRET=
-
-# S3 documents and attachments 
-S3_REGION=
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_ENDPOINT=
-S3_BUCKET=

.github/workflows/build-deploy-develop-container.yaml

@@ -1,127 +0,0 @@
-# This workflow will build a docker container, publish it to Github Registry.
-name: Build and Deploy Develop Docker Container
-on:
-  push:
-    branches:
-      - develop
-
-env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
-  SERVER_IMAGE_NAME: bigcapitalhq/server
-
-jobs:
-  build-publish-webapp:
-    strategy:
-      fail-fast: false
-    name: Build and deploy webapp container
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.WEBAPP_IMAGE_NAME }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:develop
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-webapp
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-      # Send notification to Slack channel.
-      - name: Slack Notification built and published webapp container successfully.
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-  build-publish-server:
-    name: Build and deploy server container
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/server/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: bigcapitalhq/server:develop
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-server
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      # Send notification to Slack channel.
-      - name: Slack Notification built and published server container successfully.
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

CHANGELOG.md

@@ -2,41 +2,6 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [0.17.0] - 04-06-2024
-
-### New
-
-* feat: Upload and attach documents by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/461
-* feat: Export resource tables to pdf by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/460
-* feat: Build and deploy develop Docker container by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/476
-* feat: Internal docker virtual network by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/478
-
-### Fixes
-
-* fix: Skip send confirmation email if disabled by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/459
-* fix: Lemon Squeezy redirect to base url by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/479
-* fix: Organize Plaid env variables for development and sandbox envs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/480
-* fix: Plaid syncs deposit imports as withdrawals by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/481
-* fix: Validate the s3 configures exist by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/482
-* fix: Run migrations only for initialized tenants by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/484
-
-## [0.16.16] - 
-
-* feat: handle http exceptions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/456
-* feat: add the missing Newrelic env vars to docker-compose.prod file by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/457
-* fix: add the signup email confirmation env var by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/458
-
-## [0.16.14] - 
-
-* fix: Typo in setup wizard by @ccantrell72 in https://github.com/bigcapitalhq/bigcapital/pull/440
-* fix: Showing the real mail address on email confirmation view by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/445
-* fix: Auto-increment setting parsing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/453
-
-## [0.16.12] - 
-
-* feat: Create a manifest list for `webapp` Docker image and push it to DockerHub. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/436
-* feat: Combine arm64 and amd64 in one Github action runner by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/437
-
 ## [0.16.11] - 06-05-2024
 
 ### improvements

docker-compose.prod.yml

@@ -22,15 +22,11 @@ services:
       - server
       - webapp
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   webapp:
     container_name: bigcapital-webapp
     image: bigcapitalhq/webapp:latest
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   server:
     container_name: bigcapital-server
@@ -86,24 +82,18 @@ services:
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
       - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
 
-      # Sign-up email confirmation
-      - SIGNUP_EMAIL_CONFIRMATION=${SIGNUP_EMAIL_CONFIRMATION}
-
       # Gotenberg (Pdf generator)
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
 
-      # Exchange Rate
-      - EXCHANGE_RATE_SERVICE=${EXCHANGE_RATE_SERVICE}
-      - OPEN_EXCHANGE_RATE_APP_ID-${OPEN_EXCHANGE_RATE_APP_ID}
-
       # Bank Sync
       - BANKING_CONNECT=${BANKING_CONNECT}
 
       # Plaid
       - PLAID_ENV=${PLAID_ENV}
       - PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
-      - PLAID_SECRET=${PLAID_SECRET}
+      - PLAID_SECRET_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
+      - PLAID_SECRET_SANDBOX=${b8cf42b441e110451e2f69ad7e1e9f}
       - PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
 
       # Lemon Squeez
@@ -118,17 +108,7 @@ services:
       - NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED}
       - NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED}
       - NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}
-      - NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
 
-      # S3
-      - S3_REGION=${S3_REGION}
-      - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
-      - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
-      - S3_ENDPOINT=${S3_ENDPOINT}
-      - S3_BUCKET=${S3_BUCKET}
-    networks:
-      - bigcapital_network
 
   database_migration:
     container_name: bigcapital-database-migration
@@ -146,8 +126,6 @@ services:
       - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
     depends_on:
       - mysql
-    networks:
-      - bigcapital_network
 
   mysql:
     container_name: bigcapital-mysql
@@ -163,8 +141,6 @@ services:
       - mysql:/var/lib/mysql
     expose:
       - '3306'
-    networks:
-      - bigcapital_network
 
   mongo:
     container_name: bigcapital-mongo
@@ -174,8 +150,6 @@ services:
       - '27017'
     volumes:
       - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network
 
   redis:
     container_name: bigcapital-redis
@@ -186,15 +160,11 @@ services:
       - '6379'
     volumes:
       - redis:/data
-    networks:
-      - bigcapital_network
 
   gotenberg:
     image: gotenberg/gotenberg:7
     expose:
       - '9000'
-    networks:
-      - bigcapital_network
 
 # Volumes
 volumes:
@@ -209,8 +179,3 @@ volumes:
   redis:
     name: bigcapital_prod_redis
     driver: local
-
-# Networks
-networks:
-  bigcapital_network:
-    driver: bridge

packages/server/newrelic_agent.log

@@ -0,0 +1,24 @@
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4846,"time":"2024-05-15T09:09:09.492Z","msg":"Unable to find configuration file. If a configuration file is desired (common for non-containerized environments), a base configuration file can be copied from /Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/newrelic.js and renamed to \"newrelic.js\" in the directory from which you will start your application. Attempting to start agent using environment variables."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4846,"time":"2024-05-15T09:09:09.514Z","msg":"Using New Relic for Node.js. Agent version: 11.16.0; Node version: v18.18.2."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4846,"time":"2024-05-15T09:09:09.791Z","msg":"Using AsyncLocalContextManager"}
+{"v":0,"level":50,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4846,"time":"2024-05-15T09:09:09.793Z","msg":"New Relic for Node.js was unable to bootstrap itself due to an error:","stack":"Error: New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!\n    at createAgent (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:160:11)\n    at initialize (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:105:15)\n    at Object.<anonymous> (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:39:3)\n    at Module._compile (node:internal/modules/cjs/loader:1256:14)\n    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)\n    at Module.load (node:internal/modules/cjs/loader:1119:32)\n    at Module._load (node:internal/modules/cjs/loader:960:12)\n    at Module.require (node:internal/modules/cjs/loader:1143:19)\n    at require (node:internal/modules/cjs/helpers:119:18)\n    at Object.newrelic (/Users/ahmedbouhuolia/repos/bigcapital/packages/server/build/index.js:15954:18)","message":"New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!"}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4883,"time":"2024-05-15T09:09:27.758Z","msg":"Unable to find configuration file. If a configuration file is desired (common for non-containerized environments), a base configuration file can be copied from /Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/newrelic.js and renamed to \"newrelic.js\" in the directory from which you will start your application. Attempting to start agent using environment variables."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4883,"time":"2024-05-15T09:09:27.771Z","msg":"Using New Relic for Node.js. Agent version: 11.16.0; Node version: v18.18.2."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4883,"time":"2024-05-15T09:09:27.927Z","msg":"Using AsyncLocalContextManager"}
+{"v":0,"level":50,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":4883,"time":"2024-05-15T09:09:27.929Z","msg":"New Relic for Node.js was unable to bootstrap itself due to an error:","stack":"Error: New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!\n    at createAgent (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:160:11)\n    at initialize (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:105:15)\n    at Object.<anonymous> (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:39:3)\n    at Module._compile (node:internal/modules/cjs/loader:1256:14)\n    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)\n    at Module.load (node:internal/modules/cjs/loader:1119:32)\n    at Module._load (node:internal/modules/cjs/loader:960:12)\n    at Module.require (node:internal/modules/cjs/loader:1143:19)\n    at require (node:internal/modules/cjs/helpers:119:18)\n    at Object.newrelic (/Users/ahmedbouhuolia/repos/bigcapital/packages/server/build/index.js:15954:18)","message":"New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!"}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":5411,"time":"2024-05-15T09:15:10.318Z","msg":"Unable to find configuration file. If a configuration file is desired (common for non-containerized environments), a base configuration file can be copied from /Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/newrelic.js and renamed to \"newrelic.js\" in the directory from which you will start your application. Attempting to start agent using environment variables."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":5411,"time":"2024-05-15T09:15:10.326Z","msg":"Using New Relic for Node.js. Agent version: 11.16.0; Node version: v18.18.2."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":5411,"time":"2024-05-15T09:15:10.420Z","msg":"Using AsyncLocalContextManager"}
+{"v":0,"level":50,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":5411,"time":"2024-05-15T09:15:10.421Z","msg":"New Relic for Node.js was unable to bootstrap itself due to an error:","stack":"Error: New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!\n    at createAgent (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:160:11)\n    at initialize (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:105:15)\n    at Object.<anonymous> (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:39:3)\n    at Module._compile (node:internal/modules/cjs/loader:1256:14)\n    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)\n    at Module.load (node:internal/modules/cjs/loader:1119:32)\n    at Module._load (node:internal/modules/cjs/loader:960:12)\n    at Module.require (node:internal/modules/cjs/loader:1143:19)\n    at require (node:internal/modules/cjs/helpers:119:18)\n    at Object.newrelic (/Users/ahmedbouhuolia/repos/bigcapital/packages/server/build/index.js:15954:18)","message":"New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!"}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":8856,"time":"2024-05-15T11:47:03.324Z","msg":"Unable to find configuration file. If a configuration file is desired (common for non-containerized environments), a base configuration file can be copied from /Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/newrelic.js and renamed to \"newrelic.js\" in the directory from which you will start your application. Attempting to start agent using environment variables."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":8856,"time":"2024-05-15T11:47:03.335Z","msg":"Using New Relic for Node.js. Agent version: 11.16.0; Node version: v18.18.2."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":8856,"time":"2024-05-15T11:47:03.504Z","msg":"Using AsyncLocalContextManager"}
+{"v":0,"level":50,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":8856,"time":"2024-05-15T11:47:03.505Z","msg":"New Relic for Node.js was unable to bootstrap itself due to an error:","stack":"Error: New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!\n    at createAgent (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:160:11)\n    at initialize (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:105:15)\n    at Object.<anonymous> (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:39:3)\n    at Module._compile (node:internal/modules/cjs/loader:1256:14)\n    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)\n    at Module.load (node:internal/modules/cjs/loader:1119:32)\n    at Module._load (node:internal/modules/cjs/loader:960:12)\n    at Module.require (node:internal/modules/cjs/loader:1143:19)\n    at require (node:internal/modules/cjs/helpers:119:18)\n    at Object.newrelic (/Users/ahmedbouhuolia/repos/bigcapital/packages/server/build/index.js:15954:18)","message":"New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!"}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":12076,"time":"2024-05-15T14:30:36.984Z","msg":"Unable to find configuration file. If a configuration file is desired (common for non-containerized environments), a base configuration file can be copied from /Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/newrelic.js and renamed to \"newrelic.js\" in the directory from which you will start your application. Attempting to start agent using environment variables."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":12076,"time":"2024-05-15T14:30:36.990Z","msg":"Using New Relic for Node.js. Agent version: 11.16.0; Node version: v18.18.2."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":12076,"time":"2024-05-15T14:30:37.126Z","msg":"Using AsyncLocalContextManager"}
+{"v":0,"level":50,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":12076,"time":"2024-05-15T14:30:37.127Z","msg":"New Relic for Node.js was unable to bootstrap itself due to an error:","stack":"Error: New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!\n    at createAgent (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:160:11)\n    at initialize (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:105:15)\n    at Object.<anonymous> (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:39:3)\n    at Module._compile (node:internal/modules/cjs/loader:1256:14)\n    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)\n    at Module.load (node:internal/modules/cjs/loader:1119:32)\n    at Module._load (node:internal/modules/cjs/loader:960:12)\n    at Module.require (node:internal/modules/cjs/loader:1143:19)\n    at require (node:internal/modules/cjs/helpers:119:18)\n    at Object.newrelic (/Users/ahmedbouhuolia/repos/bigcapital/packages/server/build/index.js:15954:18)","message":"New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!"}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":29079,"time":"2024-05-17T10:24:22.393Z","msg":"Unable to find configuration file. If a configuration file is desired (common for non-containerized environments), a base configuration file can be copied from /Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/newrelic.js and renamed to \"newrelic.js\" in the directory from which you will start your application. Attempting to start agent using environment variables."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":29079,"time":"2024-05-17T10:24:22.405Z","msg":"Using New Relic for Node.js. Agent version: 11.16.0; Node version: v18.18.2."}
+{"v":0,"level":30,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":29079,"time":"2024-05-17T10:24:22.536Z","msg":"Using AsyncLocalContextManager"}
+{"v":0,"level":50,"name":"newrelic","hostname":"Ahmeds-MacBook-Air.local","pid":29079,"time":"2024-05-17T10:24:22.537Z","msg":"New Relic for Node.js was unable to bootstrap itself due to an error:","stack":"Error: New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!\n    at createAgent (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:160:11)\n    at initialize (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:105:15)\n    at Object.<anonymous> (/Users/ahmedbouhuolia/repos/bigcapital/node_modules/.pnpm/newrelic@11.16.0/node_modules/newrelic/index.js:39:3)\n    at Module._compile (node:internal/modules/cjs/loader:1256:14)\n    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)\n    at Module.load (node:internal/modules/cjs/loader:1119:32)\n    at Module._load (node:internal/modules/cjs/loader:960:12)\n    at Module.require (node:internal/modules/cjs/loader:1143:19)\n    at require (node:internal/modules/cjs/helpers:119:18)\n    at Object.newrelic (/Users/ahmedbouhuolia/repos/bigcapital/packages/server/build/index.js:15954:18)","message":"New Relic requires that you name this application!\nSet app_name in your newrelic.js or newrelic.cjs file or set environment variable\nNEW_RELIC_APP_NAME. Not starting!"}

packages/server/package.json

@@ -21,11 +21,9 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.576.0",
-    "@aws-sdk/s3-request-presigner": "^3.583.0",
     "@casl/ability": "^5.4.3",
     "@hapi/boom": "^7.4.3",
     "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
-    "@types/express": "^4.17.21",
     "@types/i18n": "^0.8.7",
     "@types/knex": "^0.16.1",
     "@types/mathjs": "^6.0.12",
@@ -76,14 +74,12 @@
     "lru-cache": "^6.0.0",
     "mathjs": "^9.4.0",
     "memory-cache": "^0.2.0",
-    "mime-types": "^2.1.35",
     "moment": "^2.24.0",
     "moment-range": "^4.0.2",
     "moment-timezone": "^0.5.43",
     "mongodb": "^6.1.0",
     "mongoose": "^5.10.0",
     "multer": "1.4.5-lts.1",
-    "multer-s3": "^3.0.1",
     "mustache": "^3.0.3",
     "mysql": "^2.17.1",
     "mysql2": "^1.6.5",
@@ -118,7 +114,6 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.158",
-    "@types/multer": "^1.4.11",
     "@types/ramda": "^0.27.64",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",

packages/server/resources/scss/modules/export-resource-table.scss

@@ -1,38 +0,0 @@
-@import "../base.scss";
-
-body {
-  font-family: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-  font-size: 12px;
-  line-height: 1.4;
-  margin: 0;
-}
-.sheet__title{
-  margin-bottom: 18px;
-}
-.sheet__title h2{
-  line-height: 1;
-  margin-top: 0;
-  margin-bottom: 10px;
-  font-size: 16px;
-}
-.sheet__table {
-  font-size: inherit;
-  line-height: inherit;
-  width: 100%;
-}
-.sheet__table {
-  table-layout: auto;
-  border-collapse: collapse;  
-  width: 100%;
-}
-.sheet__table thead tr th {
-  border-top: 1px solid #000;
-  border-bottom: 1px solid #000;
-  background: #fff;
-  padding: 8px;
-  line-height: 1.2;
-}
-.sheet__table tbody tr td {
-  padding: 4px 8px;
-  border-bottom: 1px solid #CCC;    
-}

packages/server/resources/views/modules/export-resource-table.pug

@@ -1,24 +0,0 @@
-block head
-  style 
-    include ../../css/modules/export-resource-table.css
-
-style.
-  !{customCSS}
-
-block content 
-  .sheet
-    .sheet__title 
-      h2.sheetTitle= sheetTitle
-      p.sheetDesc= sheetDescription
-
-    table.sheet__table
-      thead
-        tr
-          each column in table.columns
-            th(style=column.style class='column--' + column.key)= column.name
-      tbody
-        each row in table.rows
-          tr(class=row.classNames)
-            each cell in row.cells 
-              td(class='cell--' + cell.key)
-                span!= cell.value

packages/server/scripts/gulpConfig.js

@@ -70,10 +70,6 @@ module.exports = {
         src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
         dest: `${RESOURCES_PATH}/css/modules`,
       },
-      {
-        src: `${RESOURCES_PATH}/scss/modules/export-resource-table.scss`,
-        dest: `${RESOURCES_PATH}/css/modules`,
-      },
     ],
     // RTL builds.
     rtl: [

packages/server/src/api/controllers/Accounts.ts

@@ -207,6 +207,7 @@ export default class AccountsController extends BaseController {
         tenantId,
         accountDTO
       );
+
       return res.status(200).send({
         id: account.id,
         message: 'The account has been created successfully.',

packages/server/src/api/controllers/Attachments/AttachmentsController.ts

@@ -1,264 +0,0 @@
-import mime from 'mime-types';
-import { Service, Inject } from 'typedi';
-import { Router, Response, NextFunction, Request } from 'express';
-import { body, param } from 'express-validator';
-import BaseController from '@/api/controllers/BaseController';
-import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
-import { AttachmentUploadPipeline } from '@/services/Attachments/S3UploadPipeline';
-
-@Service()
-export class AttachmentsController extends BaseController {
-  @Inject()
-  private attachmentsApplication: AttachmentsApplication;
-
-  @Inject()
-  private uploadPipelineService: AttachmentUploadPipeline;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      this.uploadPipelineService.validateS3Configured,
-      this.uploadPipelineService.uploadPipeline().single('file'),
-      this.validateUploadedFileExistance,
-      this.uploadAttachment.bind(this)
-    );
-    router.delete(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.deleteAttachment.bind(this)
-    );
-    router.get(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachment.bind(this)
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.linkDocument.bind(this)
-    );
-    router.post(
-      '/:id/unlink',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.unlinkDocument.bind(this)
-    );
-    router.get(
-      '/:id/presigned-url',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachmentPresignedUrl.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Validates the upload file existance.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private validateUploadedFileExistance(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (!req.file) {
-      return res.boom.badRequest(null, {
-        errorType: 'FILE_UPLOAD_FAILED',
-        message: 'Now file uploaded.',
-      });
-    }
-    next();
-  }
-
-  /**
-   * Uploads the attachments to S3 and store the file metadata to DB.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private async uploadAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const file = req.file;
-
-    try {
-      const data = await this.attachmentsApplication.upload(tenantId, file);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has uploaded successfully.',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id } = req.params;
-
-    try {
-      const data = await this.attachmentsApplication.get(tenantId, id);
-
-      const byte = await data.Body.transformToByteArray();
-      const extension = mime.extension(data.ContentType);
-      const buffer = Buffer.from(byte);
-
-      res.set(
-        'Content-Disposition',
-        `filename="${req.params.id}.${extension}"`
-      );
-      res.set('Content-Type', data.ContentType);
-      res.send(buffer);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async deleteAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-
-    try {
-      await this.attachmentsApplication.delete(tenantId, documentId);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been delete successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async linkDocument(
-    req: Request,
-    res: Response,
-    next: Function
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async unlinkDocument(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retreives the presigned url of the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachmentPresignedUrl(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { id: documentKey } = req.params;
-
-    try {
-      const presignedUrl = await this.attachmentsApplication.getPresignedUrl(
-        documentKey
-      );
-      return res.status(200).send({ presignedUrl });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

packages/server/src/api/controllers/AttachmentsController.ts

@@ -0,0 +1,35 @@
+import { Service, Inject } from 'typedi';
+import { Router, Response } from 'express';
+import BaseController from '@/api/controllers/BaseController';
+import { Request } from 'express-validator/src/base';
+import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
+
+@Service()
+export class AttachmentsController extends BaseController {
+  @Inject()
+  private attachmentsApplication: AttachmentsApplication;
+
+  /**
+   * Router constructor.
+   */
+  router() {
+    const router = Router();
+
+    router.delete('/:id', this.deleteAttachment.bind(this));
+    router.post('/', this.uploadAttachment.bind(this));
+
+    return router;
+  }
+
+  private async uploadAttachment(req: Request, res: Response, next: Function) {
+    try {
+      await this.attachmentsApplication.upload();
+
+      return res.status(200).send({});
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  private deleteAttachment(req: Request, res: Response, next: Function) {}
+}

packages/server/src/api/controllers/Expenses/Expenses.ts

@@ -84,7 +84,7 @@ export class ExpensesController extends BaseController {
   /**
    * Expense DTO schema.
    */
-  private get expenseDTOSchema() {
+  get expenseDTOSchema() {
     return [
       check('reference_no')
         .optional({ nullable: true })
@@ -130,9 +130,6 @@ export class ExpensesController extends BaseController {
         .optional({ nullable: true })
         .isInt({ max: DATATYPES_LENGTH.INT_10 })
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -186,9 +183,6 @@ export class ExpensesController extends BaseController {
         .optional({ nullable: true })
         .isInt({ max: DATATYPES_LENGTH.INT_10 })
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -275,7 +269,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async deleteExpense(req: Request, res: Response, next: NextFunction) {
+  async deleteExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
     const { id: expenseId } = req.params;
 
@@ -297,11 +291,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async publishExpense(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async publishExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
     const { id: expenseId } = req.params;
 
@@ -323,11 +313,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async getExpensesList(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async getExpensesList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
       sortOrder: 'desc',
@@ -357,7 +343,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async getExpense(req: Request, res: Response, next: NextFunction) {
+  async getExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const { id: expenseId } = req.params;
 

packages/server/src/api/controllers/Export/ExportController.ts

@@ -5,7 +5,6 @@ import BaseController from '@/api/controllers/BaseController';
 import { ServiceError } from '@/exceptions';
 import { ExportApplication } from '@/services/Export/ExportApplication';
 import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { convertAcceptFormatToFormat } from './_utils';
 
 @Service()
 export class ExportController extends BaseController {
@@ -15,7 +14,7 @@ export class ExportController extends BaseController {
   /**
    * Router constructor method.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -26,6 +25,7 @@ export class ExportController extends BaseController {
       ],
       this.validationResult,
       this.export.bind(this),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -48,14 +48,11 @@ export class ExportController extends BaseController {
         ACCEPT_TYPE.APPLICATION_CSV,
         ACCEPT_TYPE.APPLICATION_PDF,
       ]);
-      const applicationFormat = convertAcceptFormatToFormat(acceptType);
-
       const data = await this.exportResourceApp.export(
         tenantId,
         query.resource,
-        applicationFormat
+        acceptType === ACCEPT_TYPE.APPLICATION_XLSX ? 'xlsx' : 'csv'
       );
-      // Retrieves the csv format.
       if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
         res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
         res.setHeader('Content-Type', 'text/csv');
@@ -72,16 +69,31 @@ export class ExportController extends BaseController {
           'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         );
         return res.send(data);
-        //
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': data.length,
-        });
-        res.send(data);
       }
     } catch (error) {
       next(error);
     }
   }
+
+  /**
+   * Transforms service errors to response.
+   * @param {Error}
+   * @param {Request} req
+   * @param {Response} res
+   * @param {ServiceError} error
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+      return res.status(400).send({
+        errors: [{ type: error.errorType }],
+      });
+    }
+
+    next(error);
+  }
 }

packages/server/src/api/controllers/Export/_utils.ts

@@ -1,13 +0,0 @@
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { ExportFormat } from '@/services/Export/common';
-
-export const convertAcceptFormatToFormat = (accept: string): ExportFormat => {
-  switch (accept) {
-    case ACCEPT_TYPE.APPLICATION_CSV:
-      return ExportFormat.Csv;
-    case ACCEPT_TYPE.APPLICATION_PDF:
-      return ExportFormat.Pdf;
-    case ACCEPT_TYPE.APPLICATION_XLSX:
-      return ExportFormat.Xlsx;
-  }
-};

packages/server/src/api/controllers/Import/ImportController.ts

@@ -16,7 +16,7 @@ export class ImportController extends BaseController {
   /**
    * Router constructor method.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.post(
@@ -240,7 +240,11 @@ export class ImportController extends BaseController {
           errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
         });
       }
+      return res.status(400).send({
+        errors: [{ type: error.errorType }],
+      });
     }
+
     next(error);
   }
 }

packages/server/src/api/controllers/ManualJournals.ts

@@ -77,14 +77,14 @@ export default class ManualJournalsController extends BaseController {
   /**
    * Specific manual journal id param validation schema.
    */
-  private get manualJournalParamSchema() {
+  get manualJournalParamSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Manual journal DTO schema.
    */
-  private get manualJournalValidationSchema() {
+  get manualJournalValidationSchema() {
     return [
       check('date').exists().isISO8601(),
       check('currency_code').optional(),
@@ -148,16 +148,13 @@ export default class ManualJournalsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
   /**
    * Manual journals list validation schema.
    */
-  private get manualJournalsListSchema() {
+  get manualJournalsListSchema() {
     return [
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
@@ -323,7 +320,7 @@ export default class ManualJournalsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private getManualJournalsList = async (
+  getManualJournalsList = async (
     req: Request,
     res: Response,
     next: NextFunction

packages/server/src/api/controllers/OrganizationDashboard.ts

@@ -33,17 +33,17 @@ export default class OrganizationDashboardController extends BaseController {
   }
 
   /**
-   * Detarmines whether the current authed organization to able to change its currency/.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
+   *
+   * @param req
+   * @param res
+   * @param next
+   * @returns
    */
   private async baseCurrencyMutateAbility(
     req: Request,
     res: Response,
     next: Function
-  ): Promise<Response|void> {
+  ) {
     const { tenantId } = req;
 
     try {

packages/server/src/api/controllers/Projects/Projects.ts

@@ -29,7 +29,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.createProject.bind(this))
+      asyncMiddleware(this.createProject.bind(this)),
+      this.catchServiceErrors
     );
     router.post(
       '/:id',
@@ -42,7 +43,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.patch(
       '/:projectId/status',
@@ -54,14 +56,16 @@ export class ProjectsController extends BaseController {
           .isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:id',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.getProject.bind(this))
+      asyncMiddleware(this.getProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:projectId/billable/entries',
@@ -72,21 +76,24 @@ export class ProjectsController extends BaseController {
         query('to_date').optional().isISO8601(),
       ],
       this.validationResult,
-      asyncMiddleware(this.projectBillableEntries.bind(this))
+      asyncMiddleware(this.projectBillableEntries.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [],
       this.validationResult,
-      asyncMiddleware(this.getProjects.bind(this))
+      asyncMiddleware(this.getProjects.bind(this)),
+      this.catchServiceErrors
     );
     router.delete(
       '/:id',
       CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.deleteProject.bind(this))
+      asyncMiddleware(this.deleteProject.bind(this)),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -245,4 +252,22 @@ export class ProjectsController extends BaseController {
       next(error);
     }
   };
+
+  /**
+   * Transforms service errors to response.
+   * @param {Error}
+   * @param {Request} req
+   * @param {Response} res
+   * @param {ServiceError} error
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+    }
+    next(error);
+  }
 }

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -118,6 +118,7 @@ export default class BillsController extends BaseController {
       check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
 
       check('entries').isArray({ min: 1 }),
+
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
@@ -147,9 +148,6 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -192,9 +190,6 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isBoolean()
         .toBoolean(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/BillsPayments.ts

@@ -122,9 +122,6 @@ export default class BillsPayments extends BaseController {
       check('entries.*.index').optional().isNumeric().toInt(),
       check('entries.*.bill_id').exists().isNumeric().toInt(),
       check('entries.*.payment_amount').exists().isNumeric().toFloat(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Purchases/VendorCredit.ts

@@ -186,9 +186,6 @@ export default class VendorCreditController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -231,9 +228,6 @@ export default class VendorCreditController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/CreditNotes.ts

@@ -236,9 +236,6 @@ export default class PaymentReceivesController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/PaymentReceives.ts

@@ -164,9 +164,6 @@ export default class PaymentReceivesController extends BaseController {
       check('entries.*.index').optional().isNumeric().toInt(),
       check('entries.*.invoice_id').exists().isNumeric().toInt(),
       check('entries.*.payment_amount').exists().isNumeric().toFloat(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/SalesEstimates.ts

@@ -184,9 +184,6 @@ export default class SalesEstimatesController extends BaseController {
       check('note').optional().trim().escape(),
       check('terms_conditions').optional().trim().escape(),
       check('send_to_email').optional().trim().escape(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Sales/SalesInvoices.ts

@@ -36,8 +36,6 @@ export default class SaleInvoicesController extends BaseController {
       [
         ...this.saleInvoiceValidationSchema,
         check('from_estimate_id').optional().isNumeric().toInt(),
-        check('attachments').isArray().optional(),
-        check('attachments.*.key').exists().isString(),
       ],
       this.validationResult,
       asyncMiddleware(this.newSaleInvoice.bind(this)),
@@ -100,8 +98,6 @@ export default class SaleInvoicesController extends BaseController {
       [
         ...this.saleInvoiceValidationSchema,
         ...this.specificSaleInvoiceValidation,
-        check('attachments').isArray().optional(),
-        check('attachments.*.key').exists().isString(),
       ],
       this.validationResult,
       asyncMiddleware(this.editSaleInvoice.bind(this)),

packages/server/src/api/controllers/Sales/SalesReceipts.ts

@@ -158,8 +158,6 @@ export default class SalesReceiptsController extends BaseController {
         .toInt(),
       check('receipt_message').optional().trim().escape(),
       check('statement').optional().trim().escape(),
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 

packages/server/src/api/controllers/Users.ts

@@ -155,7 +155,6 @@ export default class UsersController extends BaseController {
 
     try {
       const user = await this.usersService.getUser(tenantId, userId);
-
       return res.status(200).send({ user });
     } catch (error) {
       next(error);
@@ -230,7 +229,7 @@ export default class UsersController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private catchServiceErrors(
+  catchServiceErrors(
     error: Error,
     req: Request,
     res: Response,

packages/server/src/api/controllers/Warehouses/index.ts

@@ -17,7 +17,7 @@ export class WarehousesController extends BaseController {
    *
    * @returns
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.post(

packages/server/src/api/controllers/Webhooks/Webhooks.ts

@@ -1,6 +1,7 @@
-import { NextFunction, Router, Request, Response } from 'express';
-import { Inject, Service } from 'typedi';
+import { Router } from 'express';
 import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
+import { Request, Response } from 'express';
+import { Inject, Service } from 'typedi';
 import BaseController from '../BaseController';
 import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
 import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
@@ -33,21 +34,14 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async lemonWebhooks(req: Request, res: Response) {
     const data = req.body;
     const signature = req.headers['x-signature'] ?? '';
     const rawBody = req.rawBody;
 
-    try {
-      await this.lemonWebhooksService.handlePostWebhook(
-        rawBody,
-        data,
-        signature
-      );
-      return res.status(200).send();
-    } catch (error) {
-      next(error);
-    }
+    await this.lemonWebhooksService.handlePostWebhook(rawBody, data, signature);
+
+    return res.status(200).send();
   }
 
   /**
@@ -56,25 +50,20 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async plaidWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async plaidWebhooks(req: Request, res: Response) {
     const { tenantId } = req;
+    const {
+      webhook_type: webhookType,
+      webhook_code: webhookCode,
+      item_id: plaidItemId,
+    } = req.body;
 
-    try {
-      const {
-        webhook_type: webhookType,
-        webhook_code: webhookCode,
-        item_id: plaidItemId,
-      } = req.body;
-
-      await this.plaidApp.webhooks(
-        tenantId,
-        plaidItemId,
-        webhookType,
-        webhookCode
-      );
-      return res.status(200).send({ code: 200, message: 'ok' });
-    } catch (error) {
-      next(error);
-    }
+    await this.plaidApp.webhooks(
+      tenantId,
+      plaidItemId,
+      webhookType,
+      webhookCode
+    );
+    return res.status(200).send({ code: 200, message: 'ok' });
   }
 }

packages/server/src/api/exceptions/GlobalErrorException.ts

@@ -1,20 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-
-/**
- * Global error handler.
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function GlobalErrorException(
-  err: Error,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  console.error(err.stack);
-
-  res.status(500);
-  res.boom.badImplementation('', { stack: err.stack });
-}

packages/server/src/api/exceptions/ServiceErrorException.ts

@@ -1,25 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-import { ServiceError } from '@/exceptions';
-
-/**
- * Handles service error exception.
- * @param {Error | ServiceError} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ServiceErrorException(
-  err: Error | ServiceError,
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  if (err instanceof ServiceError) {
-    res.boom.badRequest('', {
-      errors: [{ type: err.errorType, message: err.message }],
-      type: 'ServiceError',
-    });
-  } else {
-    next(err);
-  }
-}

packages/server/src/api/index.ts

@@ -62,7 +62,6 @@ import { ImportController } from './controllers/Import/ImportController';
 import { BankingController } from './controllers/Banking/BankingController';
 import { Webhooks } from './controllers/Webhooks/Webhooks';
 import { ExportController } from './controllers/Export/ExportController';
-import { AttachmentsController } from './controllers/Attachments/AttachmentsController';
 
 export default () => {
   const app = Router();
@@ -143,8 +142,7 @@ export default () => {
   dashboard.use('/projects', Container.get(ProjectsController).router());
   dashboard.use('/tax-rates', Container.get(TaxRatesController).router());
   dashboard.use('/import', Container.get(ImportController).router());
-  dashboard.use('/export', Container.get(ExportController).router());
-  dashboard.use('/attachments', Container.get(AttachmentsController).router());
+  dashboard.use('/export', Container.get(ExportController).router())
 
   dashboard.use('/', Container.get(ProjectTasksController).router());
   dashboard.use('/', Container.get(ProjectTimesController).router());

packages/server/src/api/middleware/ObjectionErrorHandlerMiddleware.ts

@@ -10,14 +10,8 @@ import {
   DataError,
 } from 'objection';
 
-/**
- * Handles the Objection error exception.
- * @param {Error} err
- * @param {Request} req
- * @param {Response} res
- * @param {NextFunction} next
- */
-export function ObjectionErrorException(
+// In this example `res` is an express response object.
+export default function ObjectionErrorHandlerMiddleware(
   err: Error,
   req: Request,
   res: Response,
@@ -114,7 +108,6 @@ export function ObjectionErrorException(
       type: 'UnknownDatabaseError',
       data: {},
     });
-  } else {
-    next(err);
   }
+  next(err);
 }

packages/server/src/commands/bigcapital.ts

@@ -71,10 +71,6 @@ function getAllSystemTenants(knex) {
   return knex('tenants');
 }
 
-function getAllInitializedSystemTenants(knex) {
-  return knex('tenants').whereNotNull('initializedAt');
-}
-
 // module.exports = {
 //   log,
 //   success,
@@ -187,7 +183,7 @@ commander
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = await getAllInitializedSystemTenants(sysKnex);
+      const tenants = await getAllSystemTenants(sysKnex);
       const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
 
       if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
@@ -224,6 +220,7 @@ commander
         const oper = migrateTenant(cmd.tenant_id);
         migrateOpers.push(oper);
       }
+
       Promise.all(migrateOpers).then(() => {
         success('All tenants are migrated.');
       });
@@ -283,3 +280,4 @@ commander
       exit(error);
     }
   });
+

packages/server/src/config/index.ts

@@ -157,10 +157,7 @@ module.exports = {
    * Sign-up email confirmation
    */
   signupConfirmation: {
-    enabled: parseBoolean<boolean>(
-      process.env.SIGNUP_EMAIL_CONFIRMATION,
-      false
-    ),
+    enabled: parseBoolean<boolean>(process.env.SIGNUP_EMAIL_CONFIRMATION, false),
   },
 
   /**
@@ -204,7 +201,10 @@ module.exports = {
   plaid: {
     env: process.env.PLAID_ENV || 'sandbox',
     clientId: process.env.PLAID_CLIENT_ID,
-    secret: process.env.PLAID_SECRET,
+    secretDevelopment: process.env.PLAID_SECRET_DEVELOPMENT,
+    secretSandbox: process.env.PLAID_SECRET_SANDBOX,
+    redirectSandBox: process.env.PLAID_SANDBOX_REDIRECT_URI,
+    redirectDevelopment: process.env.PLAID_DEVELOPMENT_REDIRECT_URI,
     linkWebhook: process.env.PLAID_LINK_WEBHOOK,
   },
 
@@ -215,7 +215,6 @@ module.exports = {
     key: process.env.LEMONSQUEEZY_API_KEY,
     storeId: process.env.LEMONSQUEEZY_STORE_ID,
     webhookSecret: process.env.LEMONSQUEEZY_WEBHOOK_SECRET,
-    redirectTo: `${process.env.BASE_URL}/setup`,
   },
 
   /**
@@ -226,15 +225,4 @@ module.exports = {
     defaultTo(process.env.HOSTED_ON_BIGCAPITAL_CLOUD, false),
     false
   ),
-
-  /**
-   * S3 for documents.
-   */
-  s3: {
-    region: process.env.S3_REGION,
-    accessKeyId: process.env.S3_ACCESS_KEY_ID,
-    secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
-    endpoint: process.env.S3_ENDPOINT,
-    bucket: process.env.S3_BUCKET || 'bigcapital-documents',
-  },
 };

packages/server/src/database/migrations/20231108170207_create_storage_table.js

@@ -11,4 +11,4 @@ exports.up = function (knex) {
 
 exports.down = function (knex) {
   return knex.schema.dropTableIfExists('storage');
-};
+};

packages/server/src/database/migrations/20240604153938_drop_storage_table.js

@@ -1,5 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.dropTableIfExists('storage');
-};
-
-exports.down = function (knex) {};

packages/server/src/database/migrations/20240604153951_create_documents_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('documents', (table) => {
-    table.increments('id').primary();
-    table.string('key').notNullable();
-    table.string('mime_type').notNullable();
-    table.integer('size').unsigned();
-    table.string('origin_name');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('documents');
-};

packages/server/src/database/migrations/20240604154005_create_documents_links_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('document_links', (table) => {
-    table.increments('id').primary();
-    table.string('model_ref').notNullable();
-    table.string('model_id').notNullable();
-    table.integer('document_id').unsigned();
-    table.datetime('expires_at').nullable();
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('document_links');
-};

packages/server/src/interfaces/Account.ts

@@ -164,7 +164,3 @@ export enum TaxRateAction {
   DELETE = 'Delete',
   VIEW = 'View',
 }
-
-export interface CreateAccountParams {
-  ignoreUniqueName: boolean;
-}

packages/server/src/interfaces/Attachments.ts

@@ -1,3 +0,0 @@
-export interface AttachmentLinkDTO {
-  key: string;
-}

packages/server/src/interfaces/Bill.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IDynamicListFilterDTO } from './DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IBillLandedCost } from './LandedCost';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IBillDTO {
   vendorId: number;
@@ -21,7 +20,6 @@ export interface IBillDTO {
   warehouseId?: number;
   projectId?: number;
   isInclusiveTax?: boolean;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IBillEditDTO {
@@ -40,7 +38,6 @@ export interface IBillEditDTO {
   branchId?: number;
   warehouseId?: number;
   projectId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IBill {
@@ -108,7 +105,6 @@ export interface IBillsService {
 export interface IBillCreatedPayload {
   tenantId: number;
   bill: IBill;
-  billDTO: IBillDTO;
   billId: number;
   trx: Knex.Transaction;
 }
@@ -130,7 +126,6 @@ export interface IBillEditedPayload {
   billId: number;
   oldBill: IBill;
   bill: IBill;
-  billDTO: IBillDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/BillPayment.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import { IBill } from './Bill';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IBillPaymentEntry {
   id?: number;
@@ -46,7 +45,6 @@ export interface IBillPaymentDTO {
   reference: string;
   entries: IBillPaymentEntryDTO[];
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IBillReceivePageEntry {
@@ -68,7 +66,6 @@ export interface IBillPaymentsService {
 export interface IBillPaymentEventCreatedPayload {
   tenantId: number;
   billPayment: IBillPayment;
-  billPaymentDTO: IBillPaymentDTO;
   billPaymentId: number;
   trx: Knex.Transaction;
 }
@@ -90,7 +87,6 @@ export interface IBillPaymentEventEditedPayload {
   billPaymentId: number;
   billPayment: IBillPayment;
   oldBillPayment: IBillPayment;
-  billPaymentDTO: IBillPaymentDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/CreditNote.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 import { IDynamicListFilter, IItemEntry, IVendorCredit } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ICreditNoteEntryNewDTO {
   index: number;
@@ -22,7 +21,6 @@ export interface ICreditNoteNewDTO {
   entries: ICreditNoteEntryNewDTO[];
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[]
 }
 
 export interface ICreditNoteEditDTO {
@@ -35,7 +33,6 @@ export interface ICreditNoteEditDTO {
   entries: ICreditNoteEntryNewDTO[];
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[]
 }
 
 export interface ICreditNoteEntry extends IItemEntry {}

packages/server/src/interfaces/Expenses.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { ISystemUser } from './User';
 import { IFilterRole } from './DynamicFilter';
 import { IAccount } from './Account';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IPaginationMeta {
   total: number;
@@ -82,7 +81,6 @@ export interface IExpenseCommonDTO {
   categories: IExpenseCategoryDTO[];
 
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IExpenseCreateDTO extends IExpenseCommonDTO {}
@@ -154,7 +152,6 @@ export interface IExpenseCreatedPayload {
   expenseId: number;
   authorizedUser: ISystemUser;
   expense: IExpense;
-  expenseDTO: IExpenseCreateDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/ManualJournal.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IDynamicListFilterDTO } from './DynamicFilter';
 import { ISystemUser } from './User';
 import { IAccount } from './Account';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IManualJournal {
   id?: number;
@@ -57,7 +56,6 @@ export interface IManualJournalDTO {
   publish?: boolean;
   branchId?: number;
   entries: IManualJournalEntryDTO[];
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IManualJournalsFilter extends IDynamicListFilterDTO {
@@ -144,7 +142,6 @@ export interface IManualJournalEventEditedPayload {
   tenantId: number;
   manualJournal: IManualJournal;
   oldManualJournal: IManualJournal;
-  manualJournalDTO: IManualJournalDTO;
   trx: Knex.Transaction;
 }
 export interface IManualJournalEditingPayload {
@@ -164,7 +161,6 @@ export interface IManualJournalEventCreatedPayload {
   tenantId: number;
   manualJournal: IManualJournal;
   manualJournalId: number;
-  manualJournalDTO: IManualJournalDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/Model.ts

@@ -122,10 +122,6 @@ export type IModelMetaCollectionField = IModelMetaCollectionFieldCommon &
 export type IModelMetaRelationField = IModelMetaRelationFieldCommon &
   IModelMetaRelationEnumerationField;
 
-interface IModelPrintMeta{
-  pageTitle: string;
-}
-
 export interface IModelMeta {
   defaultFilterField: string;
   defaultSort: IModelMetaDefaultSort;
@@ -138,8 +134,6 @@ export interface IModelMeta {
   importAggregateOn?: string;
   importAggregateBy?: string;
 
-  print?: IModelPrintMeta;
-
   fields: { [key: string]: IModelMetaField };
   columns: { [key: string]: IModelMetaColumn };
 }

packages/server/src/interfaces/PaymentReceive.ts

@@ -6,7 +6,6 @@ import {
 } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
 import { ISaleInvoice } from './SaleInvoice';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface IPaymentReceive {
   id?: number;
@@ -38,7 +37,6 @@ export interface IPaymentReceiveCreateDTO {
   entries: IPaymentReceiveEntryDTO[];
 
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IPaymentReceiveEditDTO {
@@ -52,7 +50,6 @@ export interface IPaymentReceiveEditDTO {
   statement: string;
   entries: IPaymentReceiveEntryDTO[];
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IPaymentReceiveEntry {
@@ -117,7 +114,6 @@ export interface IPaymentReceiveCreatedPayload {
   paymentReceive: IPaymentReceive;
   paymentReceiveId: number;
   authorizedUser: ISystemUser;
-  paymentReceiveDTO: IPaymentReceiveCreateDTO;
   trx: Knex.Transaction;
 }
 
@@ -126,7 +122,6 @@ export interface IPaymentReceiveEditedPayload {
   paymentReceiveId: number;
   paymentReceive: IPaymentReceive;
   oldPaymentReceive: IPaymentReceive;
-  paymentReceiveDTO: IPaymentReceiveEditDTO;
   authorizedUser: ISystemUser;
   trx: Knex.Transaction;
 }

packages/server/src/interfaces/SaleEstimate.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IDynamicListFilterDTO } from '@/interfaces/DynamicFilter';
 import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ISaleEstimate {
   id?: number;
@@ -39,7 +38,6 @@ export interface ISaleEstimateDTO {
 
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
@@ -72,7 +70,6 @@ export interface ISaleEstimateEditedPayload {
   estimateId: number;
   saleEstimate: ISaleEstimate;
   oldSaleEstimate: ISaleEstimate;
-  estimateDTO: ISaleEstimateDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/SaleInvoice.ts

@@ -3,7 +3,6 @@ import { ISystemUser, IAccount, ITaxTransaction } from '@/interfaces';
 import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
 import { IDynamicListFilter } from '@/interfaces/DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ISaleInvoice {
   id: number;
@@ -65,8 +64,6 @@ export interface ISaleInvoiceDTO {
   branchId?: number | null;
 
   isInclusiveTax?: boolean;
-
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface ISaleInvoiceCreateDTO extends ISaleInvoiceDTO {

packages/server/src/interfaces/SaleReceipt.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 import { IItemEntry } from './ItemEntry';
 import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
-import { AttachmentLinkDTO } from './Attachments';
 
 export interface ISaleReceipt {
   id?: number;
@@ -44,7 +43,6 @@ export interface ISaleReceiptDTO {
   closed: boolean;
   entries: any[];
   branchId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface ISalesReceiptsService {
@@ -87,7 +85,6 @@ export interface ISaleReceiptCreatedPayload {
   tenantId: number;
   saleReceipt: ISaleReceipt;
   saleReceiptId: number;
-  saleReceiptDTO: ISaleReceiptDTO;
   trx: Knex.Transaction;
 }
 
@@ -96,7 +93,6 @@ export interface ISaleReceiptEditedPayload {
   oldSaleReceipt: number;
   saleReceipt: ISaleReceipt;
   saleReceiptId: number;
-  saleReceiptDTO: ISaleReceiptDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/interfaces/User.ts

@@ -11,9 +11,6 @@ export interface ISystemUser extends Model {
   password: string;
   email: string;
 
-  verifyToken: string;
-  verified: boolean;
-
   roleId: number;
   tenantId: number;
 

packages/server/src/interfaces/VendorCredit.ts

@@ -1,6 +1,5 @@
 import { IDynamicListFilter, IItemEntry, IItemEntryDTO } from '@/interfaces';
 import { Knex } from 'knex';
-import { AttachmentLinkDTO } from './Attachments';
 
 export enum VendorCreditAction {
   Create = 'Create',
@@ -62,7 +61,6 @@ export interface IVendorCreditDTO {
 
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[];
 }
 
 export interface IVendorCreditCreateDTO extends IVendorCreditDTO {}
@@ -120,7 +118,6 @@ export interface IVendorCreditEditedPayload {
   oldVendorCredit: IVendorCredit;
   vendorCredit: IVendorCredit;
   vendorCreditId: number;
-  vendorCreditDTO: IVendorCreditEditDTO;
   trx: Knex.Transaction;
 }
 

packages/server/src/lib/Plaid/Plaid.ts

@@ -70,7 +70,10 @@ export class PlaidClientWrapper {
       baseOptions: {
         headers: {
           'PLAID-CLIENT-ID': config.plaid.clientId,
-          'PLAID-SECRET': config.plaid.secret,
+          'PLAID-SECRET':
+            config.plaid.env === 'development'
+              ? config.plaid.secretDevelopment
+              : config.plaid.secretSandbox,
           'Plaid-Version': '2020-09-14',
         },
       },

packages/server/src/lib/S3/S3.ts

@@ -1,11 +0,0 @@
-import { S3Client } from '@aws-sdk/client-s3';
-import config from '@/config';
-
-export const s3 = new S3Client({
-  region: config.s3.region,
-  credentials: {
-    accessKeyId: config.s3.accessKeyId,
-    secretAccessKey: config.s3.secretAccessKey,
-  },
-  endpoint: config.s3.endpoint,
-});

packages/server/src/loaders/eventEmitter.ts

@@ -92,16 +92,7 @@ import { DeleteCashflowTransactionOnUncategorize } from '@/services/Cashflow/sub
 import { PreventDeleteTransactionOnDelete } from '@/services/Cashflow/subscribers/PreventDeleteTransactionsOnDelete';
 import { SubscribeFreeOnSignupCommunity } from '@/services/Subscription/events/SubscribeFreeOnSignupCommunity';
 import { SendVerfiyMailOnSignUp } from '@/services/Authentication/events/SendVerfiyMailOnSignUp';
-import { AttachmentsOnSaleInvoiceCreated } from '@/services/Attachments/events/AttachmentsOnSaleInvoice';
-import { AttachmentsOnSaleReceipt } from '@/services/Attachments/events/AttachmentsOnSaleReceipts';
-import { AttachmentsOnManualJournals } from '@/services/Attachments/events/AttachmentsOnManualJournals';
-import { AttachmentsOnExpenses } from '@/services/Attachments/events/AttachmentsOnExpenses';
-import { AttachmentsOnBills } from '@/services/Attachments/events/AttachmentsOnBills';
-import { AttachmentsOnPaymentsReceived } from '@/services/Attachments/events/AttachmentsOnPaymentsReceived';
-import { AttachmentsOnVendorCredits } from '@/services/Attachments/events/AttachmentsOnVendorCredits';
-import { AttachmentsOnCreditNote } from '@/services/Attachments/events/AttachmentsOnCreditNote';
-import { AttachmentsOnBillPayments } from '@/services/Attachments/events/AttachmentsOnPaymentsMade';
-import { AttachmentsOnSaleEstimates } from '@/services/Attachments/events/AttachmentsOnSaleEstimates';
+
 
 export default () => {
   return new EventPublisher();
@@ -233,18 +224,6 @@ export const susbcribers = () => {
     PreventDeleteTransactionOnDelete,
 
     SubscribeFreeOnSignupCommunity,
-    SendVerfiyMailOnSignUp,
-
-    // Attachments
-    AttachmentsOnSaleInvoiceCreated,
-    AttachmentsOnSaleEstimates,
-    AttachmentsOnSaleReceipt,
-    AttachmentsOnPaymentsReceived,
-    AttachmentsOnCreditNote,
-    AttachmentsOnVendorCredits,
-    AttachmentsOnBills,
-    AttachmentsOnBillPayments,
-    AttachmentsOnManualJournals,
-    AttachmentsOnExpenses,
+    SendVerfiyMailOnSignUp
   ];
 };

packages/server/src/loaders/express.ts

@@ -17,9 +17,7 @@ import {
 } from '@/api/middleware/JSONResponseTransformer';
 import config from '@/config';
 import path from 'path';
-import { ObjectionErrorException } from '@/api/exceptions/ObjectionErrorException';
-import { ServiceErrorException } from '@/api/exceptions/ServiceErrorException';
-import { GlobalErrorException } from '@/api/exceptions/GlobalErrorException';
+import ObjectionErrorHandlerMiddleware from '@/api/middleware/ObjectionErrorHandlerMiddleware';
 
 export default ({ app }) => {
   // Express configuration.
@@ -32,6 +30,9 @@ export default ({ app }) => {
   // Helmet helps you secure your Express apps by setting various HTTP headers.
   app.use(helmet());
 
+  // Allow to full error stack traces and internal details
+  app.use(errorHandler());
+
   // Boom response objects.
   app.use(boom());
 
@@ -64,10 +65,8 @@ export default ({ app }) => {
   // Agendash application load.
   app.use('/agendash', AgendashController.router());
 
-  // Handles errors.
-  app.use(ObjectionErrorException);
-  app.use(ServiceErrorException);
-  app.use(GlobalErrorException);
+  // Handles objectionjs errors.
+  app.use(ObjectionErrorHandlerMiddleware);
 
   // catch 404 and forward to error handler
   app.use((req: Request, res: Response, next: NextFunction) => {

packages/server/src/loaders/tenantModels.ts

@@ -60,10 +60,9 @@ import Time from 'models/Time';
 import Task from 'models/Task';
 import TaxRate from 'models/TaxRate';
 import TaxRateTransaction from 'models/TaxRateTransaction';
+import Attachment from 'models/Attachment';
 import PlaidItem from 'models/PlaidItem';
 import UncategorizedCashflowTransaction from 'models/UncategorizedCashflowTransaction';
-import Document from '@/models/Document';
-import DocumentLink from '@/models/DocumentLink';
 
 export default (knex) => {
   const models = {
@@ -127,10 +126,9 @@ export default (knex) => {
     Task,
     TaxRate,
     TaxRateTransaction,
-    Document,
-    DocumentLink,
+    Attachment,
     PlaidItem,
-    UncategorizedCashflowTransaction,
+    UncategorizedCashflowTransaction
   };
   return mapValues(models, (model) => model.bindKnex(knex));
 };

packages/server/src/models/Account.Settings.ts

@@ -8,9 +8,6 @@ export default {
   },
   importable: true,
   exportable: true,
-  print: {
-    pageTitle: 'Chart of Accounts',
-  },
   fields: {
     name: {
       name: 'account.field.name',
@@ -124,7 +121,7 @@ export default {
     },
     balance: {
       name: 'account.field.balance',
-      accessor: 'formattedAmount',
+      accessor: 'amount',
     },
     description: {
       name: 'account.field.description',
@@ -136,7 +133,6 @@ export default {
     },
     createdAt: {
       name: 'account.field.created_at',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/Attachment.ts

@@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel';
 import ModelSetting from './ModelSetting';
 import ModelSearchable from './ModelSearchable';
 
-export default class Document extends mixin(TenantModel, [
+export default class Attachment extends mixin(TenantModel, [
   ModelSetting,
   ModelSearchable,
 ]) {
@@ -11,7 +11,7 @@ export default class Document extends mixin(TenantModel, [
    * Table name
    */
   static get tableName() {
-    return 'documents';
+    return 'storage';
   }
 
   /**

packages/server/src/models/Bill.Settings.ts

@@ -10,9 +10,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'billNumber',
-  print: {
-    pageTitle: 'Bills',
-  },
   fields: {
     vendor: {
       name: 'bill.field.vendor',
@@ -86,10 +83,6 @@ export default {
     },
   },
   columns: {
-    billDate: {
-      name: 'Date',
-      accessor: 'formattedBillDate',
-    },
     billNumber: {
       name: 'Bill No.',
       type: 'text',
@@ -98,10 +91,13 @@ export default {
       name: 'Reference No.',
       type: 'text',
     },
+    billDate: {
+      name: 'Date',
+      type: 'date',
+    },
     dueDate: {
       name: 'Due Date',
       type: 'date',
-      accessor: 'formattedDueDate',
     },
     vendorId: {
       name: 'Vendor',
@@ -115,12 +111,10 @@ export default {
     exchangeRate: {
       name: 'Exchange Rate',
       type: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'Currency Code',
       type: 'text',
-      printable: false,
     },
     dueAmount: {
       name: 'Due Amount',
@@ -133,12 +127,10 @@ export default {
     note: {
       name: 'Note',
       type: 'text',
-      printable: false,
     },
     open: {
       name: 'Open',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',

packages/server/src/models/Bill.ts

@@ -403,7 +403,6 @@ export default class Bill extends mixin(TenantModel, [
     const BillLandedCost = require('models/BillLandedCost');
     const Branch = require('models/Branch');
     const TaxRateTransaction = require('models/TaxRateTransaction');
-    const Document = require('models/Document');
 
     return {
       vendor: {
@@ -466,25 +465,6 @@ export default class Bill extends mixin(TenantModel, [
           builder.where('reference_type', 'Bill');
         },
       },
-
-      /**
-       * Bill may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'bills.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'Bill');
-        },
-      },
     };
   }
 

packages/server/src/models/BillPayment.Settings.ts

@@ -77,7 +77,6 @@ export default {
     paymentDate: {
       name: 'bill_payment.field.payment_date',
       type: 'date',
-      accessor: 'formattedPaymentDate'
     },
     paymentNumber: {
       name: 'bill_payment.field.payment_number',
@@ -95,17 +94,14 @@ export default {
     currencyCode: {
       name: 'Currency Code',
       type: 'text',
-      printable: false,
     },
     exchangeRate: {
       name: 'bill_payment.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     statement: {
       name: 'bill_payment.field.note',
       type: 'text',
-      printable: false,
     },
     reference: {
       name: 'bill_payment.field.reference',

packages/server/src/models/BillPayment.ts

@@ -56,7 +56,6 @@ export default class BillPayment extends mixin(TenantModel, [
     const Vendor = require('models/Vendor');
     const Account = require('models/Account');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       entries: {
@@ -115,25 +114,6 @@ export default class BillPayment extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Bill payment may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'bills_payments.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'BillPayment');
-        },
-      },
     };
   }
 

packages/server/src/models/CreditNote.Meta.ts

@@ -20,10 +20,6 @@ export default {
   importAggregateOn: 'entries',
   importAggregateBy: 'creditNoteNumber',
 
-  print: {
-    pageTitle: 'Credit Notes',
-  },
-
   fields: {
     customer: {
       name: 'credit_note.field.customer',
@@ -92,34 +88,36 @@ export default {
   columns: {
     customer: {
       name: 'Customer',
+      type: 'relation',
       accessor: 'customer.displayName',
     },
     exchangeRate: {
       name: 'Exchange Rate',
-      printable: false,
+      type: 'number',
     },
     creditNoteDate: {
       name: 'Credit Note Date',
-      accessor: 'formattedCreditNoteDate'
+      type: 'date',
     },
     referenceNo: {
       name: 'Reference No.',
+      type: 'text',
     },
     note: {
       name: 'Note',
+      type: 'text',
     },
     termsConditions: {
       name: 'Terms & Conditions',
-      printable: false,
+      type: 'text',
     },
     creditNoteNumber: {
       name: 'Credit Note Number',
-      printable: false,
+      type: 'text',
     },
     open: {
       name: 'Open',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',

packages/server/src/models/CreditNote.ts

@@ -174,7 +174,6 @@ export default class CreditNote extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Customer = require('models/Customer');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       /**
@@ -234,25 +233,6 @@ export default class CreditNote extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Credit note may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'credit_notes.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'CreditNote');
-        },
-      },
     };
   }
 

packages/server/src/models/Customer.Settings.ts

@@ -6,9 +6,6 @@ export default {
     sortOrder: 'DESC',
     sortField: 'created_at',
   },
-  print: {
-    pageTitle: 'Customers',
-  },
   fields: {
     first_name: {
       name: 'vendor.field.first_name',
@@ -130,121 +127,100 @@ export default {
     balance: {
       name: 'vendor.field.balance',
       type: 'number',
-      accessor: 'formattedBalance',
     },
     openingBalance: {
       name: 'vendor.field.opening_balance',
       type: 'number',
-      printable: false
     },
     openingBalanceAt: {
       name: 'vendor.field.opening_balance_at',
       type: 'date',
-      printable: false
     },
     currencyCode: {
       name: 'vendor.field.currency',
       type: 'text',
-      printable: false
     },
     status: {
       name: 'vendor.field.status',
-      printable: false
     },
     note: {
       name: 'vendor.field.note',
-      printable: false
     },
     // Billing Address
     billingAddress1: {
       name: 'Billing Address 1',
       column: 'billing_address1',
       type: 'text',
-      printable: false
     },
     billingAddress2: {
       name: 'Billing Address 2',
       column: 'billing_address2',
       type: 'text',
-      printable: false
     },
     billingAddressCity: {
       name: 'Billing Address City',
       column: 'billing_address_city',
       type: 'text',
-      printable: false
     },
     billingAddressCountry: {
       name: 'Billing Address Country',
       column: 'billing_address_country',
       type: 'text',
-      printable: false
     },
     billingAddressPostcode: {
       name: 'Billing Address Postcode',
       column: 'billing_address_postcode',
       type: 'text',
-      printable: false
     },
     billingAddressState: {
       name: 'Billing Address State',
       column: 'billing_address_state',
       type: 'text',
-      printable: false
     },
     billingAddressPhone: {
       name: 'Billing Address Phone',
       column: 'billing_address_phone',
       type: 'text',
-      printable: false
     },
     // Shipping Address
     shippingAddress1: {
       name: 'Shipping Address 1',
       column: 'shipping_address1',
       type: 'text',
-      printable: false
     },
     shippingAddress2: {
       name: 'Shipping Address 2',
       column: 'shipping_address2',
       type: 'text',
-      printable: false
     },
     shippingAddressCity: {
       name: 'Shipping Address City',
       column: 'shipping_address_city',
       type: 'text',
-      printable: false
     },
     shippingAddressCountry: {
       name: 'Shipping Address Country',
       column: 'shipping_address_country',
       type: 'text',
-      printable: false
     },
     shippingAddressPostcode: {
       name: 'Shipping Address Postcode',
       column: 'shipping_address_postcode',
       type: 'text',
-      printable: false
     },
     shippingAddressPhone: {
       name: 'Shipping Address Phone',
       column: 'shipping_address_phone',
       type: 'text',
-      printable: false
     },
     shippingAddressState: {
       name: 'Shipping Address State',
       column: 'shipping_address_state',
       type: 'text',
-      printable: false
     },
     createdAt: {
       name: 'vendor.field.created_at',
       type: 'date',
-      printable: false
     },
   },
   fields2: {

packages/server/src/models/DocumentLink.ts

@@ -1,44 +0,0 @@
-import { Model, mixin } from 'objection';
-import TenantModel from 'models/TenantModel';
-import ModelSetting from './ModelSetting';
-import ModelSearchable from './ModelSearchable';
-
-export default class DocumentLink extends mixin(TenantModel, [
-  ModelSetting,
-  ModelSearchable,
-]) {
-  /**
-   * Table name
-   */
-  static get tableName() {
-    return 'document_links';
-  }
-
-  /**
-   * Model timestamps.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const Document = require('models/Document');
-
-    return {
-      /**
-       * Sale invoice associated entries.
-       */
-      document: {
-        relation: Model.HasOneRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'document_links.documentId',
-          to: 'documents.id',
-        },
-      },
-    };
-  }
-}

packages/server/src/models/Expense.Settings.ts

@@ -10,9 +10,6 @@ export default {
   importable: true,
   exportFlattenOn: 'categories',
   exportable: true,
-  print: {
-    pageTitle: 'Expenses',
-  },
   fields: {
     payment_date: {
       name: 'expense.field.payment_date',
@@ -70,7 +67,7 @@ export default {
     paymentReceive: {
       name: 'expense.field.payment_account',
       type: 'text',
-      accessor: 'paymentAccount.name',
+      accessor: 'paymentAccount.name'
     },
     referenceNo: {
       name: 'expense.field.reference_no',
@@ -78,18 +75,15 @@ export default {
     },
     paymentDate: {
       name: 'expense.field.payment_date',
-      accessor: 'formattedDate',
       type: 'date',
     },
     currencyCode: {
       name: 'expense.field.currency_code',
       type: 'text',
-      printable: false,
     },
     exchangeRate: {
       name: 'expense.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     description: {
       name: 'expense.field.description',
@@ -117,7 +111,6 @@ export default {
     publish: {
       name: 'expense.field.publish',
       type: 'boolean',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/Expense.ts

@@ -180,7 +180,7 @@ export default class Expense extends mixin(TenantModel, [
   static get relationMappings() {
     const Account = require('models/Account');
     const ExpenseCategory = require('models/ExpenseCategory');
-    const Document = require('models/Document');
+    const Media = require('models/Media');
     const Branch = require('models/Branch');
 
     return {
@@ -217,21 +217,21 @@ export default class Expense extends mixin(TenantModel, [
       },
 
       /**
-       * Expense transaction may has many attached attachments.
+       * 
        */
-      attachments: {
+      media: {
         relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
+        modelClass: Media.default,
         join: {
           from: 'expenses_transactions.id',
           through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
+            from: 'media_links.model_id',
+            to: 'media_links.media_id',
           },
-          to: 'documents.id',
+          to: 'media.id',
         },
         filter(query) {
-          query.where('model_ref', 'Expense');
+          query.where('model_name', 'Expense');
         },
       },
     };

packages/server/src/models/Item.Settings.ts

@@ -6,9 +6,6 @@ export default {
     sortField: 'name',
     sortOrder: 'DESC',
   },
-  print: {
-    pageTitle: 'Items',
-  },
   fields: {
     type: {
       name: 'item.field.type',
@@ -130,7 +127,6 @@ export default {
       name: 'item.field.type',
       type: 'text',
       exportable: true,
-      accessor: 'typeFormatted',
     },
     name: {
       name: 'item.field.name',
@@ -146,13 +142,11 @@ export default {
       name: 'item.field.sellable',
       type: 'boolean',
       exportable: true,
-      printable: false,
     },
     purchasable: {
       name: 'item.field.purchasable',
       type: 'boolean',
       exportable: true,
-      printable: false,
     },
     sellPrice: {
       name: 'item.field.cost_price',
@@ -169,14 +163,12 @@ export default {
       type: 'text',
       accessor: 'costAccount.name',
       exportable: true,
-      printable: false,
     },
     sellAccount: {
       name: 'item.field.sell_description',
       type: 'text',
       accessor: 'sellAccount.name',
       exportable: true,
-      printable: false,
     },
     inventoryAccount: {
       name: 'item.field.inventory_account',
@@ -188,13 +180,11 @@ export default {
       name: 'Sell description',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     purchaseDescription: {
       name: 'Purchase description',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     quantityOnHand: {
       name: 'item.field.quantity_on_hand',
@@ -216,13 +206,11 @@ export default {
       name: 'item.field.active',
       fieldType: 'boolean',
       exportable: true,
-      printable: false,
     },
     createdAt: {
       name: 'item.field.created_at',
       type: 'date',
       exportable: true,
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/ManualJournal.Settings.ts

@@ -11,11 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'journalNumber',
-
-  print: {
-    pageTitle: 'Manual Journals',
-  },
-
   fields: {
     date: {
       name: 'manual_journal.field.date',
@@ -68,7 +63,6 @@ export default {
     date: {
       name: 'manual_journal.field.date',
       type: 'date',
-      accessor: 'formattedDate',
     },
     journalNumber: {
       name: 'manual_journal.field.journal_number',
@@ -89,12 +83,10 @@ export default {
     currencyCode: {
       name: 'manual_journal.field.currency',
       type: 'text',
-      printable: false,
     },
     exchangeRate: {
       name: 'manual_journal.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     description: {
       name: 'manual_journal.field.description',
@@ -128,17 +120,13 @@ export default {
       publish: {
         name: 'Publish',
         type: 'boolean',
-        printable: false,
       },
       publishedAt: {
         name: 'Published At',
-        printable: false,
       },
     },
     createdAt: {
       name: 'Created At',
-      accessor: 'formattedCreatedAt',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/ManualJournal.ts

@@ -94,9 +94,9 @@ export default class ManualJournal extends mixin(TenantModel, [
    * Relationship mapping.
    */
   static get relationMappings() {
+    const Media = require('models/Media');
     const AccountTransaction = require('models/AccountTransaction');
     const ManualJournalEntry = require('models/ManualJournalEntry');
-    const Document = require('models/Document');
 
     return {
       entries: {
@@ -121,23 +121,19 @@ export default class ManualJournal extends mixin(TenantModel, [
           query.where('referenceType', 'Journal');
         },
       },
-
-      /**
-       * Manual journal may has many attached attachments.
-       */
-      attachments: {
+      media: {
         relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
+        modelClass: Media.default,
         join: {
           from: 'manual_journals.id',
           through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
+            from: 'media_links.model_id',
+            to: 'media_links.media_id',
           },
-          to: 'documents.id',
+          to: 'media.id',
         },
         filter(query) {
-          query.where('model_ref', 'ManualJournal');
+          query.where('model_name', 'ManualJournal');
         },
       },
     };

packages/server/src/models/PaymentReceive.Settings.ts

@@ -67,12 +67,10 @@ export default {
     paymentDate: {
       name: 'payment_receive.field.payment_date',
       type: 'date',
-      accessor: 'formattedPaymentDate',
     },
     amount: {
       name: 'payment_receive.field.amount',
       type: 'number',
-      accessor: 'formattedAmount'
     },
     referenceNo: {
       name: 'payment_receive.field.reference_no',
@@ -90,12 +88,10 @@ export default {
     statement: {
       name: 'payment_receive.field.statement',
       type: 'text',
-      printable: false,
     },
     created_at: {
       name: 'payment_receive.field.created_at',
       type: 'date',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/PaymentReceive.ts

@@ -56,7 +56,6 @@ export default class PaymentReceive extends mixin(TenantModel, [
     const Customer = require('models/Customer');
     const Account = require('models/Account');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       customer: {
@@ -112,25 +111,6 @@ export default class PaymentReceive extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Payment transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'payment_receives.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'PaymentReceive');
-        },
-      },
     };
   }
 

packages/server/src/models/SaleEstimate.Settings.ts

@@ -11,11 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'estimateNumber',
-
-  print: {
-    pageTitle: 'Sale Estimates'
-  },
-
   fields: {
     amount: {
       name: 'estimate.field.amount',
@@ -91,13 +86,11 @@ export default {
     estimateDate: {
       name: 'Estimate Date',
       type: 'date',
-      accessor: 'formattedEstimateDate',
       exportable: true,
     },
     expirationDate: {
       name: 'Expiration Date',
       type: 'date',
-      accessor: 'formattedExpirationDate',
       exportable: true,
     },
     estimateNumber: {
@@ -119,31 +112,26 @@ export default {
       name: 'Exchange Rate',
       type: 'number',
       exportable: true,
-      printable: false,
     },
     currencyCode: {
       name: 'Currency',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     note: {
       name: 'Note',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     termsConditions: {
       name: 'Terms & Conditions',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     delivered: {
       name: 'Delivered',
       type: 'boolean',
       exportable: true,
-      printable: false,
     },
     entries: {
       name: 'Entries',
@@ -165,7 +153,6 @@ export default {
         },
         description: {
           name: 'Item Description',
-          printable: false,
         },
         amount: {
           name: 'Item Amount',

packages/server/src/models/SaleEstimate.ts

@@ -182,7 +182,6 @@ export default class SaleEstimate extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Customer = require('models/Customer');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       customer: {
@@ -220,25 +219,6 @@ export default class SaleEstimate extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Sale estimate transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'sales_estimates.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'SaleEstimate');
-        },
-      },
     };
   }
 

packages/server/src/models/SaleInvoice.Settings.ts

@@ -11,10 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'invoiceNo',
-
-  print: {
-    pageTitle: 'Sale invoices',
-  },
   fields: {
     customer: {
       name: 'invoice.field.customer',
@@ -98,12 +94,10 @@ export default {
     invoiceDate: {
       name: 'invoice.field.invoice_date',
       type: 'date',
-      accessor: 'invoiceDateFormatted',
     },
     dueDate: {
       name: 'invoice.field.due_date',
       type: 'date',
-      accessor: 'dueDateFormatted',
     },
     referenceNo: {
       name: 'invoice.field.reference_no',
@@ -126,12 +120,10 @@ export default {
     exchangeRate: {
       name: 'invoice.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'invoice.field.currency',
       type: 'text',
-      printable: false,
     },
     paidAmount: {
       name: 'Paid Amount',
@@ -144,17 +136,14 @@ export default {
     invoiceMessage: {
       name: 'invoice.field.invoice_message',
       type: 'text',
-      printable: false,
     },
     termsConditions: {
       name: 'invoice.field.terms_conditions',
       type: 'text',
-      printable: false,
     },
     delivered: {
       name: 'invoice.field.delivered',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',
@@ -176,7 +165,6 @@ export default {
         },
         description: {
           name: 'Item Description',
-          printable: false,
         },
         amount: {
           name: 'Item Amount',
@@ -214,22 +202,18 @@ export default {
     exchangeRate: {
       name: 'invoice.field.exchange_rate',
       fieldType: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'invoice.field.currency',
       fieldType: 'text',
-      printable: false,
     },
     invoiceMessage: {
       name: 'invoice.field.invoice_message',
       fieldType: 'text',
-      printable: false,
     },
     termsConditions: {
       name: 'invoice.field.terms_conditions',
       fieldType: 'text',
-      printable: false,
     },
     entries: {
       name: 'invoice.field.entries',
@@ -265,7 +249,6 @@ export default {
     delivered: {
       name: 'invoice.field.delivered',
       fieldType: 'boolean',
-      printable: false,
     },
   },
 };

packages/server/src/models/SaleInvoice.ts

@@ -410,7 +410,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
     const Branch = require('models/Branch');
     const Account = require('models/Account');
     const TaxRateTransaction = require('models/TaxRateTransaction');
-    const Document = require('models/Document');
 
     return {
       /**
@@ -524,25 +523,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
           builder.where('reference_type', 'SaleInvoice');
         },
       },
-
-      /**
-       * Sale invoice transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'sales_invoices.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'SaleInvoice');
-        },
-      },
     };
   }
 

packages/server/src/models/SaleReceipt.Settings.ts

@@ -11,10 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'receiptNumber',
-
-  print: {
-    pageTitle: 'Sale Receipts',
-  },
   fields: {
     amount: {
       name: 'receipt.field.amount',
@@ -85,6 +81,11 @@ export default {
     },
   },
   columns: {
+    amount: {
+      name: 'receipt.field.amount',
+      column: 'amount',
+      type: 'number',
+    },
     depositAccount: {
       name: 'receipt.field.deposit_account',
       type: 'text',
@@ -97,7 +98,6 @@ export default {
     },
     receiptDate: {
       name: 'receipt.field.receipt_date',
-      accessor: 'formattedReceiptDate',
       type: 'date',
     },
     receiptNumber: {
@@ -114,17 +114,10 @@ export default {
       name: 'receipt.field.receipt_message',
       column: 'receipt_message',
       type: 'text',
-      printable: false,
-    },
-    amount: {
-      name: 'receipt.field.amount',
-      accessor: 'formattedAmount',
-      type: 'number',
     },
     statement: {
       name: 'receipt.field.statement',
       type: 'text',
-      printable: false,
     },
     status: {
       name: 'receipt.field.status',
@@ -134,7 +127,6 @@ export default {
         { key: 'closed', label: 'receipt.field.status.closed' },
       ],
       exportable: true,
-      printable: false,
     },
     entries: {
       name: 'Entries',
@@ -156,7 +148,6 @@ export default {
         },
         description: {
           name: 'Item Description',
-          printable: false,
         },
         amount: {
           name: 'Item Amount',
@@ -167,7 +158,6 @@ export default {
     createdAt: {
       name: 'receipt.field.created_at',
       type: 'date',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/SaleReceipt.ts

@@ -108,7 +108,6 @@ export default class SaleReceipt extends mixin(TenantModel, [
     const AccountTransaction = require('models/AccountTransaction');
     const ItemEntry = require('models/ItemEntry');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       customer: {
@@ -168,25 +167,6 @@ export default class SaleReceipt extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Sale receipt transaction may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'sales_receipts.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'SaleReceipt');
-        },
-      },
     };
   }
 

packages/server/src/models/Vendor.Settings.ts

@@ -131,26 +131,21 @@ export default {
     openingBalance: {
       name: 'vendor.field.opening_balance',
       type: 'number',
-      printable: false
     },
     openingBalanceAt: {
       name: 'vendor.field.opening_balance_at',
       type: 'date',
-      printable: false
     },
     currencyCode: {
       name: 'vendor.field.currency',
       type: 'text',
-      printable: false
     },
     status: {
       name: 'vendor.field.status',
-      printable: false
     },
     note: {
       name: 'vendor.field.note',
       type: 'text',
-      printable: false
     },
     // Billing Address
     billingAddress1: {
@@ -158,49 +153,42 @@ export default {
       column: 'billing_address1',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddress2: {
       name: 'Billing Address 2',
       column: 'billing_address2',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressCity: {
       name: 'Billing Address City',
       column: 'billing_address_city',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressCountry: {
       name: 'Billing Address Country',
       column: 'billing_address_country',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressPostcode: {
       name: 'Billing Address Postcode',
       column: 'billing_address_postcode',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressState: {
       name: 'Billing Address State',
       column: 'billing_address_state',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressPhone: {
       name: 'Billing Address Phone',
       column: 'billing_address_phone',
       type: 'text',
       exportable: true,
-      printable: false
     },
     // Shipping Address
     shippingAddress1: {
@@ -208,55 +196,47 @@ export default {
       column: 'shipping_address1',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddress2: {
       name: 'Shipping Address 2',
       column: 'shipping_address2',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressCity: {
       name: 'Shipping Address City',
       column: 'shipping_address_city',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressCountry: {
       name: 'Shipping Address Country',
       column: 'shipping_address_country',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressPostcode: {
       name: 'Shipping Address Postcode',
       column: 'shipping_address_postcode',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressState: {
       name: 'Shipping Address State',
       column: 'shipping_address_state',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressPhone: {
       name: 'Shipping Address Phone',
       column: 'shipping_address_phone',
       type: 'text',
       exportable: true,
-      printable: false
     },
     createdAt: {
       name: 'vendor.field.created_at',
       type: 'date',
       exportable: true,
-      printable: false
     },
   },
   fields2: {

packages/server/src/models/VendorCredit.Meta.ts

@@ -20,9 +20,6 @@ export default {
   importAggregateOn: 'entries',
   importAggregateBy: 'vendorCreditNumber',
 
-  print: {
-    pageTitle: 'Vendor Credits',
-  },
   fields: {
     vendor: {
       name: 'vendor_credit.field.vendor',
@@ -92,7 +89,6 @@ export default {
     exchangeRate: {
       name: 'Echange Rate',
       type: 'text',
-      printable: false,
     },
     vendorCreditNumber: {
       name: 'Vendor Credit No.',
@@ -104,7 +100,7 @@ export default {
     },
     vendorCreditDate: {
       name: 'Vendor Credit Date',
-      accessor: 'formattedVendorCreditDate',
+      type: 'date',
     },
     amount: {
       name: 'Amount',
@@ -113,12 +109,10 @@ export default {
     creditRemaining: {
       name: 'Credits Remaining',
       accessor: 'formattedCreditsRemaining',
-      printable: false,
     },
     refundedAmount: {
       name: 'Refunded Amount',
       accessor: 'refundedAmount',
-      printable: false,
     },
     invoicedAmount: {
       name: 'Invoiced Amount',
@@ -127,12 +121,10 @@ export default {
     note: {
       name: 'Note',
       type: 'text',
-      printable: false,
     },
     open: {
       name: 'Open',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',

packages/server/src/models/VendorCredit.ts

@@ -177,7 +177,6 @@ export default class VendorCredit extends mixin(TenantModel, [
     const Vendor = require('models/Vendor');
     const ItemEntry = require('models/ItemEntry');
     const Branch = require('models/Branch');
-    const Document = require('models/Document');
 
     return {
       vendor: {
@@ -216,25 +215,6 @@ export default class VendorCredit extends mixin(TenantModel, [
           to: 'branches.id',
         },
       },
-
-      /**
-       * Vendor credit may has many attached attachments.
-       */
-      attachments: {
-        relation: Model.ManyToManyRelation,
-        modelClass: Document.default,
-        join: {
-          from: 'vendor_credits.id',
-          through: {
-            from: 'document_links.modelId',
-            to: 'document_links.documentId',
-          },
-          to: 'documents.id',
-        },
-        filter(query) {
-          query.where('model_ref', 'VendorCredit');
-        },
-      },
     };
   }
 

packages/server/src/services/Accounts/CreateAccount.ts

@@ -7,7 +7,6 @@ import {
   IAccountEventCreatedPayload,
   IAccountEventCreatingPayload,
   IAccountCreateDTO,
-  CreateAccountParams,
 } from '@/interfaces';
 import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
@@ -31,22 +30,19 @@ export class CreateAccount {
 
   /**
    * Authorize the account creation.
-   * @param {number} tenantId
-   * @param {IAccountCreateDTO} accountDTO
+   * @param  {number} tenantId
+   * @param  {IAccountCreateDTO} accountDTO
    */
   private authorize = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    baseCurrency: string,
-    params?: CreateAccountParams
+    baseCurrency: string
   ) => {
     // Validate account name uniquiness.
-    if (!params.ignoreUniqueName) {
-      await this.validator.validateAccountNameUniquiness(
-        tenantId,
-        accountDTO.name
-      );
-    }
+    await this.validator.validateAccountNameUniquiness(
+      tenantId,
+      accountDTO.name
+    );
     // Validate the account code uniquiness.
     if (accountDTO.code) {
       await this.validator.isAccountCodeUniqueOrThrowError(
@@ -86,7 +82,7 @@ export class CreateAccount {
 
   /**
    * Transformes the create account DTO to input model.
-   * @param {IAccountCreateDTO} createAccountDTO
+   * @param   {IAccountCreateDTO} createAccountDTO
    */
   private transformDTOToModel = (
     createAccountDTO: IAccountCreateDTO,
@@ -108,8 +104,7 @@ export class CreateAccount {
   public createAccount = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction,
-    params: CreateAccountParams = { ignoreUniqueName: false }
+    trx?: Knex.Transaction
   ): Promise<IAccount> => {
     const { Account } = this.tenancy.models(tenantId);
 
@@ -117,12 +112,8 @@ export class CreateAccount {
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
     // Authorize the account creation.
-    await this.authorize(
-      tenantId,
-      accountDTO,
-      tenantMeta.baseCurrency,
-      params
-    );
+    await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency);
+
     // Transformes the DTO to model.
     const accountInputModel = this.transformDTOToModel(
       accountDTO,
@@ -157,4 +148,3 @@ export class CreateAccount {
     );
   };
 }
-

packages/server/src/services/Attachments/AttachmentTransformer.ts

@@ -1,19 +0,0 @@
-import { Transformer } from '@/lib/Transformer/Transformer';
-
-export class AttachmentTransformer extends Transformer {
-  /**
-   * Exclude attributes.
-   * @returns {string[]}
-   */
-  public excludeAttributes = (): string[] => {
-    return ['id', 'createdAt'];
-  };
-
-  /**
-   * Includeded attributes.
-   * @returns {string[]}
-   */
-  public includeAttributes = (): string[] => {
-    return [];
-  };
-}

packages/server/src/services/Attachments/AttachmentsApplication.ts

@@ -1,105 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { UploadDocument } from './UploadDocument';
-import { DeleteAttachment } from './DeleteAttachment';
-import { GetAttachment } from './GetAttachment';
-import { LinkAttachment } from './LinkAttachment';
-import { UnlinkAttachment } from './UnlinkAttachment';
-import { getAttachmentPresignedUrl } from './GetAttachmentPresignedUrl';
-
-@Service()
-export class AttachmentsApplication {
-  @Inject()
-  private uploadDocumentService: UploadDocument;
-
-  @Inject()
-  private deleteDocumentService: DeleteAttachment;
-
-  @Inject()
-  private getDocumentService: GetAttachment;
-
-  @Inject()
-  private linkDocumentService: LinkAttachment;
-
-  @Inject()
-  private unlinkDocumentService: UnlinkAttachment;
-
-  @Inject()
-  private getPresignedUrlService: getAttachmentPresignedUrl;
-
-  /**
-   * Saves the metadata of uploaded document to S3 on database.
-   * @param {number} tenantId
-   * @param {} file
-   * @returns {Promise<Document>}
-   */
-  public upload(tenantId: number, file: any) {
-    return this.uploadDocumentService.upload(tenantId, file);
-  }
-
-  /**
-   * Deletes the give file attachment file key.
-   * @param {number} tenantId
-   * @param {string} documentKey
-   * @returns {Promise<void>}
-   */
-  public delete(tenantId: number, documentKey: string) {
-    return this.deleteDocumentService.delete(tenantId, documentKey);
-  }
-
-  /**
-   * Retrieves the document data.
-   * @param {number} tenantId
-   * @param {string} documentKey
-   */
-  public get(tenantId: number, documentKey: string) {
-    return this.getDocumentService.getAttachment(tenantId, documentKey);
-  }
-
-  /**
-   * Links the given document to resource model.
-   * @param {number} tenantId
-   * @param {string} filekey
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @returns
-   */
-  public link(
-    tenantId: number,
-    filekey: string,
-    modelRef: string,
-    modelId: number
-  ) {
-    return this.linkDocumentService.link(tenantId, filekey, modelRef, modelId);
-  }
-
-  /**
-   * Unlinks the given document from resource model.
-   * @param {number} tenantId
-   * @param {string} filekey
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @returns
-   */
-  public unlink(
-    tenantId: number,
-    filekey: string,
-    modelRef: string,
-    modelId: number
-  ) {
-    return this.unlinkDocumentService.unlink(
-      tenantId,
-      filekey,
-      modelRef,
-      modelId
-    );
-  }
-
-  /**
-   * Retrieves the presigned url of the given attachment key.
-   * @param {string} key
-   * @returns {Promise<string>}
-   */
-  public getPresignedUrl(key: string): Promise<string> {
-    return this.getPresignedUrlService.getPresignedUrl(key);
-  }
-}

packages/server/src/services/Attachments/AttachmentsApplication.tsx

@@ -0,0 +1,20 @@
+import { Inject, Service } from "typedi";
+import { UploadDocument } from "./UploadDocument";
+
+
+@Service()
+export class AttachmentsApplication {
+
+  @Inject()
+  private uploadDocumentService: UploadDocument;
+
+  upload(data: any) {
+    return this.uploadDocumentService.upload(data);
+  }
+
+  delete(attachmentId: string) {}
+
+  get(attachmentId: string) {
+
+  }
+}

packages/server/src/services/Attachments/DeleteAttachment.ts

@@ -1,45 +0,0 @@
-import { DeleteObjectCommand } from '@aws-sdk/client-s3';
-import { Inject, Service } from 'typedi';
-import { s3 } from '@/lib/S3/S3';
-import HasTenancyService from '../Tenancy/TenancyService';
-import config from '@/config';
-import UnitOfWork from '../UnitOfWork';
-import { Knex } from 'knex';
-
-@Service()
-export class DeleteAttachment {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private uow: UnitOfWork;
-
-  /**
-   * Deletes the give file attachment file key.
-   * @param {number} tenantId
-   * @param {string} filekey
-   */
-  async delete(tenantId: number, filekey: string): Promise<void> {
-    const { Document, DocumentLink } = this.tenancy.models(tenantId);
-
-    const params = {
-      Bucket: config.s3.bucket,
-      Key: filekey,
-    };
-    await s3.send(new DeleteObjectCommand(params));
-
-    const foundDocument = await Document.query()
-      .findOne('key', filekey)
-      .throwIfNotFound();
-
-    await this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
-      // Delete all document links
-      await DocumentLink.query(trx)
-        .where('documentId', foundDocument.id)
-        .delete();
-
-      // Delete thedocument.
-      await Document.query(trx).findById(foundDocument.id).delete();
-    });
-  }
-}

packages/server/src/services/Attachments/GetAttachment.ts

@@ -1,22 +0,0 @@
-import { Service } from 'typedi';
-import { GetObjectCommand } from '@aws-sdk/client-s3';
-import { s3 } from '@/lib/S3/S3';
-import config from '@/config';
-
-@Service()
-export class GetAttachment {
-  /**
-   * Retrieves data of the given document key.
-   * @param {number} tenantId
-   * @param {string} filekey
-   */
-  async getAttachment(tenantId: number, filekey: string) {
-    const params = {
-      Bucket: config.s3.bucket,
-      Key: filekey,
-    };
-    const data = await s3.send(new GetObjectCommand(params));
-
-    return data;
-  }
-}

packages/server/src/services/Attachments/GetAttachmentPresignedUrl.ts

@@ -1,23 +0,0 @@
-import { Service } from 'typedi';
-import { GetObjectCommand } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
-import { s3 } from '@/lib/S3/S3';
-import config from '@/config';
-
-@Service()
-export class getAttachmentPresignedUrl {
-  /**
-   * Retrieves the presigned url of the given attachment key.
-   * @param {string} key
-   * @returns {Promise<string?>}
-   */
-  async getPresignedUrl(key: string) {
-    const command = new GetObjectCommand({
-      Bucket: config.s3.bucket,
-      Key: key,
-    });
-    const signedUrl = await getSignedUrl(s3, command, { expiresIn: 300 });
-
-    return signedUrl;
-  }
-}

packages/server/src/services/Attachments/LinkAttachment.ts

@@ -1,82 +0,0 @@
-import { Inject, Service } from 'typedi';
-import bluebird from 'bluebird';
-import { Knex } from 'knex';
-import {
-  validateLinkModelEntryExists,
-  validateLinkModelExists,
-} from './_utils';
-import HasTenancyService from '../Tenancy/TenancyService';
-import { ServiceError } from '@/exceptions';
-import { ERRORS } from './constants';
-
-@Service()
-export class LinkAttachment {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Links the given file key to the given model type and id.
-   * @param {number} tenantId
-   * @param {string} filekey
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @returns {Promise<void>}
-   */
-  async link(
-    tenantId: number,
-    filekey: string,
-    modelRef: string,
-    modelId: number,
-    trx?: Knex.Transaction
-  ) {
-    const { DocumentLink, Document, ...models } = this.tenancy.models(tenantId);
-    const LinkModel = models[modelRef];
-    validateLinkModelExists(LinkModel);
-
-    const foundFile = await Document.query(trx)
-      .findOne('key', filekey)
-      .throwIfNotFound();
-
-    const foundLinkModel = await LinkModel.query(trx).findById(modelId);
-    validateLinkModelEntryExists(foundLinkModel);
-
-    const foundLinks = await DocumentLink.query(trx)
-      .where('modelRef', modelRef)
-      .where('modelId', modelId)
-      .where('documentId', foundFile.id);
-
-    if (foundLinks.length > 0) {
-      throw new ServiceError(ERRORS.DOCUMENT_LINK_ALREADY_LINKED);
-    }
-    await DocumentLink.query(trx).insert({
-      modelRef,
-      modelId,
-      documentId: foundFile.id,
-    });
-  }
-
-  /**
-   * Links the given file keys to the given model type and id.
-   * @param {number} tenantId
-   * @param {string[]} filekeys
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @param {Knex.Transaction} trx
-   * @returns {Promise<void>}
-   */
-  async bulkLink(
-    tenantId: number,
-    filekeys: string[],
-    modelRef: string,
-    modelId: number,
-    trx?: Knex.Transaction
-  ) {
-    return bluebird.each(filekeys, async (fieldKey: string) => {
-      try {
-        await this.link(tenantId, fieldKey, modelRef, modelId, trx);
-      } catch {
-        // Ignore catching exceptions in bulk action.
-      }
-    });
-  }
-}

packages/server/src/services/Attachments/S3UploadPipeline.ts

@@ -1,55 +0,0 @@
-import multer from 'multer';
-import type { Multer } from 'multer';
-import multerS3 from 'multer-s3';
-import { s3 } from '@/lib/S3/S3';
-import { Service } from 'typedi';
-import config from '@/config';
-import { NextFunction, Request, Response } from 'express';
-
-@Service()
-export class AttachmentUploadPipeline {
-  /**
-   * Middleware to ensure that S3 configuration is properly set before proceeding.
-   * This function checks if the necessary S3 configuration keys are present and throws an error if any are missing.
-   *
-   * @param req The HTTP request object.
-   * @param res The HTTP response object.
-   * @param next The callback to pass control to the next middleware function.
-   */
-  public validateS3Configured(req: Request, res: Response, next: NextFunction) {
-    if (
-      !config.s3.region ||
-      !config.s3.accessKeyId ||
-      !config.s3.secretAccessKey
-    ) {
-      const missingKeys = [];
-      if (!config.s3.region) missingKeys.push('region');
-      if (!config.s3.accessKeyId) missingKeys.push('accessKeyId');
-      if (!config.s3.secretAccessKey) missingKeys.push('secretAccessKey');
-      const missing = missingKeys.join(', ');
-
-      throw new Error(`S3 configuration error: Missing ${missing}`);
-    }
-    next();
-  }
-
-  /**
-   * Express middleware for uploading attachments to an S3 bucket.
-   * It utilizes the multer middleware for handling multipart/form-data, specifically for file uploads.
-   */
-  public uploadPipeline(): Multer {
-    return multer({
-      storage: multerS3({
-        s3,
-        bucket: config.s3.bucket,
-        contentType: multerS3.AUTO_CONTENT_TYPE,
-        metadata: function (req, file, cb) {
-          cb(null, { fieldName: file.fieldname });
-        },
-        key: function (req, file, cb) {
-          cb(null, Date.now().toString());
-        },
-      }),
-    });
-  }
-}

packages/server/src/services/Attachments/UnlinkAttachment.ts

@@ -1,125 +0,0 @@
-import { Inject, Service } from 'typedi';
-import bluebird from 'bluebird';
-import HasTenancyService from '../Tenancy/TenancyService';
-import {
-  validateLinkModelEntryExists,
-  validateLinkModelExists,
-} from './_utils';
-import { Knex } from 'knex';
-import { difference } from 'lodash';
-
-@Service()
-export class UnlinkAttachment {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  /**
-   * Unlink the attachments from the model entry.
-   * @param {number} tenantId
-   * @param {string} filekey
-   * @param {string} modelRef
-   * @param {number} modelId
-   */
-  async unlink(
-    tenantId: number,
-    filekey: string,
-    modelRef: string,
-    modelId: number,
-    trx?: Knex.Transaction
-  ): Promise<void> {
-    const { DocumentLink, Document, ...models } = this.tenancy.models(tenantId);
-    const LinkModel = models[modelRef];
-    validateLinkModelExists(LinkModel);
-
-    const foundLinkModel = await LinkModel.query(trx).findById(modelId);
-    validateLinkModelEntryExists(foundLinkModel);
-
-    const document = await Document.query(trx).findOne('key', filekey);
-
-    // Delete the document link.
-    await DocumentLink.query(trx)
-      .where('modelRef', modelRef)
-      .where('modelId', modelId)
-      .where('documentId', document.id)
-      .delete();
-  }
-
-  /**
-   * Bulk unlink the attachments from the model entry.
-   * @param {number} tenantId
-   * @param {string} fieldkey
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @returns {Promise<void>}
-   */
-  async bulkUnlink(
-    tenantId: number,
-    filekeys: string[],
-    modelRef: string,
-    modelId: number,
-    trx?: Knex.Transaction
-  ): Promise<void> {
-    await bluebird.each(filekeys, (fieldKey: string) => {
-      try {
-        this.unlink(tenantId, fieldKey, modelRef, modelId, trx);
-      } catch {
-        // Ignore catching exceptions on bulk action.
-      }
-    });
-  }
-
-  /**
-   * Unlink all the unpresented keys of the given model type and id.
-   * @param {number} tenantId
-   * @param {string[]} presentedKeys
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @param {Knex.Transaction} trx
-   */
-  async unlinkUnpresentedKeys(
-    tenantId: number,
-    presentedKeys: string[],
-    modelRef: string,
-    modelId: number,
-    trx?: Knex.Transaction
-  ): Promise<void> {
-    const { DocumentLink } = this.tenancy.models(tenantId);
-
-    const modelLinks = await DocumentLink.query(trx)
-      .where('modelRef', modelRef)
-      .where('modelId', modelId)
-      .withGraphFetched('document');
-
-    const modelLinkKeys = modelLinks.map((link) => link.document.key);
-    const unpresentedKeys = difference(modelLinkKeys, presentedKeys);
-
-    await this.bulkUnlink(tenantId, unpresentedKeys, modelRef, modelId, trx);
-  }
-
-  /**
-   * Unlink all attachments of the given model type and id.
-   * @param {number} tenantId
-   * @param {string} modelRef
-   * @param {number} modelId
-   * @param {Knex.Transaction} trx
-   * @returns {Promise<void>}
-   */
-  async unlinkAllModelKeys(
-    tenantId: number,
-    modelRef: string,
-    modelId: number,
-    trx?: Knex.Transaction
-  ): Promise<void> {
-    const { DocumentLink } = this.tenancy.models(tenantId);
-
-    // Get all the keys of the modelRef and modelId.
-    const modelLinks = await DocumentLink.query(trx)
-      .where('modelRef', modelRef)
-      .where('modelId', modelId)
-      .withGraphFetched('document');
-
-    const modelLinkKeys = modelLinks.map((link) => link.document.key);
-
-    await this.bulkUnlink(tenantId, modelLinkKeys, modelRef, modelId, trx);
-  }
-}

packages/server/src/services/Attachments/UploadDocument.ts

@@ -1,26 +1,22 @@
-import { Inject, Service } from 'typedi';
-import HasTenancyService from '../Tenancy/TenancyService';
+import { Service } from 'typedi';
+import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
 
 @Service()
 export class UploadDocument {
-  @Inject()
-  private tenancy: HasTenancyService;
+  // setting up s3 client
+  public s3 = new S3Client({
+    region: process.env.AWS_REGION,
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+  });
 
-  /**
-   * Inserts the document metadata.
-   * @param {number} tenantId 
-   * @param {} file 
-   * @returns {}
-   */
-  async upload(tenantId: number, file: any) {
-    const { Document } = this.tenancy.models(tenantId);
-
-    const insertedDocument = await Document.query().insert({
-      key: file.key,
-      mimeType: file.mimetype,
-      size: file.size,
-      originName: file.originalname,
+  async upload(data) {
+    const putObjectCommand = new PutObjectCommand({
+      Bucket: process.env.AWS_BUCKET,
+      Key: data.filename,
+      Body: await data.toBuffer(),
+      ContentType: data.mimetype,
     });
-    return insertedDocument;
+    await this.s3.send(putObjectCommand);
   }
 }

packages/server/src/services/Attachments/ValidateAttachments.ts

@@ -1,29 +0,0 @@
-import { castArray, difference } from 'lodash';
-import HasTenancyService from '../Tenancy/TenancyService';
-import { ServiceError } from '@/exceptions';
-import { Inject, Service } from 'typedi';
-
-@Service()
-export class ValidateAttachments {
-  @Inject()
-  tenancy: HasTenancyService;
-
-  /**
-   * Validates the given file keys existance.
-   * @param {number} tenantId
-   * @param {string|string[]} key
-   */
-  async validate(tenantId: number, key: string | string[]) {
-    const { Document } = this.tenancy.models(tenantId);
-
-    const keys = castArray(key);
-    const documents = await Document.query().whereIn('key', key);
-    const documentKeys = documents.map((document) => document.key);
-
-    const notFoundKeys = difference(keys, documentKeys);
-
-    if (notFoundKeys.length > 0) {
-      throw new ServiceError('DOCUMENT_KEYS_INVALID');
-    }
-  }
-}

packages/server/src/services/Attachments/_utils.ts

@@ -1,14 +0,0 @@
-import { ServiceError } from '@/exceptions';
-import { ERRORS } from './constants';
-
-export const validateLinkModelExists = (LinkModel) => {
-  if (!LinkModel) {
-    throw new ServiceError(ERRORS.DOCUMENT_LINK_REF_INVALID);
-  }
-};
-
-export const validateLinkModelEntryExists = (foundLinkModel) => {
-  if (!foundLinkModel) {
-    throw new ServiceError(ERRORS.DOCUMENT_LINK_ID_INVALID);
-  }
-};

packages/server/src/services/Attachments/constants.ts

@@ -1,5 +0,0 @@
-export enum ERRORS {
-  DOCUMENT_LINK_REF_INVALID = 'DOCUMENT_LINK_REF_INVALID',
-  DOCUMENT_LINK_ID_INVALID = 'DOCUMENT_LINK_ID_INVALID',
-  DOCUMENT_LINK_ALREADY_LINKED = 'DOCUMENT_LINK_ALREADY_LINKED'
-}

packages/server/src/services/Attachments/events/AttachmentsOnBills.ts

@@ -1,151 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { isEmpty } from 'lodash';
-import {
-  IBIllEventDeletedPayload,
-  IBillCreatedPayload,
-  IBillCreatingPayload,
-  IBillEditedPayload,
-} from '@/interfaces';
-import events from '@/subscribers/events';
-import { LinkAttachment } from '../LinkAttachment';
-import { ValidateAttachments } from '../ValidateAttachments';
-import { UnlinkAttachment } from '../UnlinkAttachment';
-
-@Service()
-export class AttachmentsOnBills {
-  @Inject()
-  private linkAttachmentService: LinkAttachment;
-
-  @Inject()
-  private unlinkAttachmentService: UnlinkAttachment;
-
-  @Inject()
-  private validateDocuments: ValidateAttachments;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.bill.onCreating,
-      this.validateAttachmentsOnBillCreate.bind(this)
-    );
-    bus.subscribe(
-      events.bill.onCreated,
-      this.handleAttachmentsOnBillCreated.bind(this)
-    );
-    bus.subscribe(
-      events.bill.onEdited,
-      this.handleUnlinkUnpresentedKeysOnBillEdited.bind(this)
-    );
-    bus.subscribe(
-      events.bill.onEdited,
-      this.handleLinkPresentedKeysOnBillEdited.bind(this)
-    );
-    bus.subscribe(
-      events.bill.onDeleting,
-      this.handleUnlinkAttachmentsOnBillDeleted.bind(this)
-    );
-  }
-
-  /**
-   * Validates the attachment keys on creating bill.
-   * @param {ISaleInvoiceCreatingPaylaod}
-   * @returns {Promise<void>}
-   */
-  private async validateAttachmentsOnBillCreate({
-    billDTO,
-    tenantId,
-  }: IBillCreatingPayload): Promise<void> {
-    if (isEmpty(billDTO.attachments)) {
-      return;
-    }
-    const documentKeys = billDTO?.attachments?.map((a) => a.key);
-
-    await this.validateDocuments.validate(tenantId, documentKeys);
-  }
-
-  /**
-   * Handles linking the attachments of the created bill.
-   * @param {ISaleInvoiceCreatedPayload}
-   * @returns {Promise<void>}
-   */
-  private async handleAttachmentsOnBillCreated({
-    tenantId,
-    bill,
-    billDTO,
-    trx,
-  }: IBillCreatedPayload): Promise<void> {
-    if (isEmpty(billDTO.attachments)) return;
-
-    const keys = billDTO.attachments?.map((attachment) => attachment.key);
-    await this.linkAttachmentService.bulkLink(
-      tenantId,
-      keys,
-      'Bill',
-      bill.id,
-      trx
-    );
-  }
-
-  /**
-   * Handles unlinking all the unpresented keys of the edited bill.
-   * @param {IBillEditedPayload}
-   */
-  private async handleUnlinkUnpresentedKeysOnBillEdited({
-    tenantId,
-    billDTO,
-    bill,
-    trx
-  }: IBillEditedPayload) {
-    const keys = billDTO.attachments?.map((attachment) => attachment.key);
-    await this.unlinkAttachmentService.unlinkUnpresentedKeys(
-      tenantId,
-      keys,
-      'Bill',
-      bill.id,
-      trx
-    );
-  }
-
-  /**
-   * Handles linking all the presented keys of the edited bill.
-   * @param {ISaleInvoiceEditedPayload}
-   * @returns {Promise<void>}
-   */
-  private async handleLinkPresentedKeysOnBillEdited({
-    tenantId,
-    billDTO,
-    oldBill,
-    trx,
-  }: IBillEditedPayload) {
-    if (isEmpty(billDTO.attachments)) return;
-
-    const keys = billDTO.attachments?.map((attachment) => attachment.key);
-    await this.linkAttachmentService.bulkLink(
-      tenantId,
-      keys,
-      'Bill',
-      oldBill.id,
-      trx
-    );
-  }
-
-  /**
-   * Unlink all attachments once the bill deleted.
-   * @param {ISaleInvoiceDeletedPayload}
-   * @returns {Promise<void>}
-   */
-  private async handleUnlinkAttachmentsOnBillDeleted({
-    tenantId,
-    oldBill,
-    trx,
-  }: IBIllEventDeletedPayload) {
-    await this.unlinkAttachmentService.unlinkAllModelKeys(
-      tenantId,
-      'Bill',
-      oldBill.id,
-      trx
-    );
-  }
-}