pg-mvc-service 1.0.4 → 1.0.5

package/dist/Service.js

@@ -120,6 +120,20 @@ class Service {
             });
             return;
         }
+        else if (ex instanceof Exception_1.DbConflictException) {
+            this.res.status(409).json({
+                errorCode: `${this.apiCode}-${ex.ErrorId}`,
+                errorMessage: ex.message
+            });
+            return;
+        }
+        else if (ex instanceof Exception_1.BusinessLogicException) {
+            this.res.status(422).json({
+                errorCode: `${this.apiCode}-${ex.ErrorId}`,
+                errorMessage: ex.message
+            });
+            return;
+        }
         else if (ex instanceof Exception_1.MaintenanceException) {
             this.res.status(503).json({
                 errorMessage: ex.message

package/dist/exceptions/Exception.js

@@ -19,15 +19,10 @@ class InputErrorException extends Error {
     get ErrorId() {
         return this.errorId;
     }
-    get ErrorLog() {
-        return this.errorLog;
-    }
-    constructor(errorId, message = "", errorLog = "") {
+    constructor(errorId, message = "") {
         super(message);
         this.errorId = "";
-        this.errorLog = "";
         this.errorId = errorId;
-        this.errorLog = errorLog;
     }
 }
 exports.InputErrorException = InputErrorException;
@@ -38,16 +33,26 @@ class MaintenanceException extends Error {
 }
 exports.MaintenanceException = MaintenanceException;
 class DbConflictException extends Error {
-    // for 409 Conflict
-    constructor(message = "") {
+    get ErrorId() {
+        return this.errorId;
+    }
+    constructor(errorId, message = "") {
         super(message);
+        // for 409 Conflict
+        this.errorId = "";
+        this.errorId = errorId;
     }
 }
 exports.DbConflictException = DbConflictException;
 class BusinessLogicException extends Error {
-    // for 422 Unprocessable Entity
-    constructor(message = "") {
+    get ErrorId() {
+        return this.errorId;
+    }
+    constructor(errorId, message = "") {
         super(message);
+        // for 422 Unprocessable Entity
+        this.errorId = "";
+        this.errorId = errorId;
     }
 }
 exports.BusinessLogicException = BusinessLogicException;

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rollback = exports.migrate = exports.MigrateDatabase = exports.MigrateTable = exports.createTableDoc = exports.TableModel = exports.ResponseType = exports.RequestType = exports.EncryptClient = exports.StringClient = exports.Base64Client = exports.AwsS3Client = exports.createSwagger = exports.ForbiddenException = exports.InputErrorException = exports.AuthException = exports.MaintenanceException = exports.Service = void 0;
+exports.rollback = exports.migrate = exports.MigrateDatabase = exports.MigrateTable = exports.createTableDoc = exports.TableModel = exports.ResponseType = exports.RequestType = exports.EncryptClient = exports.StringClient = exports.Base64Client = exports.AwsS3Client = exports.createSwagger = exports.BusinessLogicException = exports.DbConflictException = exports.ForbiddenException = exports.InputErrorException = exports.AuthException = exports.MaintenanceException = exports.Service = void 0;
 var Service_1 = require("./Service");
 Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return Service_1.Service; } });
 var Exception_1 = require("./exceptions/Exception");
@@ -8,6 +8,8 @@ Object.defineProperty(exports, "MaintenanceException", { enumerable: true, get:
 Object.defineProperty(exports, "AuthException", { enumerable: true, get: function () { return Exception_1.AuthException; } });
 Object.defineProperty(exports, "InputErrorException", { enumerable: true, get: function () { return Exception_1.InputErrorException; } });
 Object.defineProperty(exports, "ForbiddenException", { enumerable: true, get: function () { return Exception_1.ForbiddenException; } });
+Object.defineProperty(exports, "DbConflictException", { enumerable: true, get: function () { return Exception_1.DbConflictException; } });
+Object.defineProperty(exports, "BusinessLogicException", { enumerable: true, get: function () { return Exception_1.BusinessLogicException; } });
 var Swagger_1 = require("./documents/Swagger");
 Object.defineProperty(exports, "createSwagger", { enumerable: true, get: function () { return Swagger_1.createSwagger; } });
 var AwsS3Client_1 = require("./clients/AwsS3Client");

package/dist/models/TableModel.js

@@ -17,6 +17,7 @@ const ValidateValueUtil_1 = __importDefault(require("./SqlUtils/ValidateValueUti
 const SelectExpression_1 = __importDefault(require("./SqlUtils/SelectExpression"));
 const WhereExpression_1 = __importDefault(require("./SqlUtils/WhereExpression"));
 const ValidateClient_1 = __importDefault(require("./ValidateClient"));
+const Exception_1 = require("../exceptions/Exception");
 class TableModel {
     get DbName() { return this.dbName; }
     get TableName() {
@@ -366,7 +367,7 @@ class TableModel {
         });
     }
     throwValidationError(code, message) {
-        throw new Error(message);
+        throw new Exception_1.InputErrorException(code, message);
     }
     validateOptions(options, isInsert) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -422,7 +423,7 @@ class TableModel {
                         this.throwValidationError("004", this.errorMessages.fk.replace('{name}', name));
                     }
                     let refIndex = 1;
-                    const sql = `SELECT COUNT(*) as count FROM ${ref.table} WHERE ${ref.columns.map(col => `${col.ref} = $${refIndex++}`)}`;
+                    const sql = `SELECT COUNT(*) as count FROM ${ref.table} WHERE ${ref.columns.map(col => `${col.ref} = $${refIndex++}`).join(" AND ")}`;
                     const datas = yield this.clientQuery(sql, refValues);
                     if (datas.rows[0].count == "0") {
                         const name = ref.columns.map(col => { var _a; return (_a = this.getColumn(col.target).alias) !== null && _a !== void 0 ? _a : this.getColumn(col.target).columnName; }).join(',');
@@ -530,7 +531,7 @@ class TableModel {
             const sql = `UPDATE ${this.TableName} SET ${updateExpressions.join(',')} WHERE id = $${vars.length}`;
             const data = yield this.executeQuery(sql, vars);
             if (data.rowCount !== 1) {
-                this.throwValidationError("201", this.errorMessages.idNotExist.replace('{id}', id));
+                throw new Exception_1.BusinessLogicException("201", this.errorMessages.idNotExist.replace('{id}', id));
             }
         });
     }
@@ -564,7 +565,7 @@ class TableModel {
             let sql = `DELETE FROM ${this.TableName} WHERE id = $1`;
             const datas = yield this.executeQuery(sql, [id]);
             if (datas.rowCount !== 1) {
-                this.throwValidationError("301", this.errorMessages.idNotExist.replace('{id}', id));
+                throw new Exception_1.BusinessLogicException("301", this.errorMessages.idNotExist.replace('{id}', id));
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
   "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
   "bugs": {

package/src/Service.ts

@@ -1,7 +1,7 @@
 import axios, { AxiosResponse } from "axios";
 import { Request, Response } from 'express';
 import { Pool, type PoolClient } from 'pg';
-import { MaintenanceException, AuthException, InputErrorException, ForbiddenException } from './exceptions/Exception';
+import { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, BusinessLogicException } from './exceptions/Exception';
 import { RequestType } from './reqestResponse/RequestType';
 import { ResponseType } from './reqestResponse/ResponseType';
 import { AwsS3Client } from './clients/AwsS3Client';
@@ -104,6 +104,18 @@ export class Service {
                 errorMessage : ex.message
             });
             return;
+        } else if (ex instanceof DbConflictException) {
+            this.res.status(409).json({
+                errorCode : `${this.apiCode}-${ex.ErrorId}`,
+                errorMessage : ex.message
+            });
+            return;
+        } else if (ex instanceof BusinessLogicException) {
+            this.res.status(422).json({
+                errorCode : `${this.apiCode}-${ex.ErrorId}`,
+                errorMessage : ex.message
+            });
+            return;
         } else if (ex instanceof MaintenanceException) {
             this.res.status(503).json({
                 errorMessage : ex.message
@@ -242,7 +254,7 @@ export class Service {
             }
         } catch (ex) {
             let response = (ex as any).response as AxiosResponse<TResponse>;
-            if (response && [400,401,403,409,422].includes(response.status)) {
+            if (response && [400, 401, 403, 409, 422].includes(response.status)) {
                 return response;
             }
             throw ex;

package/src/exceptions/Exception.ts

@@ -14,21 +14,14 @@ export class ForbiddenException extends Error {
 }
 
 export class InputErrorException extends Error {
-    
     private errorId: string = "";
     get ErrorId(): string {
         return this.errorId;
     }
 
-    private errorLog: string = "";
-    get ErrorLog(): string {
-        return this.errorLog;
-    }
-
-    constructor(errorId: string, message: string = "", errorLog: string = "") {
+    constructor(errorId: string, message: string = "") {
         super(message);
         this.errorId = errorId;
-        this.errorLog = errorLog;
     }
 }
 
@@ -41,14 +34,26 @@ export class MaintenanceException extends Error {
 
 export class DbConflictException extends Error {
     // for 409 Conflict
-    constructor(message: string = "") {
+    private errorId: string = "";
+    get ErrorId(): string {
+        return this.errorId;
+    }
+
+    constructor(errorId: string, message: string = "") {
         super(message);
+        this.errorId = errorId;
     }
 }
 
 export class BusinessLogicException extends Error {
     // for 422 Unprocessable Entity
-    constructor(message: string = "") {
+    private errorId: string = "";
+    get ErrorId(): string {
+        return this.errorId;
+    }
+
+    constructor(errorId: string, message: string = "") {
         super(message);
+        this.errorId = errorId;
     }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 export { Service } from './Service';
-export { MaintenanceException, AuthException, InputErrorException, ForbiddenException } from './exceptions/Exception';
+export { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, BusinessLogicException } from './exceptions/Exception';
 export { createSwagger } from './documents/Swagger';
 export { AwsS3Client } from './clients/AwsS3Client';
 export { Base64Client } from './clients/Base64Client';

package/src/models/TableModel.ts

@@ -4,6 +4,7 @@ import ValidateValueUtil from './SqlUtils/ValidateValueUtil';
 import SelectExpression from './SqlUtils/SelectExpression';
 import WhereExpression from './SqlUtils/WhereExpression';
 import ValidateClient from './ValidateClient';
+import { BusinessLogicException, InputErrorException } from '../exceptions/Exception';
 
 export class TableModel {
 
@@ -422,7 +423,7 @@ export class TableModel {
         'idNotExist': 'The specified ID({id}) does not exist in the table.',
     }
     public throwValidationError(code: string, message: string): never {
-        throw new Error(message);
+        throw new InputErrorException(code, message);
     }
 
     protected async validateOptions(options: TOption, isInsert: boolean): Promise<void> {
@@ -486,7 +487,7 @@ export class TableModel {
                 }
 
                 let refIndex = 1;
-                const sql = `SELECT COUNT(*) as count FROM ${ref.table} WHERE ${ref.columns.map(col => `${col.ref} = $${refIndex++}`)}`;
+                const sql = `SELECT COUNT(*) as count FROM ${ref.table} WHERE ${ref.columns.map(col => `${col.ref} = $${refIndex++}`).join(" AND ")}`;
                 const datas = await this.clientQuery(sql, refValues);
                 if (datas.rows[0].count == "0") {
                     const name = ref.columns.map(col => this.getColumn(col.target).alias ?? this.getColumn(col.target).columnName).join(',');
@@ -598,7 +599,7 @@ export class TableModel {
         const sql = `UPDATE ${this.TableName} SET ${updateExpressions.join(',')} WHERE id = $${vars.length}`;
         const data = await this.executeQuery(sql, vars);
         if (data.rowCount !== 1) {
-            this.throwValidationError("201", this.errorMessages.idNotExist.replace('{id}', id));
+            throw new BusinessLogicException("201", this.errorMessages.idNotExist.replace('{id}', id));
         }
     }
 
@@ -635,7 +636,7 @@ export class TableModel {
 
         const datas = await this.executeQuery(sql, [id]);
         if (datas.rowCount !== 1) {
-            this.throwValidationError("301", this.errorMessages.idNotExist.replace('{id}', id));
+            throw new BusinessLogicException("301", this.errorMessages.idNotExist.replace('{id}', id));
         }
     }