oca-shared-model 1.0.11 → 1.0.13

package/dist/helper/base-service.d.ts

@@ -1,14 +1,20 @@
-import { Repository } from "typeorm";
+import { DeepPartial, Repository } from "typeorm";
 import { OptionFilter } from "./option-filter";
 import { BaseEntity } from "./base-entity";
+import { PaginationFilter } from "./pagination-filter";
 export declare class BaseService<T extends BaseEntity> {
     protected readonly repository: Repository<T>;
     constructor(repository: Repository<T>);
-    create(payload: any): Promise<T[]>;
+    create(payload: DeepPartial<T>): Promise<T>;
     findAll(): Promise<T[]>;
     findOne(id: number): Promise<T | undefined>;
     update(id: number, payload: any): Promise<any>;
     remove(id: number): Promise<void>;
     findByOption(filter: OptionFilter): Promise<T[] | undefined>;
     findOneByOption(filter: OptionFilter): Promise<T | null | undefined>;
+    findPaginate(filter: PaginationFilter): Promise<{
+        data: T[];
+        total: number;
+        total_pages: number;
+    } | undefined>;
 }

package/dist/helper/base-service.js

@@ -122,6 +122,34 @@ let BaseService = class BaseService {
             }
         });
     }
+    findPaginate(filter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let { page, size, where, relations, order } = filter;
+                if (page === 0 || page === undefined)
+                    page = 1;
+                const offset = page * size;
+                const [data, total] = yield this.repository.findAndCount({
+                    where: where,
+                    relations: relations,
+                    order: order,
+                    take: size,
+                    skip: offset,
+                });
+                const totalPages = Math.ceil(total / size);
+                return {
+                    data: data,
+                    total: total,
+                    total_pages: totalPages,
+                };
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    throw new common_1.InternalServerErrorException(error.message);
+                }
+            }
+        });
+    }
 };
 exports.BaseService = BaseService;
 exports.BaseService = BaseService = __decorate([

package/dist/helper/pagination-filter.d.ts

@@ -0,0 +1,7 @@
+export declare class PaginationFilter {
+    page?: number;
+    size: number;
+    where?: any;
+    relations?: any;
+    order?: any;
+}

package/dist/helper/pagination-filter.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginationFilter = void 0;
+class PaginationFilter {
+}
+exports.PaginationFilter = PaginationFilter;

package/dist/library/master_answers/entities/master_answer.entity.d.ts

@@ -1,7 +1,9 @@
 import { DefaultColumn } from "../../../helper/default-column";
+import { MasterQuestion } from "../../master_questions/entities/master_question.entity";
 export declare class MasterAnswer extends DefaultColumn {
     id?: number;
     question_id?: string;
     answer?: string;
     correct?: boolean;
+    question?: MasterQuestion;
 }

package/dist/library/master_answers/entities/master_answer.entity.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MasterAnswer = void 0;
 const typeorm_1 = require("typeorm");
 const default_column_1 = require("../../../helper/default-column");
+const master_question_entity_1 = require("../../master_questions/entities/master_question.entity");
 let MasterAnswer = class MasterAnswer extends default_column_1.DefaultColumn {
 };
 exports.MasterAnswer = MasterAnswer;
@@ -31,6 +32,11 @@ __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", Boolean)
 ], MasterAnswer.prototype, "correct", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => master_question_entity_1.MasterQuestion, (q) => q.answers),
+    (0, typeorm_1.JoinColumn)({ name: "question_id", referencedColumnName: "id" }),
+    __metadata("design:type", master_question_entity_1.MasterQuestion)
+], MasterAnswer.prototype, "question", void 0);
 exports.MasterAnswer = MasterAnswer = __decorate([
     (0, typeorm_1.Entity)({
         schema: "library",

package/dist/library/master_questions/entities/master_question.entity.d.ts

@@ -1,8 +1,11 @@
 import { DefaultColumn } from "../../../helper/default-column";
+import { MasterAnswer } from "../../master_answers/entities/master_answer.entity";
 export declare class MasterQuestion extends DefaultColumn {
     id?: number;
     question?: string;
+    type?: string;
     image_url?: string;
     rank?: string;
     vessel_type?: string;
+    answers?: MasterAnswer[];
 }

package/dist/library/master_questions/entities/master_question.entity.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MasterQuestion = void 0;
 const typeorm_1 = require("typeorm");
 const default_column_1 = require("../../../helper/default-column");
+const master_answer_entity_1 = require("../../master_answers/entities/master_answer.entity");
 let MasterQuestion = class MasterQuestion extends default_column_1.DefaultColumn {
 };
 exports.MasterQuestion = MasterQuestion;
@@ -23,6 +24,10 @@ __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", String)
 ], MasterQuestion.prototype, "question", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], MasterQuestion.prototype, "type", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", String)
@@ -35,6 +40,10 @@ __decorate([
     (0, typeorm_1.Column)({ array: true }),
     __metadata("design:type", String)
 ], MasterQuestion.prototype, "vessel_type", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => master_answer_entity_1.MasterAnswer, (q) => q.question),
+    __metadata("design:type", Array)
+], MasterQuestion.prototype, "answers", void 0);
 exports.MasterQuestion = MasterQuestion = __decorate([
     (0, typeorm_1.Entity)({ schema: "library", name: "master_questions" })
 ], MasterQuestion);

package/dist/library/master_questions/master_questions.service.d.ts

@@ -1,16 +1,6 @@
-import { CreateMasterQuestionDto } from "./dto/create-master_question.dto";
-import { UpdateMasterQuestionDto } from "./dto/update-master_question.dto";
 import { MasterQuestion } from "./entities/master_question.entity";
 import { Repository } from "typeorm";
-import { OptionFilter } from "../../helper/option-filter";
-export declare class MasterQuestionsService {
-    private readonly repository;
+import { BaseService } from "../../helper/base-service";
+export declare class MasterQuestionsService extends BaseService<MasterQuestion> {
     constructor(repository: Repository<MasterQuestion>);
-    create(payload: CreateMasterQuestionDto): Promise<MasterQuestion>;
-    findAll(): Promise<MasterQuestion[]>;
-    findOne(id: number): Promise<MasterQuestion | undefined>;
-    update(id: number, payload: UpdateMasterQuestionDto): Promise<(MasterQuestion & UpdateMasterQuestionDto) | undefined>;
-    remove(id: number): Promise<import("typeorm").DeleteResult>;
-    findByOption(filter: OptionFilter): Promise<MasterQuestion[] | undefined>;
-    findOneByOption(filter: OptionFilter): Promise<MasterQuestion | null | undefined>;
 }

package/dist/library/master_questions/master_questions.service.js

@@ -11,117 +11,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MasterQuestionsService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const master_question_entity_1 = require("./entities/master_question.entity");
 const typeorm_2 = require("typeorm");
-let MasterQuestionsService = class MasterQuestionsService {
+const base_service_1 = require("../../helper/base-service");
+let MasterQuestionsService = class MasterQuestionsService extends base_service_1.BaseService {
     constructor(repository) {
-        this.repository = repository;
-    }
-    create(payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const data = this.repository.create(payload);
-                const result = yield this.repository.save(data);
-                return result;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new common_1.InternalServerErrorException(error.message);
-                }
-                throw new common_1.InternalServerErrorException("An unknown error occurred");
-            }
-        });
-    }
-    findAll() {
-        return this.repository.find();
-    }
-    findOne(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const result = yield this.repository.findOne({
-                    where: {
-                        id: id,
-                    },
-                });
-                if (!result) {
-                    throw new common_1.NotFoundException(`MasterQuestion with ID ${id} not found`);
-                }
-                return result;
-            }
-            catch (error) { }
-        });
-    }
-    update(id, payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const data = yield this.findOne(id);
-                if (!data) {
-                    throw new common_1.NotFoundException(`MasterQuestion with ID ${id} not found`);
-                }
-                const update = Object.assign(data, payload);
-                const result = yield this.repository.save(update);
-                return result;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new common_1.InternalServerErrorException(error.message);
-                }
-            }
-        });
-    }
-    remove(id) {
-        return this.repository.delete(id);
-    }
-    findByOption(filter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { select, where, relations, order } = filter;
-                const result = yield this.repository.find({
-                    select: select,
-                    where: where,
-                    relations: relations,
-                    order: order,
-                });
-                return result;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new common_1.InternalServerErrorException(error.message);
-                }
-            }
-        });
-    }
-    findOneByOption(filter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { select, where, relations, order } = filter;
-                const result = yield this.repository.findOne({
-                    select: select,
-                    where: where,
-                    relations: relations,
-                    order: order,
-                });
-                return result;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    throw new common_1.InternalServerErrorException(error.message);
-                }
-            }
-        });
+        super(repository);
     }
 };
 exports.MasterQuestionsService = MasterQuestionsService;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "oca-shared-model",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "onboard shared model",
   "main": "dist/index.js",
   "scripts": {
     "build": "nest build",
     "clean": "rm -rf dist",
     "predeploy": "npm run clean && npm version patch && npm run build",
+    "deploy": "npm publish",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "DONO",