@reachu/database 1.0.70 → 1.0.71

package/dist/entity/ExternalRequest.d.ts

@@ -1,9 +1,12 @@
 import AuditedModel from './AuditedModel';
+import Plan from './modules/subscriptions/Plan';
 import User from './User';
 export default class ExternalRequest extends AuditedModel {
     id: number;
     sender: User;
+    plan: Plan;
     receiverEmail: string;
+    collection: number;
     url: string;
     state: number;
 }

package/dist/entity/ExternalRequest.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const typeorm_1 = require("typeorm");
 const AuditedModel_1 = __importDefault(require("./AuditedModel"));
+const Plan_1 = __importDefault(require("./modules/subscriptions/Plan"));
 const User_1 = __importDefault(require("./User"));
 let ExternalRequest = class ExternalRequest extends AuditedModel_1.default {
 };
@@ -26,10 +27,19 @@ __decorate([
     typeorm_1.JoinColumn(),
     __metadata("design:type", User_1.default)
 ], ExternalRequest.prototype, "sender", void 0);
+__decorate([
+    typeorm_1.ManyToOne(() => Plan_1.default, { eager: true, onDelete: 'CASCADE' }),
+    typeorm_1.JoinColumn(),
+    __metadata("design:type", Plan_1.default)
+], ExternalRequest.prototype, "plan", void 0);
 __decorate([
     typeorm_1.Column('varchar'),
     __metadata("design:type", String)
 ], ExternalRequest.prototype, "receiverEmail", void 0);
+__decorate([
+    typeorm_1.Column('integer', { nullable: true, default: 0 }),
+    __metadata("design:type", Number)
+], ExternalRequest.prototype, "collection", void 0);
 __decorate([
     typeorm_1.Column('varchar'),
     __metadata("design:type", String)

package/dist/entity/ExternalRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExternalRequest.js","sourceRoot":"","sources":["../../src/entity/ExternalRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAAwF;AACxF,kEAA0C;AAC1C,kDAA0B;AAG1B,IAAqB,eAAe,GAApC,MAAqB,eAAgB,SAAQ,sBAAY;CAgBxD,CAAA;AAdC;IADC,gCAAsB,EAAE;;2CACd;AAIX;IAFC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC3D,oBAAU,EAAE;8BACL,cAAI;+CAAC;AAGb;IADC,gBAAM,CAAC,SAAS,CAAC;;sDACI;AAGtB;IADC,gBAAM,CAAC,SAAS,CAAC;;4CACN;AAGZ;IADC,gBAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;8CACpC;AAfK,eAAe;IADnC,gBAAM,EAAE;GACY,eAAe,CAgBnC;kBAhBoB,eAAe"}
+{"version":3,"file":"ExternalRequest.js","sourceRoot":"","sources":["../../src/entity/ExternalRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAAwF;AACxF,kEAA0C;AAC1C,wEAA+C;AAC/C,kDAA0B;AAG1B,IAAqB,eAAe,GAApC,MAAqB,eAAgB,SAAQ,sBAAY;CA0BxD,CAAA;AAxBC;IADC,gCAAsB,EAAE;;2CACd;AAIX;IAFC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC3D,oBAAU,EAAE;8BACL,cAAI;+CAAC;AAIb;IAFC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC3D,oBAAU,EAAE;8BACP,cAAI;6CAAC;AAGX;IADC,gBAAM,CAAC,SAAS,CAAC;;sDACI;AAGtB;IADC,gBAAM,CAAC,SAAS,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAC,CAAC;;mDAC5B;AAGnB;IADC,gBAAM,CAAC,SAAS,CAAC;;4CACN;AAMZ;IADC,gBAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;8CACpC;AAzBK,eAAe;IADnC,gBAAM,EAAE;GACY,eAAe,CA0BnC;kBA1BoB,eAAe"}

package/dist/migrations/1684452127341-externalRequest_v1.d.ts

@@ -0,0 +1,6 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+export declare class externalRequestV11684452127341 implements MigrationInterface {
+    name: string;
+    up(queryRunner: QueryRunner): Promise<void>;
+    down(queryRunner: QueryRunner): Promise<void>;
+}

package/dist/migrations/1684452127341-externalRequest_v1.js

@@ -0,0 +1,33 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.externalRequestV11684452127341 = void 0;
+class externalRequestV11684452127341 {
+    constructor() {
+        this.name = 'externalRequestV11684452127341';
+    }
+    up(queryRunner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield queryRunner.query(`ALTER TABLE \`external_request\` ADD \`collection\` int NULL DEFAULT '0'`);
+            yield queryRunner.query(`ALTER TABLE \`external_request\` ADD \`plan_id\` int NULL`);
+            yield queryRunner.query(`ALTER TABLE \`external_request\` ADD CONSTRAINT \`FK_6bba3dfa40a288826cda4ddacc5\` FOREIGN KEY (\`plan_id\`) REFERENCES \`plan\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        });
+    }
+    down(queryRunner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield queryRunner.query(`ALTER TABLE \`external_request\` DROP FOREIGN KEY \`FK_6bba3dfa40a288826cda4ddacc5\``);
+            yield queryRunner.query(`ALTER TABLE \`external_request\` DROP COLUMN \`plan_id\``);
+            yield queryRunner.query(`ALTER TABLE \`external_request\` DROP COLUMN \`collection\``);
+        });
+    }
+}
+exports.externalRequestV11684452127341 = externalRequestV11684452127341;
+//# sourceMappingURL=1684452127341-externalRequest_v1.js.map

package/dist/migrations/1684452127341-externalRequest_v1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1684452127341-externalRequest_v1.js","sourceRoot":"","sources":["../../src/migrations/1684452127341-externalRequest_v1.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,8BAA8B;IAA3C;QACI,SAAI,GAAG,gCAAgC,CAAA;IAc3C,CAAC;IAZgB,EAAE,CAAC,WAAwB;;YACpC,MAAM,WAAW,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAC;YACpG,MAAM,WAAW,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;YACrF,MAAM,WAAW,CAAC,KAAK,CAAC,gLAAgL,CAAC,CAAC;QAC9M,CAAC;KAAA;IAEY,IAAI,CAAC,WAAwB;;YACtC,MAAM,WAAW,CAAC,KAAK,CAAC,sFAAsF,CAAC,CAAC;YAChH,MAAM,WAAW,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;YACpF,MAAM,WAAW,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QAC3F,CAAC;KAAA;CAEJ;AAfD,wEAeC"}

package/dist/tsconfig.tsbuildinfo

@@ -2617,8 +2617,8 @@
         "affectsGlobalScope": false
       },
       "../src/entity/externalrequest.ts": {
-        "version": "7778507c1d570e22250a008dc897cd5e2f1c932837a64c18010d2736dac48264",
-        "signature": "1f727d6ad4521002f8c4ee91c7940b6664289cffeab061eb73b12426da88942a",
+        "version": "0b9493f093b9f9c0f3461e20fb18855d6b2e19bfc174fd35738b3b3a9b97a821",
+        "signature": "4ff799881b47b74a2d88b12c67727dedd7e5f1a33c1cdf57237b64c588972da8",
         "affectsGlobalScope": false
       },
       "../src/entity/wallet.ts": {
@@ -3246,6 +3246,11 @@
         "signature": "efa1b2a3bc304f80a628444319086645d910534bed8b925bb317ebfeb4d0c479",
         "affectsGlobalScope": false
       },
+      "../src/migrations/1684452127341-externalrequest_v1.ts": {
+        "version": "e39b4bc92c2b6e579224b6df69ae9b5165e3c470fe4298ca569419889aef2a72",
+        "signature": "55d83a9fd40ea572a7e5b735749b66a53d6743e310b062f95a0f428d9992e9fd",
+        "affectsGlobalScope": false
+      },
       "../src/migrations/execute/index.ts": {
         "version": "8b5bf13d095aeb57afd593adf3d799681176a13c327e2f77e0028e178c4ee3b9",
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
@@ -5338,6 +5343,7 @@
       "../src/entity/externalrequest.ts": [
         "../node_modules/typeorm/index.d.ts",
         "../src/entity/auditedmodel.ts",
+        "../src/entity/modules/subscriptions/plan.ts",
         "../src/entity/user.ts"
       ],
       "../src/entity/flatrate.ts": [
@@ -6056,6 +6062,9 @@
       "../src/migrations/1684451330738-externalrequest.ts": [
         "../node_modules/typeorm/index.d.ts"
       ],
+      "../src/migrations/1684452127341-externalrequest_v1.ts": [
+        "../node_modules/typeorm/index.d.ts"
+      ],
       "../src/migrations/execute/index.ts": [
         "../src/config/connect.ts"
       ],
@@ -8102,6 +8111,7 @@
       ],
       "../src/entity/externalrequest.ts": [
         "../src/entity/auditedmodel.ts",
+        "../src/entity/modules/subscriptions/plan.ts",
         "../src/entity/user.ts"
       ],
       "../src/entity/flatrate.ts": [
@@ -8721,6 +8731,9 @@
       "../src/migrations/1684451330738-externalrequest.ts": [
         "../node_modules/typeorm/index.d.ts"
       ],
+      "../src/migrations/1684452127341-externalrequest_v1.ts": [
+        "../node_modules/typeorm/index.d.ts"
+      ],
       "../src/migrations/index.ts": [
         "../src/migrations/1628474597284-initialschema.ts",
         "../src/migrations/1630077596132-removemangopay.ts",
@@ -9518,6 +9531,7 @@
       "../src/migrations/1683908691683-connections-update.ts",
       "../src/migrations/1684176902363-connections-update-2.ts",
       "../src/migrations/1684451330738-externalrequest.ts",
+      "../src/migrations/1684452127341-externalrequest_v1.ts",
       "../src/migrations/execute/index.ts",
       "../src/migrations/index.ts",
       "../src/repositories/index.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@reachu/database",
-    "version": "1.0.70",
+    "version": "1.0.71",
     "description": "reachu-database",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "author": "reachu",
     "license": "ISC",
     "dependencies": {
-        "@reachu/logger": "1.0.70",
-        "@reachu/utils": "1.0.70",
+        "@reachu/logger": "1.0.71",
+        "@reachu/utils": "1.0.71",
         "dotenv": "8.0.0",
         "express": "4.17.1",
         "mysql2": "1.5.2",

package/src/entity/ExternalRequest.ts

@@ -1,5 +1,6 @@
 import { Entity, PrimaryGeneratedColumn, Column, JoinColumn, ManyToOne } from 'typeorm';
 import AuditedModel from './AuditedModel';
+import Plan from './modules/subscriptions/Plan'  
 import User from './User';
 
 @Entity()
@@ -11,12 +12,22 @@ export default class ExternalRequest extends AuditedModel {
   @JoinColumn()
   sender: User;
 
+  @ManyToOne(() => Plan, { eager: true, onDelete: 'CASCADE' })
+  @JoinColumn()
+  plan: Plan;
+
   @Column('varchar')
   receiverEmail: string;
   
+  @Column('integer',{nullable: true, default: 0})
+  collection: number;
+  
   @Column('varchar')
   url: string;
 
+  // 0 pending
+  // 1 accepted
+  // 2 denied
   @Column('integer', { nullable: true, default: 0 })
   state: number;
 }

package/src/migrations/1684452127341-externalRequest_v1.ts

@@ -0,0 +1,18 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class externalRequestV11684452127341 implements MigrationInterface {
+    name = 'externalRequestV11684452127341'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`external_request\` ADD \`collection\` int NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE \`external_request\` ADD \`plan_id\` int NULL`);
+        await queryRunner.query(`ALTER TABLE \`external_request\` ADD CONSTRAINT \`FK_6bba3dfa40a288826cda4ddacc5\` FOREIGN KEY (\`plan_id\`) REFERENCES \`plan\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`external_request\` DROP FOREIGN KEY \`FK_6bba3dfa40a288826cda4ddacc5\``);
+        await queryRunner.query(`ALTER TABLE \`external_request\` DROP COLUMN \`plan_id\``);
+        await queryRunner.query(`ALTER TABLE \`external_request\` DROP COLUMN \`collection\``);
+    }
+
+}