@reachu/database 1.0.67 → 1.0.68

package/dist/entity/Connection.d.ts

@@ -1,11 +1,11 @@
 import AuditedModel from './AuditedModel';
 import User from './User';
+import Request from './Request';
 export default class Connection extends AuditedModel {
     id: number;
     deletedAt: Date;
     user1: User;
     user2: User;
-    request1: User;
-    request2: User;
+    request: Request;
     state: string;
 }

package/dist/entity/Connection.js

@@ -45,15 +45,8 @@ __decorate([
         onDelete: 'CASCADE',
     }),
     typeorm_1.JoinColumn(),
-    __metadata("design:type", User_1.default)
-], Connection.prototype, "request1", void 0);
-__decorate([
-    typeorm_1.ManyToOne(() => Request_1.default, (request) => request.id, {
-        onDelete: 'CASCADE',
-    }),
-    typeorm_1.JoinColumn(),
-    __metadata("design:type", User_1.default)
-], Connection.prototype, "request2", void 0);
+    __metadata("design:type", Request_1.default)
+], Connection.prototype, "request", void 0);
 __decorate([
     typeorm_1.Column('varchar', { nullable: false }),
     __metadata("design:type", String)

package/dist/entity/Connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/entity/Connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAOiB;AACjB,kEAA0C;AAC1C,kDAA0B;AAC1B,wDAAgC;AAGhC,IAAqB,UAAU,GAA/B,MAAqB,UAAW,SAAQ,sBAAY;CAiCnD,CAAA;AA/BC;IADC,gCAAsB,EAAE;;sCACd;AAGX;IADC,0BAAgB,EAAE;8BACR,IAAI;6CAAC;AAMhB;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;QAC9C,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACN,cAAI;yCAAC;AAMZ;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;QAC9C,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACN,cAAI;yCAAC;AAMZ;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,iBAAO,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE;QAC1D,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACH,cAAI;4CAAC;AAMf;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,iBAAO,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE;QAC1D,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACH,cAAI;4CAAC;AAGf;IADC,gBAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;yCACzB;AAhCK,UAAU;IAD9B,gBAAM,EAAE;GACY,UAAU,CAiC9B;kBAjCoB,UAAU"}
+{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/entity/Connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAOiB;AACjB,kEAA0C;AAC1C,kDAA0B;AAC1B,wDAAgC;AAGhC,IAAqB,UAAU,GAA/B,MAAqB,UAAW,SAAQ,sBAAY;CA2BnD,CAAA;AAzBC;IADC,gCAAsB,EAAE;;sCACd;AAGX;IADC,0BAAgB,EAAE;8BACR,IAAI;6CAAC;AAMhB;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;QAC9C,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACN,cAAI;yCAAC;AAMZ;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,cAAI,EAAE,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;QAC9C,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACN,cAAI;yCAAC;AAMZ;IAJC,mBAAS,CAAC,GAAG,EAAE,CAAC,iBAAO,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE;QAC1D,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,oBAAU,EAAE;8BACJ,iBAAO;2CAAC;AAGjB;IADC,gBAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;yCACzB;AA1BK,UAAU;IAD9B,gBAAM,EAAE;GACY,UAAU,CA2B9B;kBA3BoB,UAAU"}

package/dist/migrations/1683908691683-connections-update.d.ts

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

package/dist/migrations/1683908691683-connections-update.js

@@ -0,0 +1,39 @@
+"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.connectionsUpdate1683908691683 = void 0;
+class connectionsUpdate1683908691683 {
+    constructor() {
+        this.name = 'connectionsUpdate1683908691683';
+    }
+    up(queryRunner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield queryRunner.query(`ALTER TABLE \`connection\` DROP FOREIGN KEY \`FK_4dbcf398cf5113a67cde4d47254\``);
+            yield queryRunner.query(`ALTER TABLE \`connection\` DROP FOREIGN KEY \`FK_c5e7b716e32c369affd3b5d53ab\``);
+            yield queryRunner.query(`ALTER TABLE \`connection\` DROP COLUMN \`request1_id\``);
+            yield queryRunner.query(`ALTER TABLE \`connection\` DROP COLUMN \`request2_id\``);
+            yield queryRunner.query(`ALTER TABLE \`connection\` ADD \`request_id\` int NULL`);
+            yield queryRunner.query(`ALTER TABLE \`connection\` ADD CONSTRAINT \`FK_f21b63db16068277910c08bb1ee\` FOREIGN KEY (\`request_id\`) REFERENCES \`request\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        });
+    }
+    down(queryRunner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield queryRunner.query(`ALTER TABLE \`connection\` DROP FOREIGN KEY \`FK_f21b63db16068277910c08bb1ee\``);
+            yield queryRunner.query(`ALTER TABLE \`connection\` DROP COLUMN \`request_id\``);
+            yield queryRunner.query(`ALTER TABLE \`connection\` ADD \`request2_id\` int NULL`);
+            yield queryRunner.query(`ALTER TABLE \`connection\` ADD \`request1_id\` int NULL`);
+            yield queryRunner.query(`ALTER TABLE \`connection\` ADD CONSTRAINT \`FK_c5e7b716e32c369affd3b5d53ab\` FOREIGN KEY (\`request1_id\`) REFERENCES \`request\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+            yield queryRunner.query(`ALTER TABLE \`connection\` ADD CONSTRAINT \`FK_4dbcf398cf5113a67cde4d47254\` FOREIGN KEY (\`request2_id\`) REFERENCES \`request\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        });
+    }
+}
+exports.connectionsUpdate1683908691683 = connectionsUpdate1683908691683;
+//# sourceMappingURL=1683908691683-connections-update.js.map

package/dist/migrations/1683908691683-connections-update.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1683908691683-connections-update.js","sourceRoot":"","sources":["../../src/migrations/1683908691683-connections-update.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,8BAA8B;IAA3C;QACI,SAAI,GAAG,gCAAgC,CAAA;IAoB3C,CAAC;IAlBgB,EAAE,CAAC,WAAwB;;YACpC,MAAM,WAAW,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;YAC1G,MAAM,WAAW,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;YAC1G,MAAM,WAAW,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAClF,MAAM,WAAW,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAClF,MAAM,WAAW,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YAClF,MAAM,WAAW,CAAC,KAAK,CAAC,gLAAgL,CAAC,CAAC;QAC9M,CAAC;KAAA;IAEY,IAAI,CAAC,WAAwB;;YACtC,MAAM,WAAW,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;YAC1G,MAAM,WAAW,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;YACjF,MAAM,WAAW,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YACnF,MAAM,WAAW,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YACnF,MAAM,WAAW,CAAC,KAAK,CAAC,iLAAiL,CAAC,CAAC;YAC3M,MAAM,WAAW,CAAC,KAAK,CAAC,iLAAiL,CAAC,CAAC;QAC/M,CAAC;KAAA;CAEJ;AArBD,wEAqBC"}

package/dist/tsconfig.tsbuildinfo

@@ -2717,8 +2717,8 @@
         "affectsGlobalScope": false
       },
       "../src/entity/connection.ts": {
-        "version": "596c229836f3705e5863100507dd72c9c161cf09803cdf691f5bdb0deaaea29d",
-        "signature": "a442173c7242a17a8ced50e6bba05b440355edf563bbd1628ddf399820b9fe45",
+        "version": "d8cd74dfa399911ebbc43a62bf2f8c871569d53e749ae9cc8d889ff7366df446",
+        "signature": "9d4200ad07a05480fe32aa2e741f44c36bc45a8ddaafe9868cc5ff69acc38920",
         "affectsGlobalScope": false
       },
       "../src/entity/index.ts": {
@@ -3226,6 +3226,11 @@
         "signature": "99f6bae5f921c2b2c4355c1f465af8db7cc21929a20db7be7b52acfe2d8088a2",
         "affectsGlobalScope": false
       },
+      "../src/migrations/1683908691683-connections-update.ts": {
+        "version": "179154dfe019279cf20314fbbc6a5b32790c0b892101ace6aceac30aa05051c0",
+        "signature": "4c988ff5b4dbd1fa6dee8795eed5340466ee611f55b4e5d9c3a094ca0a7c470f",
+        "affectsGlobalScope": false
+      },
       "../src/migrations/execute/index.ts": {
         "version": "8b5bf13d095aeb57afd593adf3d799681176a13c327e2f77e0028e178c4ee3b9",
         "signature": "8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881",
@@ -6021,6 +6026,9 @@
       "../src/migrations/1683904619468-connections.ts": [
         "../node_modules/typeorm/index.d.ts"
       ],
+      "../src/migrations/1683908691683-connections-update.ts": [
+        "../node_modules/typeorm/index.d.ts"
+      ],
       "../src/migrations/execute/index.ts": [
         "../src/config/connect.ts"
       ],
@@ -8033,6 +8041,7 @@
       ],
       "../src/entity/connection.ts": [
         "../src/entity/auditedmodel.ts",
+        "../src/entity/request.ts",
         "../src/entity/user.ts"
       ],
       "../src/entity/courier.ts": [
@@ -8670,6 +8679,9 @@
       "../src/migrations/1683904619468-connections.ts": [
         "../node_modules/typeorm/index.d.ts"
       ],
+      "../src/migrations/1683908691683-connections-update.ts": [
+        "../node_modules/typeorm/index.d.ts"
+      ],
       "../src/migrations/index.ts": [
         "../src/migrations/1628474597284-initialschema.ts",
         "../src/migrations/1630077596132-removemangopay.ts",
@@ -9462,6 +9474,7 @@
       "../src/migrations/1683322405116-translate.ts",
       "../src/migrations/1683656076895-promote_to_production_09_05_2023.ts",
       "../src/migrations/1683904619468-connections.ts",
+      "../src/migrations/1683908691683-connections-update.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.67",
+    "version": "1.0.68",
     "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.67",
-        "@reachu/utils": "1.0.67",
+        "@reachu/logger": "1.0.68",
+        "@reachu/utils": "1.0.68",
         "dotenv": "8.0.0",
         "express": "4.17.1",
         "mysql2": "1.5.2",

package/src/entity/Connection.ts

@@ -34,13 +34,7 @@ export default class Connection extends AuditedModel {
     onDelete: 'CASCADE',
   })
   @JoinColumn()
-  request1: User;
-
-  @ManyToOne(() => Request, (request: Request) => request.id, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn()
-  request2: User;
+  request: Request;
 
   @Column('varchar', { nullable: false })
   state: string;

package/src/migrations/1683908691683-connections-update.ts

@@ -0,0 +1,24 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class connectionsUpdate1683908691683 implements MigrationInterface {
+    name = 'connectionsUpdate1683908691683'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`connection\` DROP FOREIGN KEY \`FK_4dbcf398cf5113a67cde4d47254\``);
+        await queryRunner.query(`ALTER TABLE \`connection\` DROP FOREIGN KEY \`FK_c5e7b716e32c369affd3b5d53ab\``);
+        await queryRunner.query(`ALTER TABLE \`connection\` DROP COLUMN \`request1_id\``);
+        await queryRunner.query(`ALTER TABLE \`connection\` DROP COLUMN \`request2_id\``);
+        await queryRunner.query(`ALTER TABLE \`connection\` ADD \`request_id\` int NULL`);
+        await queryRunner.query(`ALTER TABLE \`connection\` ADD CONSTRAINT \`FK_f21b63db16068277910c08bb1ee\` FOREIGN KEY (\`request_id\`) REFERENCES \`request\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`connection\` DROP FOREIGN KEY \`FK_f21b63db16068277910c08bb1ee\``);
+        await queryRunner.query(`ALTER TABLE \`connection\` DROP COLUMN \`request_id\``);
+        await queryRunner.query(`ALTER TABLE \`connection\` ADD \`request2_id\` int NULL`);
+        await queryRunner.query(`ALTER TABLE \`connection\` ADD \`request1_id\` int NULL`);
+        await queryRunner.query(`ALTER TABLE \`connection\` ADD CONSTRAINT \`FK_c5e7b716e32c369affd3b5d53ab\` FOREIGN KEY (\`request1_id\`) REFERENCES \`request\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE \`connection\` ADD CONSTRAINT \`FK_4dbcf398cf5113a67cde4d47254\` FOREIGN KEY (\`request2_id\`) REFERENCES \`request\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+}