pg-mvc-service 1.0.14 → 1.0.15

package/dist/Service.js

@@ -24,7 +24,7 @@ const EncryptClient_1 = require("./clients/EncryptClient");
 const PoolManager_1 = __importDefault(require("./PoolManager"));
 class Service {
     get Method() { return this.method; }
-    get Endpoint() { return this.endpoint; }
+    get Endpoint() { return this.endpoint + this.request.paramPath; }
     get ApiCode() { return this.apiCode; }
     get Summary() { return `${this.ApiCode !== '' ? this.apiCode + ': ' : ''}${this.summary}`; }
     get ApiUserAvailable() { return this.apiUserAvailable; }

package/dist/reqestResponse/RequestType.js

@@ -50,7 +50,10 @@ class RequestType extends ReqResType_1.default {
             INVALID_ENUM: '{property}は{enums}のいずれかの値で入力してください。（{value}）'
         };
         this.ERROR_MESSAGE = process.env.TZ === 'Asia/Tokyo' ? this.ERROR_MESSAGE_JAPAN : this.ERROR_MESSAGE_ENGLISH;
-        this.paramProperties = {};
+        this.paramProperties = [];
+    }
+    get paramPath() {
+        return this.paramProperties.map(property => `/{${property.key}}`).join("");
     }
     get Params() {
         var _a;
@@ -87,11 +90,12 @@ class RequestType extends ReqResType_1.default {
         this.params = {};
         if (request.params !== undefined) {
             for (const [key, value] of Object.entries(request.params)) {
-                const property = this.paramProperties[key];
-                if (property === undefined) {
+                const index = this.paramProperties.findIndex(property => property.key === key);
+                if (index === -1) {
                     throw new Error(`${key} is not set in paramProperties.`);
                 }
-                this.paramProperties[key] = this.convertValue(property.type, value, [key, `(pathIndex: ${property.pathIndex})`], false);
+                const property = this.paramProperties[index];
+                this.params[key] = this.convertValue(property.type, value, [key, `(pathIndex: ${index})`], false);
             }
         }
         this.params = (_a = request.params) !== null && _a !== void 0 ? _a : {};

package/index.d.ts

@@ -85,7 +85,7 @@ declare module 'pg-mvc-service' {
         constructor();
 
         protected properties: { [key: string]: PropertyType; };
-        protected paramProperties: { [key: string]: (PrimitiveType | EnumType) & { pathIndex: number }; };
+        protected paramProperties: Array<(PrimitiveType | EnumType) & { key: string }>;
         protected readonly ERROR_MESSAGE: ErrorMessageType;
 
         protected throwException(code: string, message: string): never;

package/package.json

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

package/src/Service.ts

@@ -16,7 +16,7 @@ export class Service {
     protected readonly method: MethodType = 'GET';
     get Method(): MethodType { return this.method; }
     protected readonly endpoint: string = '';
-    get Endpoint(): string { return this.endpoint; }
+    get Endpoint(): string { return this.endpoint + this.request.paramPath; }
     protected readonly apiCode: string = '';
     get ApiCode(): string { return this.apiCode; }
     protected readonly summary: string = '';

package/src/reqestResponse/RequestType.ts

@@ -65,9 +65,10 @@ export class RequestType extends ReqResType {
     }
     protected readonly ERROR_MESSAGE: ErrorMessageType = process.env.TZ === 'Asia/Tokyo' ? this.ERROR_MESSAGE_JAPAN : this.ERROR_MESSAGE_ENGLISH;
 
-    protected paramProperties: { 
-        [key: string]: (PrimitiveType | EnumType) & { pathIndex: number }; 
-    } = {};
+    protected paramProperties: Array<(PrimitiveType | EnumType) & { key: string }> = []
+    get paramPath(): string {
+        return this.paramProperties.map(property => `/{${property.key}}`).join("");
+    }
 
     private params?: {[key: string]: any};
     get Params():  {[key: string]: any} {
@@ -106,11 +107,12 @@ export class RequestType extends ReqResType {
         this.params = {};
         if (request.params !== undefined) {
             for (const [key, value] of Object.entries(request.params)) {
-                const property = this.paramProperties[key];
-                if (property === undefined) {
+                const index = this.paramProperties.findIndex(property => property.key === key);
+                if (index === -1) {
                     throw new Error(`${key} is not set in paramProperties.`);                  
                 }
-                this.paramProperties[key] = this.convertValue(property.type, value, [key, `(pathIndex: ${property.pathIndex})`], false);
+                const property = this.paramProperties[index];
+                this.params[key] = this.convertValue(property.type, value, [key, `(pathIndex: ${index})`], false);
             }
         }
         this.params = request.params ?? {};