pg-mvc-service 2.0.12 → 2.0.14

package/dist/models/TableModel.js

@@ -67,7 +67,9 @@ class TableModel {
             };
             sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
+            console.log('createSqlFronJOin', this.vars);
             const query = WhereExpression_1.default.createCondition(join.conditions, this, this.vars.length + 1);
+            console.log('createSqlFronJoin end', this.vars, query.vars);
             sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars];
@@ -94,12 +96,6 @@ class TableModel {
         }
         return sql;
     }
-    set OffsetPage(value) {
-        if (value > 0) {
-            this.Limit = this.PageCount;
-            this.Offset = (value - 1) * this.PageCount;
-        }
-    }
     get Client() {
         return this.client;
     }
@@ -112,7 +108,6 @@ class TableModel {
         this.references = [];
         this.IsOutputLog = false;
         this.SortKeyword = 'asc';
-        this.PageCount = 10;
         this.selectExpressions = [];
         this.joinConditions = [];
         this.whereExpressions = [];
@@ -315,17 +310,26 @@ class TableModel {
             return data.rows;
         });
     }
-    executeSelectWithCount() {
+    executeSelectForPage(pageCount, currentPage) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.selectExpressions.length == 0) {
                 this.select();
             }
+            this.Limit = pageCount;
+            this.Offset = (currentPage - 1) * pageCount;
             let sql = ` SELECT ${this.selectExpressions.join(",")} ${this.createSqlFromJoinWhereSortLimit}`;
             let countSql = ` SELECT COUNT(*) as "count" ${this.createSqlFromJoinWhere}`;
             let tempVars = [...this.vars];
             const data = yield this.executeQuery(sql, tempVars);
             const countData = yield this.executeQuery(countSql, tempVars);
-            return { datas: data.rows, total_count: Number(countData.rows[0].count), last_page: Math.ceil(Number(countData.rows[0].count) / this.PageCount) };
+            const totalCount = Number(countData.rows[0].count);
+            const lastPage = Math.ceil(Number(countData.rows[0].count) / pageCount);
+            return {
+                datas: data.rows,
+                totalCount: totalCount,
+                lastPage: lastPage,
+                isLastData: currentPage >= lastPage
+            };
         });
     }
     throwException(code, type, columnName, value) {
@@ -531,7 +535,6 @@ class TableModel {
             this.vars = [];
             this.Offset = undefined;
             this.Limit = undefined;
-            this.PageCount = 10;
             let sql = '';
             if (typeof param1 === 'string') {
                 sql = param1;

package/package.json

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

package/src/models/TableModel.ts

@@ -66,7 +66,6 @@ export class TableModel {
     public SortKeyword: TSortKeyword = 'asc';
     public Offset?: number;
     public Limit?: number;
-    public PageCount: number = 10;
 
     private selectExpressions: Array<string> = [];
     private joinConditions: Array<{
@@ -90,7 +89,9 @@ export class TableModel {
             }
             sql += joins[join.type];
             sql += ` ${join.model.TableName} as "${join.model.TableAlias}" ON `;
+            console.log('createSqlFronJOin', this.vars);
             const query = WhereExpression.createCondition(join.conditions, this, this.vars.length + 1);
+            console.log('createSqlFronJoin end', this.vars, query.vars);
             sql += query.expression;
             if (query.vars !== undefined) {
                 this.vars = [...this.vars, ...query.vars]
@@ -122,12 +123,6 @@ export class TableModel {
         }
         return sql;
     }
-    set OffsetPage(value: number) {
-        if (value > 0) {
-            this.Limit = this.PageCount;
-            this.Offset = (value - 1) * this.PageCount;
-        }
-    }
 
     private client: PoolClient | Pool;
     get Client(): PoolClient | Pool {
@@ -369,18 +364,29 @@ export class TableModel {
         return data.rows as Array<T>;
     }
 
-    public async executeSelectWithCount<T = any>(): Promise<{ datas: Array<T>, total_count: number, last_page: number}> {
+    public async executeSelectForPage<T = any>(pageCount: number, currentPage: number): Promise<{ datas: Array<T>, totalCount: number, lastPage: number, isLastData: boolean}> {
         if (this.selectExpressions.length == 0) {
             this.select();
         }
 
+        this.Limit = pageCount;
+        this.Offset = (currentPage - 1) * pageCount;
+
         let sql = ` SELECT ${this.selectExpressions.join(",")} ${this.createSqlFromJoinWhereSortLimit}`;
         let countSql = ` SELECT COUNT(*) as "count" ${this.createSqlFromJoinWhere}`;
         let tempVars = [...this.vars];
         const data = await this.executeQuery(sql, tempVars);
 
         const countData = await this.executeQuery(countSql, tempVars);
-        return { datas: data.rows as Array<T>, total_count: Number(countData.rows[0].count), last_page: Math.ceil(Number(countData.rows[0].count) / this.PageCount)};
+
+        const totalCount = Number(countData.rows[0].count);
+        const lastPage = Math.ceil(Number(countData.rows[0].count) / pageCount);
+        return { 
+            datas: data.rows as Array<T>, 
+            totalCount: totalCount, 
+            lastPage: lastPage,
+            isLastData: currentPage >= lastPage
+        };
     }
 
     protected readonly errorMessages: TOptionErrorMessage = 
@@ -610,7 +616,6 @@ export class TableModel {
         this.vars = [];
         this.Offset = undefined;
         this.Limit = undefined;
-        this.PageCount = 10;
 
         let sql = '';
         if (typeof param1 === 'string') {