pg-mvc-service 2.0.36 → 2.0.38

package/dist/clients/AwsS3Client.js

@@ -127,7 +127,10 @@ class AwsS3Client {
                 ContentType: type
             });
             yield this.client.send(command);
-            return `${this.UrlPrefix}/${key}`;
+            return {
+                url: `${this.UrlPrefix}/${key}`,
+                fileName: fileName
+            };
         });
     }
     uploadFromUrl(path, fileName, url) {
@@ -150,7 +153,10 @@ class AwsS3Client {
                 });
                 yield this.client.send(command);
                 // アップロードされたファイルのURLを返す
-                return this.url(path, fileName);
+                return {
+                    url: this.url(path, fileName),
+                    fileName: fileName
+                };
             }
             catch (error) {
                 if (axios_1.default.isAxiosError(error)) {

package/dist/models/TableDoc.js

@@ -217,7 +217,7 @@ td:nth-child(11) {
             html += `
         <div class="table-wrapper">
             <div class="table-title-wrapper">
-                <div class="table-title-left">${model.TableName} ${model.TableDescription !== '' ? ` : ${model.TableDescription}` : ''}</div>
+                <div class="table-title-left">${model.Id !== "" ? `[${model.Id}] ` : ""}${model.TableName} ${model.TableDescription !== '' ? ` : ${model.TableDescription}` : ''}</div>
                 <button class="table-title-right" onclick="${createFuncName}()">Copy Create Query</button>
             </div>
             <div class="comment-wrapper">${model.Comment.replace('\n', '<br>')}</div>

package/dist/models/TableModel.js

@@ -22,6 +22,7 @@ const ExpressionClient_1 = __importDefault(require("./ExpressionClient"));
 const UpdateExpression_1 = __importDefault(require("./SqlUtils/UpdateExpression"));
 const MessageUtil_1 = __importDefault(require("./Utils/MessageUtil"));
 class TableModel {
+    get Id() { return this.id; }
     get DbName() { return this.dbName; }
     get TableName() {
         if (this.tableName === "") {
@@ -98,6 +99,7 @@ class TableModel {
         return this.client;
     }
     constructor(client, tableAlias) {
+        this.id = "";
         this.dbName = "default";
         this.tableName = "";
         this.tableDescription = "";
@@ -344,7 +346,13 @@ class TableModel {
         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);
+        this.throwUnprocessableException(code, message);
+    }
+    throwDbCoflictException(code, message) {
+        throw new Exception_1.DbConflictException(`${this.id}-${code}`, message);
+    }
+    throwUnprocessableException(code, message) {
+        throw new Exception_1.UnprocessableException(`${this.id}-${code}`, message);
     }
     validateOptions(options, isInsert, pkOrId) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -406,14 +414,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("006", this.errorMessages.null.replace('{name}', name));
+                        this.throwUnprocessableException("006", 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.DbConflictException("007", this.errorMessages.fk.replace('{name}', name));
+                        this.throwDbCoflictException("007", this.errorMessages.fk.replace('{name}', name));
                     }
                 }
             }
@@ -452,7 +460,7 @@ class TableModel {
             const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
             const data = yield this.executeQuery(sql, whereQuery.vars);
             if (data.rowCount !== 1) {
-                throw new Exception_1.UnprocessableException("201", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
+                this.throwUnprocessableException("201", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
             }
         });
     }
@@ -470,7 +478,7 @@ class TableModel {
             const sql = `DELETE FROM ${this.TableName} WHERE ${whereQuery.expression}`;
             const data = yield this.executeQuery(sql, whereQuery.vars);
             if (data.rowCount !== 1) {
-                throw new Exception_1.UnprocessableException("301", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
+                this.throwUnprocessableException("301", this.errorMessages.find.replace('{pks}', ((_a = whereQuery.vars) !== null && _a !== void 0 ? _a : []).join(',')));
             }
         });
     }

package/package.json

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

package/src/clients/AwsS3Client.ts

@@ -3,6 +3,11 @@ import { Base64Client } from './Base64Client';
 import { UnprocessableException } from '../exceptions/Exception';
 import axios from 'axios';
 
+type IUploadResponse = {
+    url: string;
+    fileName: string;
+}
+
 export class AwsS3Client {
     private client: S3Client;
 
@@ -96,7 +101,7 @@ export class AwsS3Client {
         await this.client.send(command);
     }
 
-    public async uploadBase64Data(path: string, fileName: string, base64Data: string) : Promise<string> {
+    public async uploadBase64Data(path: string, fileName: string, base64Data: string) : Promise<IUploadResponse> {
         const base64Client = new Base64Client();
 
         const type = base64Client.getMimeType(base64Data);
@@ -120,10 +125,13 @@ export class AwsS3Client {
         });
         await this.client.send(command);
         
-        return `${this.UrlPrefix}/${key}`;
+        return {
+            url: `${this.UrlPrefix}/${key}`,
+            fileName: fileName
+        }
     }
 
-    public async uploadFromUrl(path: string, fileName: string, url: string): Promise<string> {
+    public async uploadFromUrl(path: string, fileName: string, url: string): Promise<IUploadResponse> {
         try {
             // URLからデータを取得
             const response = await axios.get(url, {
@@ -146,8 +154,10 @@ export class AwsS3Client {
             await this.client.send(command);
             
             // アップロードされたファイルのURLを返す
-            return this.url(path, fileName);
-            
+            return {
+                url: this.url(path, fileName),
+                fileName: fileName
+            }
         } catch (error) {
             if (axios.isAxiosError(error)) {
                 if (error.response) {

package/src/models/TableDoc.ts

@@ -219,7 +219,7 @@ td:nth-child(11) {
             html += `
         <div class="table-wrapper">
             <div class="table-title-wrapper">
-                <div class="table-title-left">${model.TableName} ${model.TableDescription !== '' ? ` : ${model.TableDescription}` : ''}</div>
+                <div class="table-title-left">${model.Id !== "" ? `[${model.Id}] ` : ""}${model.TableName} ${model.TableDescription !== '' ? ` : ${model.TableDescription}` : ''}</div>
                 <button class="table-title-right" onclick="${createFuncName}()">Copy Create Query</button>
             </div>
             <div class="comment-wrapper">${model.Comment.replace('\n', '<br>')}</div>

package/src/models/TableModel.ts

@@ -11,6 +11,8 @@ import MessageUtil, { TOptionErrorMessage } from './Utils/MessageUtil';
 
 export class TableModel {
 
+    protected readonly id: string = "";
+    get Id(): string { return this.id; }
     protected readonly dbName: string = "default";
     get DbName(): string { return this.dbName; }
     protected readonly tableName: string = "";
@@ -406,7 +408,15 @@ export class TableModel {
             message = message.replace('{length}', (column.length ?? '未設定').toString());
         } 
 
-        throw new UnprocessableException(code, message);
+        this.throwUnprocessableException(code, message);
+    }
+
+    protected throwDbCoflictException(code: string, message: string): never {
+        throw new DbConflictException(`${this.id}-${code}`, message);
+    }
+
+    protected throwUnprocessableException(code: string, message: string): never {
+        throw new UnprocessableException(`${this.id}-${code}`, message);
     }
 
     protected async validateOptions(options: {[key: string]: any}, isInsert: boolean, pkOrId?: string | number | boolean | {[key: string]: any}): Promise<void> {
@@ -476,7 +486,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("006", this.errorMessages.null.replace('{name}', name));
+                    this.throwUnprocessableException("006", this.errorMessages.null.replace('{name}', name));
                 }
 
                 let refIndex = 1;
@@ -484,7 +494,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 DbConflictException("007", this.errorMessages.fk.replace('{name}', name));
+                    this.throwDbCoflictException("007", this.errorMessages.fk.replace('{name}', name))
                 }
             }
         }
@@ -525,7 +535,7 @@ export class TableModel {
         const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
         const data = await this.executeQuery(sql, whereQuery.vars);
         if (data.rowCount !== 1) {
-            throw new UnprocessableException("201", this.errorMessages.find.replace('{pks}', (whereQuery.vars ?? []).join(',')));
+            this.throwUnprocessableException("201", this.errorMessages.find.replace('{pks}', (whereQuery.vars ?? []).join(',')));
         }
     }
 
@@ -541,7 +551,7 @@ export class TableModel {
         const sql = `DELETE FROM ${this.TableName} WHERE ${whereQuery.expression}`;
         const data = await this.executeQuery(sql, whereQuery.vars);
         if (data.rowCount !== 1) {
-            throw new UnprocessableException("301", this.errorMessages.find.replace('{pks}', (whereQuery.vars ?? []).join(',')));
+            this.throwUnprocessableException("301", this.errorMessages.find.replace('{pks}', (whereQuery.vars ?? []).join(',')));
         }
     }