pg-mvc-service 1.0.8 → 1.0.10

package/dist/clients/AwsS3Client.js

@@ -136,7 +136,8 @@ class AwsS3Client {
     }
     getText(path, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, e_1, _b, _c;
+            var _d;
             try {
                 const command = new client_s3_1.GetObjectCommand({
                     Bucket: this.bucketName,
@@ -146,18 +147,39 @@ class AwsS3Client {
                 if (res.Body === undefined) {
                     throw new Error(`Failed to get text data. Response body is undefined.`);
                 }
-                if (((_a = res.ContentType) === null || _a === void 0 ? void 0 : _a.startsWith('text/')) === false) {
+                if (((_d = res.ContentType) === null || _d === void 0 ? void 0 : _d.startsWith('text/')) === false) {
                     throw new Error(`Cannot get text data from non-text file. ContentType: ${res.ContentType}`);
                 }
                 // v3ではBodyがReadableStreamなので、変換が必要
-                const stream = res.Body;
-                const reader = stream.getReader();
                 const chunks = [];
-                while (true) {
-                    const { done, value } = yield reader.read();
-                    if (done)
-                        break;
-                    chunks.push(value);
+                if (res.Body && typeof res.Body === 'object' && 'getReader' in res.Body) {
+                    // ReadableStreamの場合
+                    const stream = res.Body;
+                    const reader = stream.getReader();
+                    while (true) {
+                        const { done, value } = yield reader.read();
+                        if (done)
+                            break;
+                        chunks.push(value);
+                    }
+                }
+                else {
+                    try {
+                        // Node.js Readableの場合
+                        for (var _e = true, _f = __asyncValues(res.Body), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
+                            _c = _g.value;
+                            _e = false;
+                            const chunk = _c;
+                            chunks.push(chunk);
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
                 }
                 const buffer = Buffer.concat(chunks);
                 return buffer.toString('utf-8');
@@ -183,7 +205,7 @@ class AwsS3Client {
     }
     getDataFronJson(path, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, e_1, _b, _c;
+            var _a, e_2, _b, _c;
             const command = new client_s3_1.GetObjectCommand({
                 Bucket: this.bucketName,
                 Key: this.makeKey(path, fileName),
@@ -205,12 +227,12 @@ class AwsS3Client {
                     chunks.push(chunk);
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_2) throw e_2.error; }
             }
             const buffer = Buffer.concat(chunks);
             const jsonString = buffer.toString('utf-8');

package/dist/exceptions/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnprocessableException = exports.DbConflictException = exports.MaintenanceException = exports.InputErrorException = exports.ForbiddenException = exports.AuthException = void 0;
+exports.UnprocessableException = exports.DbConflictException = exports.NotFoundException = exports.MaintenanceException = exports.InputErrorException = exports.ForbiddenException = exports.AuthException = void 0;
 class AuthException extends Error {
     get Id() {
         return this.id;
@@ -32,6 +32,18 @@ class MaintenanceException extends Error {
     }
 }
 exports.MaintenanceException = MaintenanceException;
+class NotFoundException extends Error {
+    get ErrorId() {
+        return this.errorId;
+    }
+    constructor(errorId, message = "") {
+        super(message);
+        // for 404 Not Found
+        this.errorId = "";
+        this.errorId = errorId;
+    }
+}
+exports.NotFoundException = NotFoundException;
 class DbConflictException extends Error {
     get ErrorId() {
         return this.errorId;

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.BusinessLogicException = exports.DbConflictException = 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.UnprocessableException = 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");
@@ -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.UnprocessableException; } });
+Object.defineProperty(exports, "UnprocessableException", { 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

@@ -108,7 +108,7 @@ class TableModel {
         this.groupExpression = [];
         this.sortExpression = [];
         this.vars = [];
-        this.errorMessages = {
+        this.errorMessageEnglish = {
             'string': '{name} should be entered as a string or number type.',
             'string[]': '{name} should be entered as an array of string or number types.',
             'uuid': '{name} should be entered as a UUID.',
@@ -129,6 +129,28 @@ class TableModel {
             'fk': 'The value of {name} does not exist in the table.',
             'idNotExist': 'The specified ID({id}) does not exist in the table.',
         };
+        this.errorMessageJapan = {
+            'string': '{name}はstringかnumberで入力してください。',
+            'string[]': '{name}はstringかnumberの配列で入力してください。',
+            'uuid': '{name}はuuidで入力してください。',
+            'uuid[]': '{name}はuuidの配列で入力してください。',
+            'number': '{name}はnumberか半角数字のstring型で入力してください。',
+            'number[]': '{name}はnumberか半角数字のstring型の配列で入力してください。',
+            'bool': '{name}はbool型、"true"、"false"、0、または1で入力してください。',
+            'bool[]': '{name}はbool型、"true"、"false"、0、または1の配列で入力してください。',
+            'date': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、またはDate型で入力してください。',
+            'date[]': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、またはDate型の配列で入力してください。',
+            'time': '{name}は"hh:mi"形式または"hh:mi:ss"形式で入力してください。',
+            'time[]': '{name}は"hh:mi"形式または"hh:mi:ss"形式の配列で入力してください。',
+            'timestamp': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、"YYYY-MM-DDThh:mi:ss"形式、またはDate型で入力してください。',
+            'timestamp[]': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、"YYYY-MM-DDThh:mi:ss"形式、またはDate型の配列で入力してください。',
+            'length': '{name}は{length}文字以内で入力してください。',
+            'null': '{name}はnullを許可されていません。',
+            'notInput': '{name}を入力してください。',
+            'fk': '{name}の値がテーブルに存在しません。',
+            'idNotExist': '指定されたID({id})はテーブルに存在しません。',
+        };
+        this.errorMessages = process.env.TZ === 'Asia/Tokyo' ? this.errorMessageJapan : this.errorMessageEnglish;
         this.client = client;
         if (tableAlias !== undefined && tableAlias.trim() !== '') {
             this.tableAlias = tableAlias;
@@ -366,6 +388,17 @@ class TableModel {
             return { datas: data.rows, count: Number(countData.rows[0].count), lastPage: Math.ceil(Number(countData.rows[0].count) / this.PageCount) };
         });
     }
+    throwException(code, type, columnName, vallue) {
+        var _a;
+        const column = this.getColumn(columnName);
+        let message = this.errorMessages[type];
+        const name = (column.alias === undefined || column.alias === '') ? columnName : column.alias;
+        message = message.replace('{name}', name);
+        if (message.includes("{length}") && (column.type === 'string' || column.type !== 'string[]')) {
+            message = message.replace('{length}', ((_a = column.length) !== null && _a !== void 0 ? _a : '未設定').toString());
+        }
+        throw new Exception_1.UnprocessableException(code, message);
+    }
     validateOptions(options, isInsert) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Object.keys(options).length === 0) {
@@ -376,22 +409,21 @@ class TableModel {
                 if (isInsert === false && column.attribute === 'primary') {
                     throw new Error(`${this.TableName}.${key} cannot be modified because it is a primary key.`);
                 }
-                const name = (column.alias === undefined || column.alias === '') ? key : column.alias;
                 if (value === null) {
                     if (column.attribute === 'nullable') {
                         continue;
                     }
-                    throw new Exception_1.UnprocessableException("001", this.errorMessages.null.replace('{name}', name));
+                    this.throwException("001", "null", key, value);
                 }
                 if (ValidateValueUtil_1.default.isErrorValue(column.type, value)) {
-                    throw new Exception_1.UnprocessableException("002", this.errorMessages[column.type].replace('{name}', name));
+                    this.throwException("002", column.type, key, value);
                 }
                 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) {
-                        throw new Exception_1.UnprocessableException("003", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
+                        this.throwException("003", "length", key, value);
                     }
                 }
                 else if (column.type === 'string[]') {
@@ -401,7 +433,7 @@ class TableModel {
                     // ValidateValueUtil.isErrorValue(column.type, value)で型チェックしてるのでas []にしている
                     for (const v of value) {
                         if (v.toString().length > column.length) {
-                            throw new Exception_1.UnprocessableException("004", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
+                            this.throwException("004", "length", key, value);
                         }
                     }
                 }
@@ -417,14 +449,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(',');
-                        throw new Exception_1.UnprocessableException("004", this.errorMessages.fk.replace('{name}', name));
+                        throw new Exception_1.UnprocessableException("005", this.errorMessages.null.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);
                     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(',');
-                        throw new Exception_1.UnprocessableException("004", this.errorMessages.fk.replace('{name}', name));
+                        throw new Exception_1.DbConflictException("006", this.errorMessages.fk.replace('{name}', name));
                     }
                 }
             }
@@ -438,7 +470,7 @@ class TableModel {
                 if (options[key] === undefined || options[key] === null) {
                     // Null許容されていないカラムにNULLを入れようとしているか？
                     if (column.attribute === "primary" || column.attribute === "noDefault") {
-                        throw new Exception_1.UnprocessableException("101", this.errorMessages.notInput.replace('{name}', name));
+                        this.throwException("101", "notInput", key, options[key]);
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-mvc-service",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "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, UnprocessableException } from './exceptions/Exception';
+import { MaintenanceException, AuthException, InputErrorException, ForbiddenException, DbConflictException, UnprocessableException, NotFoundException } from './exceptions/Exception';
 import { RequestType } from './reqestResponse/RequestType';
 import { ResponseType } from './reqestResponse/ResponseType';
 import { AwsS3Client } from './clients/AwsS3Client';

package/src/clients/AwsS3Client.ts

@@ -147,14 +147,22 @@ export class AwsS3Client {
             }
 
             // v3ではBodyがReadableStreamなので、変換が必要
-            const stream = res.Body as ReadableStream;
-            const reader = stream.getReader();
             const chunks: Uint8Array[] = [];
-            
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done) break;
-                chunks.push(value);
+            if (res.Body && typeof res.Body === 'object' && 'getReader' in res.Body) {
+                // ReadableStreamの場合
+                const stream = res.Body as ReadableStream;
+                const reader = stream.getReader();
+                
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done) break;
+                    chunks.push(value);
+                }
+            } else {
+                // Node.js Readableの場合
+                for await (const chunk of res.Body as any) {
+                    chunks.push(chunk);
+                }
             }
             
             const buffer = Buffer.concat(chunks);

package/src/exceptions/Exception.ts

@@ -32,6 +32,19 @@ export class MaintenanceException extends Error {
     }
 }
 
+export class NotFoundException extends Error {
+    // for 404 Not Found
+    private errorId: string = "";
+    get ErrorId(): string {
+        return this.errorId;
+    }
+
+    constructor(errorId: string, message: string = "") {
+        super(message);
+        this.errorId = errorId;
+    }
+}
+
 export class DbConflictException extends Error {
     // for 409 Conflict
     private errorId: string = "";

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 { UnprocessableException } from '../exceptions/Exception';
+import { DbConflictException, UnprocessableException } from '../exceptions/Exception';
 
 export class TableModel {
 
@@ -401,7 +401,7 @@ export class TableModel {
         return { datas: data.rows as Array<T>, count: Number(countData.rows[0].count), lastPage: Math.ceil(Number(countData.rows[0].count) / this.PageCount)};
     }
 
-    protected readonly errorMessages: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = {
+    private readonly errorMessageEnglish: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = {
         'string': '{name} should be entered as a string or number type.',
         'string[]': '{name} should be entered as an array of string or number types.',
         'uuid': '{name} should be entered as a UUID.',
@@ -422,6 +422,44 @@ 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.',
     }
+    private readonly errorMessageJapan: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = {
+        'string': '{name}はstringかnumberで入力してください。',
+        'string[]': '{name}はstringかnumberの配列で入力してください。',
+        'uuid': '{name}はuuidで入力してください。',
+        'uuid[]': '{name}はuuidの配列で入力してください。',
+        'number': '{name}はnumberか半角数字のstring型で入力してください。',
+        'number[]': '{name}はnumberか半角数字のstring型の配列で入力してください。',
+        'bool': '{name}はbool型、"true"、"false"、0、または1で入力してください。',
+        'bool[]': '{name}はbool型、"true"、"false"、0、または1の配列で入力してください。',
+        'date': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、またはDate型で入力してください。',
+        'date[]': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、またはDate型の配列で入力してください。',
+        'time': '{name}は"hh:mi"形式または"hh:mi:ss"形式で入力してください。',
+        'time[]': '{name}は"hh:mi"形式または"hh:mi:ss"形式の配列で入力してください。',
+        'timestamp': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、"YYYY-MM-DDThh:mi:ss"形式、またはDate型で入力してください。',
+        'timestamp[]': '{name}は"YYYY-MM-DD"形式、"YYYY-MM-DD hh:mi:ss"形式、"YYYY-MM-DDThh:mi:ss"形式、またはDate型の配列で入力してください。',
+        'length': '{name}は{length}文字以内で入力してください。',
+        'null': '{name}はnullを許可されていません。',
+        'notInput': '{name}を入力してください。',
+        'fk': '{name}の値がテーブルに存在しません。',
+        'idNotExist': '指定されたID({id})はテーブルに存在しません。',
+    }
+
+    private throwException(code: string, type: TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', columnName: string, vallue: TSqlValue): never {
+        const column = this.getColumn(columnName);
+        
+        let message = this.errorMessages[type];
+
+        const name = (column.alias === undefined || column.alias === '') ? columnName : column.alias;
+        message = message.replace('{name}', name);
+        if (message.includes("{length}") && (column.type === 'string' || column.type !== 'string[]')) {
+            message = message.replace('{length}', (column.length ?? '未設定').toString());
+        } 
+
+        throw new UnprocessableException(code, message);
+    }
+
+    protected readonly errorMessages: Record<TColumnType | TColumnArrayType | 'length' | 'null' | 'notInput' | 'fk' | 'idNotExist', string> = 
+        process.env.TZ === 'Asia/Tokyo' ? this.errorMessageJapan : this.errorMessageEnglish;
 
     protected async validateOptions(options: TOption, isInsert: boolean): Promise<void> {
         if (Object.keys(options).length === 0) {
@@ -434,16 +472,15 @@ export class TableModel {
                 throw new Error(`${this.TableName}.${key} cannot be modified because it is a primary key.`);
             }
 
-            const name = (column.alias === undefined || column.alias === '') ? key : column.alias;
             if (value === null) {
                 if (column.attribute === 'nullable') {
                     continue;
                 }
-                throw new UnprocessableException("001", this.errorMessages.null.replace('{name}', name));
+                this.throwException("001", "null", key, value);
             }
 
             if (ValidateValueUtil.isErrorValue(column.type, value)) {
-                throw new UnprocessableException("002", this.errorMessages[column.type].replace('{name}', name));
+                this.throwException("002", column.type, key, value);
             }
 
             if (column.type === 'string') {
@@ -452,7 +489,7 @@ export class TableModel {
                 }
 
                 if (value.toString().length > column.length) {
-                    throw new UnprocessableException("003", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
+                    this.throwException("003", "length", key, value);
                 }
             } else if (column.type === 'string[]') {
                 if (Number.isInteger(column.length) === false) {
@@ -462,7 +499,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) {
-                        throw new UnprocessableException("004", this.errorMessages.length.replace('{name}', name).replace('{length}', column.length.toString()));
+                        this.throwException("004", "length", key, value);
                     }
                 }
             }
@@ -480,7 +517,7 @@ 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(',');
-                    throw new UnprocessableException("004", this.errorMessages.fk.replace('{name}', name));
+                    throw new UnprocessableException("005", this.errorMessages.null.replace('{name}', name));
                 }
 
                 let refIndex = 1;
@@ -488,7 +525,7 @@ export class TableModel {
                 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(',');
-                    throw new UnprocessableException("004", this.errorMessages.fk.replace('{name}', name));
+                    throw new DbConflictException("006", this.errorMessages.fk.replace('{name}', name));
                 }
             }
         }
@@ -501,7 +538,7 @@ export class TableModel {
             if (options[key] === undefined || options[key] === null) {
                 // Null許容されていないカラムにNULLを入れようとしているか？
                 if (column.attribute === "primary" || column.attribute === "noDefault") {
-                    throw new UnprocessableException("101", this.errorMessages.notInput.replace('{name}', name));
+                    this.throwException("101", "notInput", key, options[key]);
                 }
             }
         }

package/src/models/ValidateClient.ts

@@ -1,4 +1,5 @@
 import { UnprocessableException } from "../exceptions/Exception";
+import ValidateValueUtil from "./SqlUtils/ValidateValueUtil";
 import { TableModel } from "./TableModel";
 import { TOption, TSqlValue } from "./Type";