Merge pull request #410 from bigcapitalhq/seed-free-subscription-to-tenants

feat: seed free subscription to tenants that have no subscription.

.env.example

@@ -96,7 +96,6 @@ PLAID_LINK_WEBHOOK=
 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=

README.md

@@ -25,6 +25,10 @@
       <img src="https://img.shields.io/twitter/follow/bigcapitalhq?style=social" alt="twitter" />
     </a>
   </p>
+
+  <p align="center">
+    <a href="https://app.bigcapital.ly">Bigcapital Cloud</a>
+  </p>
 </p>
 
 # What's Bigcapital?

docker-compose.prod.yml

@@ -21,16 +21,12 @@ services:
     depends_on:
       - server
       - webapp
-    deploy:
+    restart: on-failure
-      restart_policy:
-        condition: unless-stopped
 
   webapp:
     container_name: bigcapital-webapp
     image: ghcr.io/bigcapitalhq/webapp:latest
-    deploy:
+    restart: on-failure
-      restart_policy:
-        condition: unless-stopped
 
   server:
     container_name: bigcapital-server
@@ -45,9 +41,7 @@ services:
       - mysql
       - mongo
       - redis
-    deploy:
+    restart: on-failure
-      restart_policy:
-        condition: unless-stopped
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -92,6 +86,12 @@ services:
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
 
+      # Lemon Squeez
+      - LEMONSQUEEZY_API_KEY=${LEMONSQUEEZY_API_KEY}
+      - LEMONSQUEEZY_STORE_ID=${LEMONSQUEEZY_STORE_ID}
+      - LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET}
+      - HOSTED_ON_BIGCAPITAL_CLOUD=${HOSTED_ON_BIGCAPITAL_CLOUD}
+
   database_migration:
     container_name: bigcapital-database-migration
     build:
@@ -111,9 +111,7 @@ services:
 
   mysql:
     container_name: bigcapital-mysql
-    deploy:
+    restart: on-failure
-      restart_policy:
-        condition: unless-stopped
     build:
       context: ./docker/mariadb
     environment:
@@ -128,9 +126,7 @@ services:
 
   mongo:
     container_name: bigcapital-mongo
-    deploy:
+    restart: on-failure
-      restart_policy:
-        condition: unless-stopped
     build: ./docker/mongo
     expose:
       - '27017'
@@ -139,9 +135,7 @@ services:
 
   redis:
     container_name: bigcapital-redis
-    deploy:
+    restart: on-failure
-      restart_policy:
-        condition: unless-stopped
     build:
       context: ./docker/redis
     expose:

packages/server/package.json

@@ -22,6 +22,7 @@
   "dependencies": {
     "@casl/ability": "^5.4.3",
     "@hapi/boom": "^7.4.3",
+    "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
     "@types/i18n": "^0.8.7",
     "@types/knex": "^0.16.1",
     "@types/mathjs": "^6.0.12",
@@ -89,17 +90,17 @@
     "objection-filter": "^4.0.1",
     "objection-soft-delete": "^1.0.7",
     "objection-unique": "^1.2.2",
+    "plaid": "^10.3.0",
     "pluralize": "^8.0.0",
     "pug": "^3.0.2",
     "puppeteer": "^10.2.0",
-    "plaid": "^10.3.0",
     "qim": "0.0.52",
     "ramda": "^0.27.1",
     "rate-limiter-flexible": "^2.1.14",
     "reflect-metadata": "^0.1.13",
     "rtl-detect": "^1.0.4",
-    "source-map-loader": "^4.0.1",
     "socket.io": "^4.7.4",
+    "source-map-loader": "^4.0.1",
     "tmp-promise": "^3.0.3",
     "ts-transformer-keys": "^0.4.2",
     "tsyringe": "^4.3.0",

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

@@ -1,5 +1,6 @@
 import Multer from 'multer';
 import { ServiceError } from '@/exceptions';
+import { getImportsStoragePath } from '@/services/Import/_utils';
 
 export function allowSheetExtensions(req, file, cb) {
   if (
@@ -16,7 +17,8 @@ export function allowSheetExtensions(req, file, cb) {
 
 const storage = Multer.diskStorage({
   destination: function (req, file, cb) {
-    cb(null, './public/imports');
+    const path = getImportsStoragePath();
+    cb(null, path);
   },
   filename: function (req, file, cb) {
     // Add the creation timestamp to clean up temp files later.

packages/server/src/services/Import/ImportFileUpload.ts

@@ -38,8 +38,6 @@ export class ImportFileUploadService {
     filename: string,
     params: Record<string, number | string>
   ): Promise<ImportFileUploadPOJO> {
-    console.log(filename, 'filename');
-
     try {
       return await this.importUnhandled(
         tenantId,

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

@@ -3,6 +3,7 @@ import moment from 'moment';
 import * as R from 'ramda';
 import { Knex } from 'knex';
 import fs from 'fs/promises';
+import path from 'path';
 import {
   defaultTo,
   upperFirst,
@@ -353,7 +354,6 @@ export const parseKey = R.curry(
         _key = `${fieldKey}`;
       }
     }
-    console.log(_key);
     return _key;
   }
 );
@@ -432,13 +432,19 @@ export const sanitizeSheetData = (json) => {
 export const getMapToPath = (to: string, group = '') =>
   group ? `${group}.${to}` : to;
 
+export const getImportsStoragePath = () => {
+  return  path.join(global.__storage_dir, `/imports`);
+}
+
 /**
  * Deletes the imported file from the storage and database.
  * @param {string} filename
  */
 export const deleteImportFile = async (filename: string) => {
+  const filePath = getImportsStoragePath();
+
   // Deletes the imported file.
-  await fs.unlink(`public/imports/${filename}`);
+  await fs.unlink(`${filePath}/${filename}`);
 };
 
 /**
@@ -447,5 +453,7 @@ export const deleteImportFile = async (filename: string) => {
  * @returns {Promise<Buffer>}
  */
 export const readImportFile = (filename: string) => {
-  return fs.readFile(`public/imports/${filename}`);
+  const filePath = getImportsStoragePath();
+
+  return fs.readFile(`${filePath}/${filename}`);
 };

packages/server/src/services/Subscription/SubscriptionPeriod.ts

@@ -1,4 +1,4 @@
-import moment, { type unitOfTime } from 'moment';
+import moment, { unitOfTime } from 'moment';
 
 export default class SubscriptionPeriod {
   private start: Date;

packages/server/src/system/migrations/20240222134235_seed_free_subscription_to_tenants.js

@@ -0,0 +1,7 @@
+exports.up = function (knex) {
+  return knex.seed.run({
+    specific: 'seed_tenants_free_subscription.js',
+  });
+};
+
+exports.down = function (knex) {};

packages/server/src/system/models/Tenant.ts

@@ -194,7 +194,12 @@ export default class Tenant extends BaseModel {
    * @param {*} subscriptionSlug
    * @returns
    */
-  public newSubscription(planId, invoiceInterval, invoicePeriod, subscriptionSlug) {
+  public newSubscription(
+    planId,
+    invoiceInterval,
+    invoicePeriod,
+    subscriptionSlug
+  ) {
     return Tenant.newSubscription(
       this.id,
       planId,
@@ -202,7 +207,6 @@ export default class Tenant extends BaseModel {
       invoicePeriod,
       subscriptionSlug
     );
-    );
   }
 
   /**

packages/server/src/system/seeds/seed_tenants_free_subscription.js

@@ -0,0 +1,26 @@
+exports.seed = (knex) => {
+  // Deletes ALL existing entries
+  return knex('subscription_plan_subscriptions')
+    .then(async () => {
+      const tenants = await knex('tenants');
+
+      for (const tenant of tenants) {
+        const existingSubscription = await knex('subscription_plan_subscriptions')
+          .where('tenantId', tenant.id)
+          .first();
+
+        if (!existingSubscription) {
+          const freePlan = await knex('subscription_plans').where('slug', 'free').first();
+
+          await knex('subscription_plan_subscriptions').insert({
+            tenantId: tenant.id,
+            planId: freePlan.id,
+            slug: 'main',
+            startsAt: knex.fn.now(),
+            endsAt: null,
+            createdAt: knex.fn.now(),
+          });
+        }
+      }
+    });
+};

packages/server/storage/.gitignore

@@ -1,3 +1,4 @@
 *
 !pdf/
+!imports/
 !.gitignore

packages/server/storage/imports/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

pnpm-lock.yaml

@@ -38,6 +38,9 @@ importers:
       '@hapi/boom':
         specifier: ^7.4.3
         version: 7.4.11
+      '@lemonsqueezy/lemonsqueezy.js':
+        specifier: ^2.2.0
+        version: 2.2.0
       '@types/i18n':
         specifier: ^0.8.7
         version: 0.8.8
@@ -4623,6 +4626,11 @@ packages:
     resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==}
     dev: false
 
+  /@lemonsqueezy/lemonsqueezy.js@2.2.0:
+    resolution: {integrity: sha512-DsZTeowehSLTESUZ6xxoYPDhoE8BYepWsj3TCqibG7FvB8X1HERPXQlc6E/IeGj22SOfIM997b7GfFkeLWY8pA==}
+    engines: {node: '>=18'}
+    dev: false
+
   /@lerna/add@6.4.1:
     resolution: {integrity: sha512-YSRnMcsdYnQtQQK0NSyrS9YGXvB3jzvx183o+JTH892MKzSlBqwpBHekCknSibyxga1HeZ0SNKQXgsHAwWkrRw==}
     engines: {node: ^14.15.0 || >=16.0.0}