pg-mvc-service 1.0.6 → 1.0.7

package/dist/Service.js

@@ -127,7 +127,7 @@ class Service {
             });
             return;
         }
-        else if (ex instanceof Exception_1.BusinessLogicException) {
+        else if (ex instanceof Exception_1.UnprocessableException) {
             this.res.status(422).json({
                 errorCode: `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage: ex.message

package/dist/exceptions/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BusinessLogicException = exports.DbConflictException = exports.MaintenanceException = exports.InputErrorException = exports.ForbiddenException = exports.AuthException = void 0;
+exports.UnprocessableException = exports.DbConflictException = exports.MaintenanceException = exports.InputErrorException = exports.ForbiddenException = exports.AuthException = void 0;
 class AuthException extends Error {
     get Id() {
         return this.id;
@@ -44,7 +44,7 @@ class DbConflictException extends Error {
     }
 }
 exports.DbConflictException = DbConflictException;
-class BusinessLogicException extends Error {
+class UnprocessableException extends Error {
     get ErrorId() {
         return this.errorId;
     }
@@ -55,4 +55,4 @@ class BusinessLogicException extends Error {
         this.errorId = errorId;
     }
 }
-exports.BusinessLogicException = BusinessLogicException;
+exports.UnprocessableException = UnprocessableException;

package/dist/index.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "AuthException", { enumerable: true, get: functio
 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; } });
+Object.defineProperty(exports, "BusinessLogicException", { enumerable: true, get: function () { return Exception_1.UnprocessableException; } });
 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

@@ -366,9 +366,6 @@ class TableModel {
             return { datas: data.rows, count: Number(countData.rows[0].count), lastPage: Math.ceil(Number(countData.rows[0].count) / this.PageCount) };
         });
     }
-    throwValidationError(code, message) {
-        throw new Exception_1.InputErrorException(code, message);
-    }
     validateOptions(options, isInsert) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Object.keys(options).length === 0) {
@@ -384,17 +381,17 @@ class TableModel {
                     if (column.attribute === 'nullable') {
                         continue;
                     }
-                    this.throwValidationError("001", this.errorMessages.null.replace('{name}', name));
+                    throw new Exception_1.UnprocessableException("001", this.errorMessages.null.replace('{name}', name));
                 }
                 if (ValidateValueUtil_1.default.isErrorValue(column.type, value)) {
-                    this.throwValidationError("002", this.errorMessages[column.type].replace('{name}', name));
+                    throw new Exception_1.UnprocessableException("002", this.errorMessages[column.type].replace('{name}', name));
                 }
                 if (column.type === 'string') {
                     if (Number.isInteger(column.length) === false) {
                         throw new Error(`For strings, please specify the length of the column.(column: ${column.columnName})`);
                     }
                     if (value.toString().length > column.length) {
-                        this.throwValidationError("003", this.errorMessages.length.replace('{name}', name).replace('{length}', column.toString()));
+                        throw new Exception_1.UnprocessableException("003", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
                     }
                 }
                 else if (column.type === 'string[]') {
@@ -404,7 +401,7 @@ class TableModel {
                     // ValidateValueUtil.isErrorValue(column.type, value)で型チェックしてるのでas []にしている
                     for (const v of value) {
                         if (v.toString().length > column.length) {
-                            this.throwValidationError("004", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
+                            throw new Exception_1.UnprocessableException("004", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
                         }
                     }
                 }
@@ -420,16 +417,14 @@ class TableModel {
                     // 一部の値がnullの場合はエラー
                     if (refValues.some(value => value === null || value === undefined)) {
                         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(',');
-                        this.throwValidationError("004", this.errorMessages.fk.replace('{name}', name));
+                        throw new Exception_1.UnprocessableException("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++}`).join(" AND ")}`;
                     const datas = yield this.clientQuery(sql, refValues);
-                    console.log(datas);
-                    console.log(datas.rows[0].count == "0");
                     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(',');
-                        this.throwValidationError("004", this.errorMessages.fk.replace('{name}', name));
+                        throw new Exception_1.UnprocessableException("004", this.errorMessages.fk.replace('{name}', name));
                     }
                 }
             }
@@ -443,7 +438,7 @@ class TableModel {
                 if (options[key] === undefined || options[key] === null) {
                     // Null許容されていないカラムにNULLを入れようとしているか？
                     if (column.attribute === "primary" || column.attribute === "noDefault") {
-                        this.throwValidationError("101", this.errorMessages.notInput.replace('{name}', name));
+                        throw new Exception_1.UnprocessableException("101", this.errorMessages.notInput.replace('{name}', name));
                     }
                 }
             }
@@ -533,7 +528,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) {
-                throw new Exception_1.BusinessLogicException("201", this.errorMessages.idNotExist.replace('{id}', id));
+                throw new Exception_1.UnprocessableException("201", this.errorMessages.idNotExist.replace('{id}', id));
             }
         });
     }
@@ -567,7 +562,7 @@ class TableModel {
             let sql = `DELETE FROM ${this.TableName} WHERE id = $1`;
             const datas = yield this.executeQuery(sql, [id]);
             if (datas.rowCount !== 1) {
-                throw new Exception_1.BusinessLogicException("301", this.errorMessages.idNotExist.replace('{id}', id));
+                throw new Exception_1.UnprocessableException("301", this.errorMessages.idNotExist.replace('{id}', id));
             }
         });
     }

package/dist/models/ValidateClient.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Exception_1 = require("../exceptions/Exception");
 class ValidateClient {
     constructor(model) {
         this.model = model;
@@ -50,7 +51,7 @@ class ValidateClient {
             message = message.replace('{column}', (_b = column.alias) !== null && _b !== void 0 ? _b : column.columnName);
             message = message.replace('{value}', value.toString());
             message = message.replace('{list}', list.join(', '));
-            this.model.throwValidationError(code, message);
+            throw new Exception_1.UnprocessableException(code, message);
         }
     }
     validateUnderNow(option, key, error) {
@@ -73,7 +74,7 @@ class ValidateClient {
             }
             message = message.replace('{column}', (_b = column.alias) !== null && _b !== void 0 ? _b : column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new Exception_1.UnprocessableException(code, message);
         }
     }
     validateUnderToday(option, key, isErrorToday, error) {
@@ -109,7 +110,7 @@ class ValidateClient {
             }
             message = message.replace('{column}', (_b = column.alias) !== null && _b !== void 0 ? _b : column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new Exception_1.UnprocessableException(code, message);
         }
     }
     validateRegExp(option, key, regExp, error) {
@@ -133,7 +134,7 @@ class ValidateClient {
             }
             message = message.replace('{column}', (_b = column.alias) !== null && _b !== void 0 ? _b : column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new Exception_1.UnprocessableException(code, message);
         }
     }
     validatePositiveNumber(option, key, error) {
@@ -157,7 +158,7 @@ class ValidateClient {
             }
             message = message.replace('{column}', (_b = column.alias) !== null && _b !== void 0 ? _b : column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new Exception_1.UnprocessableException(code, message);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "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, DbConflictException, BusinessLogicException } from './exceptions/Exception';
+import { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, UnprocessableException } from './exceptions/Exception';
 import { RequestType } from './reqestResponse/RequestType';
 import { ResponseType } from './reqestResponse/ResponseType';
 import { AwsS3Client } from './clients/AwsS3Client';
@@ -110,7 +110,7 @@ export class Service {
                 errorMessage : ex.message
             });
             return;
-        } else if (ex instanceof BusinessLogicException) {
+        } else if (ex instanceof UnprocessableException) {
             this.res.status(422).json({
                 errorCode : `${this.apiCode}-${ex.ErrorId}`,
                 errorMessage : ex.message

package/src/exceptions/Exception.ts

@@ -45,7 +45,7 @@ export class DbConflictException extends Error {
     }
 }
 
-export class BusinessLogicException extends Error {
+export class UnprocessableException extends Error {
     // for 422 Unprocessable Entity
     private errorId: string = "";
     get ErrorId(): string {

package/src/index.ts

@@ -1,5 +1,5 @@
 export { Service } from './Service';
-export { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, BusinessLogicException } from './exceptions/Exception';
+export { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, UnprocessableException as 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,7 +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';
+import { UnprocessableException } from '../exceptions/Exception';
 
 export class TableModel {
 
@@ -422,9 +422,6 @@ export class TableModel {
         'fk': 'The value of {name} does not exist in the table.',
         'idNotExist': 'The specified ID({id}) does not exist in the table.',
     }
-    public throwValidationError(code: string, message: string): never {
-        throw new InputErrorException(code, message);
-    }
 
     protected async validateOptions(options: TOption, isInsert: boolean): Promise<void> {
         if (Object.keys(options).length === 0) {
@@ -442,11 +439,11 @@ export class TableModel {
                 if (column.attribute === 'nullable') {
                     continue;
                 }
-                this.throwValidationError("001", this.errorMessages.null.replace('{name}', name));
+                throw new UnprocessableException("001", this.errorMessages.null.replace('{name}', name));
             }
 
             if (ValidateValueUtil.isErrorValue(column.type, value)) {
-                this.throwValidationError("002", this.errorMessages[column.type].replace('{name}', name));
+                throw new UnprocessableException("002", this.errorMessages[column.type].replace('{name}', name));
             }
 
             if (column.type === 'string') {
@@ -455,7 +452,7 @@ export class TableModel {
                 }
 
                 if (value.toString().length > column.length) {
-                    this.throwValidationError("003", this.errorMessages.length.replace('{name}', name).replace('{length}', column.toString()));
+                    throw new UnprocessableException("003", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
                 }
             } else if (column.type === 'string[]') {
                 if (Number.isInteger(column.length) === false) {
@@ -465,7 +462,7 @@ export class TableModel {
                 // ValidateValueUtil.isErrorValue(column.type, value)で型チェックしてるのでas []にしている
                 for (const v of value as Array<string | number | boolean>) {
                     if (v.toString().length > column.length) {
-                        this.throwValidationError("004", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
+                        throw new UnprocessableException("004", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
                     }
                 }
             }
@@ -483,17 +480,15 @@ export class TableModel {
                 // 一部の値がnullの場合はエラー
                 if (refValues.some(value => value === null || value === undefined)) {
                     const name = ref.columns.map(col => this.getColumn(col.target).alias ?? this.getColumn(col.target).columnName).join(',');
-                    this.throwValidationError("004", this.errorMessages.fk.replace('{name}', name));
+                    throw new UnprocessableException("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++}`).join(" AND ")}`;
                 const datas = await this.clientQuery(sql, refValues);
-                console.log(datas);
-                console.log(datas.rows[0].count == "0");
                 if (datas.rows[0].count == "0") {
                     const name = ref.columns.map(col => this.getColumn(col.target).alias ?? this.getColumn(col.target).columnName).join(',');
-                    this.throwValidationError("004", this.errorMessages.fk.replace('{name}', name));
+                    throw new UnprocessableException("004", this.errorMessages.fk.replace('{name}', name));
                 }
             }
         }
@@ -506,7 +501,7 @@ export class TableModel {
             if (options[key] === undefined || options[key] === null) {
                 // Null許容されていないカラムにNULLを入れようとしているか？
                 if (column.attribute === "primary" || column.attribute === "noDefault") {
-                    this.throwValidationError("101", this.errorMessages.notInput.replace('{name}', name));
+                    throw new UnprocessableException("101", this.errorMessages.notInput.replace('{name}', name));
                 }
             }
         }
@@ -601,7 +596,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) {
-            throw new BusinessLogicException("201", this.errorMessages.idNotExist.replace('{id}', id));
+            throw new UnprocessableException("201", this.errorMessages.idNotExist.replace('{id}', id));
         }
     }
 
@@ -638,7 +633,7 @@ export class TableModel {
 
         const datas = await this.executeQuery(sql, [id]);
         if (datas.rowCount !== 1) {
-            throw new BusinessLogicException("301", this.errorMessages.idNotExist.replace('{id}', id));
+            throw new UnprocessableException("301", this.errorMessages.idNotExist.replace('{id}', id));
         }
     }
 

package/src/models/ValidateClient.ts

@@ -1,3 +1,4 @@
+import { UnprocessableException } from "../exceptions/Exception";
 import { TableModel } from "./TableModel";
 import { TOption, TSqlValue } from "./Type";
 
@@ -58,7 +59,7 @@ export default class ValidateClient {
             message = message.replace('{column}', column.alias ?? column.columnName);
             message = message.replace('{value}', value.toString());
             message = message.replace('{list}', list.join(', '));
-            this.model.throwValidationError(code, message);
+            throw new UnprocessableException(code, message);
         }
     }
 
@@ -83,7 +84,7 @@ export default class ValidateClient {
             }
             message = message.replace('{column}', column.alias ?? column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new UnprocessableException(code, message);
         }
     }
 
@@ -122,7 +123,7 @@ export default class ValidateClient {
             }
             message = message.replace('{column}', column.alias ?? column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new UnprocessableException(code, message);
         }
     }
 
@@ -149,7 +150,7 @@ export default class ValidateClient {
             }
             message = message.replace('{column}', column.alias ?? column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new UnprocessableException(code, message);
         }
     }
 
@@ -176,7 +177,7 @@ export default class ValidateClient {
             }
             message = message.replace('{column}', column.alias ?? column.columnName);
             message = message.replace('{value}', value.toString());
-            this.model.throwValidationError(code, message);
+            throw new UnprocessableException(code, message);
         }
     }
 }

package/dist/models/index.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MigrateDatabase = exports.rollback = exports.migrate = exports.MigrateTable = exports.createTableDoc = exports.TableModel = void 0;
-var TableModel_1 = require("./TableModel");
-Object.defineProperty(exports, "TableModel", { enumerable: true, get: function () { return TableModel_1.TableModel; } });
-var TableDoc_1 = require("./TableDoc");
-Object.defineProperty(exports, "createTableDoc", { enumerable: true, get: function () { return TableDoc_1.createTableDoc; } });
-var MigrateTable_1 = require("./MigrateTable");
-Object.defineProperty(exports, "MigrateTable", { enumerable: true, get: function () { return MigrateTable_1.MigrateTable; } });
-var MigrateRollback_1 = require("./MigrateRollback");
-Object.defineProperty(exports, "migrate", { enumerable: true, get: function () { return MigrateRollback_1.migrate; } });
-Object.defineProperty(exports, "rollback", { enumerable: true, get: function () { return MigrateRollback_1.rollback; } });
-var MigrateDatabase_1 = require("./MigrateDatabase");
-Object.defineProperty(exports, "MigrateDatabase", { enumerable: true, get: function () { return MigrateDatabase_1.MigrateDatabase; } });

package/src/models/index.ts

@@ -1,7 +0,0 @@
-export { TableModel } from './TableModel';
-export { createTableDoc } from './TableDoc';
-
-export { MigrateTable } from './MigrateTable'; 
-export { migrate, rollback } from './MigrateRollback';
-
-export { MigrateDatabase } from './MigrateDatabase';