SIMS
/
scb-tender-api
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modifications

Browse Source
main
josh 3 years ago
parent cc89fa869e
commit f30d800269
23 changed files with 677 additions and 422 deletions
Show Stats Download Patch File Download Diff File

4
src/app.module.ts
Unescape Escape View File

@ -1,7 +1,6 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm'; import { TypeOrmModule } from '@nestjs/typeorm';
import { typeOrmConfig } from './config/typeorm.config'; import { typeOrmConfig } from './config/typeorm.config';
import { AuthModule } from './auth/auth.module'; import { AuthModule } from './auth/auth.module';
import { FileUploadModule } from './file-upload/file-upload.module'; import { FileUploadModule } from './file-upload/file-upload.module';
import { ScheduleModule } from '@nestjs/schedule'; import { ScheduleModule } from '@nestjs/schedule';
@ -20,9 +19,6 @@ import { FileFormatLovModule } from './tables/file-format-lov/file-format-lov.mo
import { CoversMasterModule } from './tables/covers-master/covers-master.module'; import { CoversMasterModule } from './tables/covers-master/covers-master.module';
@Module({ @Module({
imports: [ imports: [
ScheduleModule.forRoot(), ScheduleModule.forRoot(),

2
src/auth/auth.service.ts
Unescape Escape View File

@ -61,7 +61,7 @@ export class AuthService {
} }
if(user){ if(user){
// authCredentialsDto.secuLevel = user.secuLevel // authCredentialsDto.secuLevel = user.secuLevel
return {username:user.userName ,secuLevel:user.secuLevel} return {username:user.userName ,secuLevel:user.secuLevel , userId:user.userId , mobile:user.mobileNumber , email:user.email}
} }

10
src/dto/cover-master.dto.ts
Unescape Escape View File

@ -0,0 +1,10 @@
export class CoverMasterDto{
tenderId:number;
coverType:string;
Description:string;
fileFormat:string
}

2
src/dto/tender-master.dto.ts
Unescape Escape View File

@ -55,6 +55,6 @@ export class TenderDetailDto{
tenderType: number; tenderType: number;
tenderCategory: number; tenderCategory: number;
formOfContract: number; formOfContract: number;
emd_fee_type: string; emdFeeType: string;
activeYn: string; activeYn: string;
} }

223
src/file-upload/file-upload.controller.ts
Unescape Escape View File

@ -1,14 +1,15 @@
import { BadRequestException, Controller, Get, Param, Post, Req, Res, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common'; import { BadRequestException, Controller, Delete, Get, NotFoundException, Param, Post, Req, Res, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common';
import { AuthGuard } from '@nestjs/passport'; import { AuthGuard } from '@nestjs/passport';
import { FileInterceptor } from '@nestjs/platform-express'; import { FileInterceptor } from '@nestjs/platform-express';
import { existsSync, mkdirSync } from 'fs'; import { existsSync, mkdirSync } from 'fs';
import { diskStorage } from 'multer'; import { diskStorage } from 'multer';
import { extname } from 'path';
import { GetUser } from 'src/auth/dto/get-user.decorator'; import { GetUser } from 'src/auth/dto/get-user.decorator';
import { FileUploadService } from './file-upload.service'; import { FileUploadService } from './file-upload.service';
import * as fs from 'fs'; import * as fs from 'fs';
import * as archiver from 'archiver'; import * as archiver from 'archiver';
import * as path from 'path'; import * as path from 'path';
import { join, extname } from 'path';
export function createFolders(filePath: string) { export function createFolders(filePath: string) {
@ -33,20 +34,23 @@ export function createFolders(filePath: string) {
@Controller('file-upload') @Controller('file-upload')
export class FileUploadController { export class FileUploadController {
constructor( constructor(
private iservice: FileUploadService private iservice: FileUploadService
) { ) {
} }
@Post('user-documents/:id') @UseGuards(AuthGuard())
@Post('user-documents/:id/:userId')
@UseInterceptors(FileInterceptor('file', { @UseInterceptors(FileInterceptor('file', {
storage: diskStorage({ storage: diskStorage({
destination: (req, res, cb) => { destination: (req, res, cb) => {
const filePath: string = './uploads/userDocuments/'+req.params.id; const parentFolder: string = './uploads/userDocuments/' + req.params.id;
createFolders(filePath); createFolders(parentFolder);
return cb(null, filePath); const childFolder: string = parentFolder + '/' + req.params.userId;
createFolders(childFolder);
return cb(null, childFolder);
}, },
filename: (req, file, cb) => { filename: (req, file, cb) => {
console.log('===here===file upload=='); console.log('===here===file upload==');
@ -60,14 +64,16 @@ export class FileUploadController {
} }
@UseGuards(AuthGuard())
@Post('Bank-documents/:id') @Post('Bank-documents/:id')
@UseInterceptors(FileInterceptor('file', { @UseInterceptors(FileInterceptor('file', {
storage: diskStorage({ storage: diskStorage({
// destination: './uploads/cars', // destination: './uploads/cars',
destination: (req, res, cb) => { destination: (req, res, cb) => {
// console.log(req); console.log(req);
const filePath: string = './uploads/BankDocuments/'+req.params.id; const filePath: string = './uploads/BankDocuments/' + req.params.id;
createFolders(filePath); createFolders(filePath);
return cb(null, filePath); return cb(null, filePath);
}, },
@ -87,7 +93,7 @@ export class FileUploadController {
return { fileName: file.filename, filePath: file.path, fileSizeKB }; return { fileName: file.filename, filePath: file.path, fileSizeKB };
} }
@UseGuards(AuthGuard())
@Post('drawings/:id') @Post('drawings/:id')
@UseInterceptors(FileInterceptor('file', { @UseInterceptors(FileInterceptor('file', {
storage: diskStorage({ storage: diskStorage({
@ -95,7 +101,7 @@ export class FileUploadController {
destination: (req, res, cb) => { destination: (req, res, cb) => {
// console.log(req); // console.log(req);
const filePath: string = './uploads/Drawings/'+req.params.id; const filePath: string = './uploads/Drawings/' + req.params.id;
createFolders(filePath); createFolders(filePath);
return cb(null, filePath); return cb(null, filePath);
}, },
@ -115,10 +121,106 @@ export class FileUploadController {
return { fileName: file.filename, filePath: file.path, fileSizeKB }; return { fileName: file.filename, filePath: file.path, fileSizeKB };
} }
@UseGuards(AuthGuard())
@Delete('R-drawing/:id/:filename')
async deleteDrawing(
@Param('filename') filename : string,
@Param('id') id:string): Promise<any> {
const filePath = './uploads/Drawings/'+id+'/'+ filename;
console.log("filepath===",filePath);
try {
await fs.promises.unlink(filePath);
return { message: 'File deleted successfully.' };
} catch (err) {
throw new NotFoundException('File not found.');
}
}
@UseGuards(AuthGuard())
@Delete('R-userDoc/:id/:userId/:filename')
async deleteUserDoc(
@Param('userId') userId:string,
@Param('filename') filename : string,
@Param('id') id:string): Promise<any> {
const filePath = './uploads/userDocuments/'+id+'/'+userId +'/'+ filename;
console.log("filepath===",filePath);
try {
await fs.promises.unlink(filePath);
return { message: 'File deleted successfully.' };
} catch (err) {
throw new NotFoundException('File not found.');
}
}
@UseGuards(AuthGuard())
@Delete('R-notice/:id/:filename')
async deleteNotice(
@Param('filename') filename : string,
@Param('id') id:string): Promise<any> {
const filePath = './uploads/Notice/'+id +'/'+ filename;
console.log("filepath===",filePath);
try {
await fs.promises.unlink(filePath);
return { message: 'File deleted successfully.' };
} catch (err) {
throw new NotFoundException('File not found.');
}
}
@UseGuards(AuthGuard())
@Post('notice/:id')
@UseInterceptors(FileInterceptor('file', {
storage: diskStorage({
// destination: './uploads/cars',
destination: (req, res, cb) => {
// console.log(req);
const filePath: string = './uploads/Notice/' + req.params.id;
createFolders(filePath);
return cb(null, filePath);
},
filename: (req, file, cb) => {
console.log('===here===file upload==');
const randomName = Array(32).fill(null).map(() => (Math.round(Math.random() * 16)).toString(16)).join('');
return cb(null, `${randomName}${extname(file.originalname)}`);
}
})
}))
notice(@UploadedFile() file) {
if (!file) {
return { error: 'No file uploaded.' };
}
//To return the size of the document in kb
const fileSizeKB = Math.ceil(file.size / 1024);
return { fileName: file.filename, filePath: file.path, fileSizeKB };
}
@Get('notice/:id/:imgpath')
getNotice(
@Param('imgpath') image: string,
@Param('id') id: string,
@Res() res,
@Req() req,
) {
return res.sendFile(image, { root: './uploads/Notice/' + id }, function (err) {
if (err) {
console.log(err.status);
res.status(err.status).end();
}
})
}
@UseGuards(AuthGuard())
@Get('Bank-Documents/:id/:imgpath') @Get('Bank-Documents/:id/:imgpath')
getBankDocuments( getBankDocuments(
@Param('imgpath') image: string, @Param('imgpath') image: string,
@ -127,7 +229,7 @@ export class FileUploadController {
@Req() req, @Req() req,
) { ) {
return res.sendFile(image, { root: './uploads/BankDocuments/'+id}, function (err) { return res.sendFile(image, { root: './uploads/BankDocuments/' + id }, function (err) {
if (err) { if (err) {
console.log(err.status); console.log(err.status);
res.status(err.status).end(); res.status(err.status).end();
@ -135,15 +237,17 @@ export class FileUploadController {
}) })
} }
@Get('user-Documents/:id/:imgpath') @UseGuards(AuthGuard())
@Get('user-Documents/:id/:userId/:imgpath')
getUserDocuments( getUserDocuments(
@Param('imgpath') image: string, @Param('imgpath') image: string,
@Param('userId') userId: string,
@Param('id') id: string, @Param('id') id: string,
@Res() res, @Res() res,
@Req() req, @Req() req,
) { ) {
return res.sendFile(image, { root: './uploads/userDocuments/'+id}, function (err) { return res.sendFile(image, { root: './uploads/userDocuments/' + id + '/' + userId }, function (err) {
if (err) { if (err) {
console.log(err.status); console.log(err.status);
res.status(err.status).end(); res.status(err.status).end();
@ -152,17 +256,17 @@ export class FileUploadController {
} }
@UseGuards(AuthGuard())
@Get('Bank-Documents-Arc/:id') @Get('Bank-Documents-Arc/:id')
async getBankDocumentsAsZip( async getBankDocumentsAsZip(
@Param('id') id: string, @Param('id') id: string,
@Res() res, @Res() res,
@Req() req, @Req() req,
) { ) {
const folderPath = path.join('./uploads/BankDocuments', id); const folderPath = path.join('./uploads/BankDocuments', id);
if (!fs.existsSync(folderPath)) { if (!fs.existsSync(folderPath)) {
res.status(404).send({ error: 'File not found' }); res.status(404).send({ error: 'File not found' });
return; return;
} }
//Uncomment when we want tender id as the zip file name //Uncomment when we want tender id as the zip file name
@ -172,7 +276,7 @@ export class FileUploadController {
// Create a new archive // Create a new archive
const archive = archiver('zip', { const archive = archiver('zip', {
zlib: { level: 9 } // Set compression level (optional) zlib: { level: 9 } // Set compression level (optional)
}); });
// Create a write stream to the zip file // Create a write stream to the zip file
@ -197,30 +301,30 @@ export class FileUploadController {
// Remove the temporary zip file once it's streamed // Remove the temporary zip file once it's streamed
readStream.on('end', () => { readStream.on('end', () => {
fs.unlinkSync(zipPath); fs.unlinkSync(zipPath);
}); });
// Handle any errors that occur during the archiving process // Handle any errors that occur during the archiving process
archive.on('error', function (err) { archive.on('error', function (err) {
console.log(err); console.log(err);
res.status(500).send({ error: 'Failed to create the zip file' }); res.status(500).send({ error: 'Failed to create the zip file' });
}); });
} }
@UseGuards(AuthGuard())
@Get('Drawings-Arc/:id') @Get('Drawings-Arc/:id')
async getDrawingsAsZip( async getDrawingsAsZip(
@Param('id') id: string, @Param('id') id: string,
@Res() res, @Res() res,
@Req() req, @Req() req,
) { ) {
const folderPath = path.join('./uploads/Drawings', id); const folderPath = path.join('./uploads/Drawings', id);
if (!fs.existsSync(folderPath)) { if (!fs.existsSync(folderPath)) {
res.status(404).send({ error: 'File not found' }); res.status(404).send({ error: 'File not found' });
return; return;
} }
//Uncomment when we want tender id as the zip file name //Uncomment when we want tender id as the zip file name
@ -230,7 +334,64 @@ export class FileUploadController {
// Create a new archive // Create a new archive
const archive = archiver('zip', { const archive = archiver('zip', {
zlib: { level: 9 } // Set compression level (optional) zlib: { level: 9 } // Set compression level (optional)
});
// Create a write stream to the zip file
const output = fs.createWriteStream(zipPath);
// Pipe the archive to the write stream
archive.pipe(output);
// Add the entire folder to the archive
archive.directory(folderPath, id);
// Finalize the archive
await archive.finalize();
// Set the appropriate headers for downloading the zip file
res.attachment(zipFileName);
res.setHeader('Content-Type', 'application/zip');
// Stream the zip file to the response
const readStream = fs.createReadStream(zipPath);
readStream.pipe(res);
// Remove the temporary zip file once it's streamed
readStream.on('end', () => {
fs.unlinkSync(zipPath);
});
// Handle any errors that occur during the archiving process
archive.on('error', function (err) {
console.log(err);
res.status(500).send({ error: 'Failed to create the zip file' });
});
}
@UseGuards(AuthGuard())
@Get('user-doc-arc/:id')
async getUserDocsAsZip(
@Param('id') id: string,
@Res() res,
@Req() req,
) {
const folderPath = path.join('./uploads/userDocuments', id);
if (!fs.existsSync(folderPath)) {
res.status(404).send({ error: 'File not found' });
return;
}
//Uncomment when we want tender id as the zip file name
//const zipFileName = id + '.zip';
const zipFileName = 'userDocuments.zip';
const zipPath = path.join('./uploads/userDocuments', zipFileName);
// Create a new archive
const archive = archiver('zip', {
zlib: { level: 9 } // Set compression level (optional)
}); });
// Create a write stream to the zip file // Create a write stream to the zip file
@ -255,15 +416,17 @@ export class FileUploadController {
// Remove the temporary zip file once it's streamed // Remove the temporary zip file once it's streamed
readStream.on('end', () => { readStream.on('end', () => {
fs.unlinkSync(zipPath); fs.unlinkSync(zipPath);
}); });
// Handle any errors that occur during the archiving process // Handle any errors that occur during the archiving process
archive.on('error', function (err) { archive.on('error', function (err) {
console.log(err); console.log(err);
res.status(500).send({ error: 'Failed to create the zip file' }); res.status(500).send({ error: 'Failed to create the zip file' });
}); });
} }
} }

2
src/file-upload/file-upload.module.ts
Unescape Escape View File

@ -9,7 +9,7 @@ import { AuthModule } from 'src/auth/auth.module';
MulterModule.register({ MulterModule.register({
dest: './uploads' dest: './uploads'
}), }),
// AuthModule, AuthModule,
], ],
controllers: [FileUploadController], controllers: [FileUploadController],
providers: [FileUploadService] providers: [FileUploadService]

2
src/framework/beans/pcd-form-grid.service.ts
Unescape Escape View File

@ -13,7 +13,7 @@ export class PcdFormGridService<T> implements PcdFormGridInterface {
MANDATORY_FEILDS: string[] = []; MANDATORY_FEILDS: string[] = [];
DUPLICATE_CHK: string[] = []; DUPLICATE_CHK: string[] = [];
FK_FEILDS: { column: string, relation: Repository<any> }[] = []; FK_FEILDS: { column: string, relation: Repository<any> }[] = [];
ROW_COUNT:string=''; ROW_COUNT: string = '';
constructor( constructor(
// @Inject(TENANT_CONNECTION) conn:Connection, // @Inject(TENANT_CONNECTION) conn:Connection,
private repo: Repository<any> private repo: Repository<any>

25
src/framework/beans/pcd-transaction.controller.ts
Unescape Escape View File

@ -3,6 +3,8 @@ import { AuthGuard } from "@nestjs/passport";
import { AuthModule } from "src/auth/auth.module"; import { AuthModule } from "src/auth/auth.module";
import { FindManyOptions } from "typeorm"; import { FindManyOptions } from "typeorm";
import { PcdTransactionService } from "./pcd-transaction.service"; import { PcdTransactionService } from "./pcd-transaction.service";
import { GetUser } from "src/auth/dto/get-user.decorator";
import { PcduserDto } from "src/auth/dto/pcd-user.dto";
export class PcdTransactionController<T> { export class PcdTransactionController<T> {
@ -11,27 +13,30 @@ export class PcdTransactionController<T> {
constructor( constructor(
private service: PcdTransactionService<T> private service: PcdTransactionService<T>
) { } ) { }
@UseGuards(AuthGuard())
@Get() @Get()
async findList(@Query() filter: FindManyOptions, ): Promise<T[]> { async findList(@Query() filter: FindManyOptions,
return await this.service.findList(filter); @GetUser() user: PcduserDto
): Promise<T[]> {
return await this.service.findList(filter, user);
} }
@Get('/:id') @Get('/:id')
async findOne(@Query() filter: FindManyOptions,@Param('id') id: string , ): Promise<T> { async findOne(@Query() filter: FindManyOptions, @Param('id') id: string,): Promise<T> {
return await this.service.findOne(filter, id); return await this.service.findOne(filter, id);
} }
@UseGuards(AuthGuard())
@Post() @Post()
async createOne(@Body() body: T, ): Promise<T> { async createOne(@Body() body: T,
return await this.service.createOne(body,); @GetUser() user: PcduserDto): Promise<T> {
return await this.service.createOne(body, user);
} }
@UseGuards(AuthGuard())
@Delete('/:id') @Delete('/:id')
async delete(@Query() filter: FindManyOptions,@Param('id') id: string , ): Promise<any> { async delete(@Query() filter: FindManyOptions, @Param('id') id: string,): Promise<any> {
return await this.service.deleteOne(filter,id, ); return await this.service.deleteOne(filter, id,);
} }
} }

75
src/framework/beans/pcd-transaction.service.ts
Unescape Escape View File

@ -1,7 +1,8 @@
import { PcdtTransactionInterface } from "../interface/pcd-transaction.interface"; import { PcdtTransactionInterface } from "../interface/pcd-transaction.interface";
import { FindManyOptions, Repository, getConnection, QueryRunner, Connection } from "typeorm"; import { FindManyOptions, Repository, getConnection, QueryRunner, Connection } from "typeorm";
import { BadRequestException, NotAcceptableException, UnauthorizedException, InternalServerErrorException, MethodNotAllowedException, HttpException, Inject } from "@nestjs/common"; import { BadRequestException, NotAcceptableException, UnauthorizedException, InternalServerErrorException, MethodNotAllowedException, HttpException, Inject } from "@nestjs/common";
import { TransactionDetailDto } from "src/framework/custom/transaction-detail.dto"; import { TransactionDetailDto } from "src/framework/custom/transaction-detail.dto";
import { PcduserDto } from "src/auth/dto/pcd-user.dto";
//import { TENANT_CONNECTION } from "src/tenant/tenant.module"; //import { TENANT_CONNECTION } from "src/tenant/tenant.module";
// import { IintDto } from "../../dto/iint.dto"; // import { IintDto } from "../../dto/iint.dto";
// import { IintvrnoDto } from "../../dto/iintvrno.dto"; // import { IintvrnoDto } from "../../dto/iintvrno.dto";
@ -10,7 +11,7 @@ import { TransactionDetailDto } from "src/framework/custom/transaction-detail.dt
export class PcdTransactionService<T> implements PcdtTransactionInterface { export class PcdTransactionService<T> implements PcdtTransactionInterface {
MAIN_KEY: string = "id"; MAIN_KEY: string = "id";
TXN_TYPE:string=""; TXN_TYPE: string = "";
DETAIL_DATA_FORMAT: TransactionDetailDto[] = []; DETAIL_DATA_FORMAT: TransactionDetailDto[] = [];
@ -19,32 +20,32 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
private repo: Repository<any> private repo: Repository<any>
) { } ) { }
async preFindList(filter: FindManyOptions, ): Promise<boolean> { async preFindList(filter: FindManyOptions, user: PcduserDto): Promise<boolean> {
return true return true
} }
async findList(filter: FindManyOptions, ): Promise<T[]> { async findList(filter: FindManyOptions, user: PcduserDto): Promise<T[]> {
if (!filter.where) filter.where = {}; if (!filter.where) filter.where = {};
if (this.TXN_TYPE) filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE; if (this.TXN_TYPE) filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE;
// if (!filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName]) // if (!filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName])
// return; // return;
if (!await this.preFindList(filter)) if (!await this.preFindList(filter, user))
throw new BadRequestException(`Unexpected Error Occured in findList`); throw new BadRequestException(`Unexpected Error Occured in findList`);
let result: T[] = await this.repo.find(filter); let result: T[] = await this.repo.find(filter);
return await this.postFindList(filter, result); return await this.postFindList(filter, result);
} }
async postFindList(filter: FindManyOptions, result: T[]): Promise<T[]> { async postFindList(filter: FindManyOptions, result: T[]): Promise<T[]> {
return result; return result;
} }
async preFindOne(filter: FindManyOptions, ): Promise<boolean> { async preFindOne(filter: FindManyOptions,): Promise<boolean> {
return true return true
} }
async findOne(filter: FindManyOptions, id: string | number, ): Promise<T> { async findOne(filter: FindManyOptions, id: string | number,): Promise<T> {
if (!filter.where) filter.where = {}; if (!filter.where) filter.where = {};
if (this.TXN_TYPE) filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE; if (this.TXN_TYPE) filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE;
let orgFilter = Object.create(filter); let orgFilter = Object.create(filter);
@ -61,18 +62,18 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
result = await this.getDetailData(result, orgFilter, this.DETAIL_DATA_FORMAT); result = await this.getDetailData(result, orgFilter, this.DETAIL_DATA_FORMAT);
return await this.postFindOne(filter, result); return await this.postFindOne(filter, result);
} }
async postFindOne(filter: FindManyOptions, result: T): Promise<T> { async postFindOne(filter: FindManyOptions, result: T): Promise<T> {
return result; return result;
} }
async preDeleteOne(filter: FindManyOptions, id: string | number, ): Promise<boolean> { async preDeleteOne(filter: FindManyOptions, id: string | number,): Promise<boolean> {
return true; return true;
} }
async deleteOne(filter: any, id: string | number, ): Promise<any> { async deleteOne(filter: any, id: string | number,): Promise<any> {
if (!filter || !filter.where) filter.where = {}; if (!filter || !filter.where) filter.where = {};
if (this.TXN_TYPE) filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE; if (this.TXN_TYPE) filter.where[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE;
filter.where[this.MAIN_KEY] = id; filter.where[this.MAIN_KEY] = id;
@ -86,15 +87,15 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
await queryRunner.connect(); await queryRunner.connect();
try { try {
await queryRunner.startTransaction(); await queryRunner.startTransaction();
await this.deleteDetailDataTabels(id, this.DETAIL_DATA_FORMAT, queryRunner); await this.deleteDetailDataTabels(id, this.DETAIL_DATA_FORMAT, queryRunner);
const result = await queryRunner.manager.delete(this.repo.metadata.name, id); const result = await queryRunner.manager.delete(this.repo.metadata.name, id);
await queryRunner.commitTransaction(); await queryRunner.commitTransaction();
return await this.postDeleteOne(filter, result); return await this.postDeleteOne(filter, result);
} catch (err) { } catch (err) {
if (queryRunner.isTransactionActive) if (queryRunner.isTransactionActive)
await queryRunner.rollbackTransaction(); await queryRunner.rollbackTransaction();
throw new InternalServerErrorException(`${err.message}`); throw new InternalServerErrorException(`${err.message}`);
}finally{ } finally {
await queryRunner.release(); await queryRunner.release();
} }
// const result = await this.repo.delete(delFilter); // const result = await this.repo.delete(delFilter);
@ -105,7 +106,7 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
return result; return result;
} }
async preCreateOne(body: T, ): Promise<boolean> { async preCreateOne(body: T,): Promise<boolean> {
return true; return true;
} }
@ -113,7 +114,7 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
return true; return true;
} }
async createOne(body: T, ): Promise<T> { async createOne(body: T, user: PcduserDto): Promise<T> {
//console.log('--- incoming = ', body); //console.log('--- incoming = ', body);
if (this.TXN_TYPE) body[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE; if (this.TXN_TYPE) body[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE;
@ -127,22 +128,22 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
try { try {
await queryRunner.startTransaction(); await queryRunner.startTransaction();
if (this.TXN_TYPE) body[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE; if (this.TXN_TYPE) body[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE;
// await this.checkAndSetVrNo(body, user, queryRunner); // await this.checkAndSetVrNo(body, user, queryRunner);
// for deleting deleted details from the angular // for deleting deleted details from the angular
for (let row of this.DETAIL_DATA_FORMAT) { for (let row of this.DETAIL_DATA_FORMAT) {
body[row.detailName] = await this.deleteDetailData(body[row.detailName], row, queryRunner); body[row.detailName] = await this.deleteDetailData(body[row.detailName], row, queryRunner);
} }
body["createdBy"] = 'SYSTEM'; body["createdBy"] = 'SYSTEM';
body["modifiedBy"] = 'SYSTEM'; body["modifiedBy"] = 'SYSTEM';
if (!await this.beforeCreateOne(body, queryRunner)) if (!await this.beforeCreateOne(body, queryRunner))
throw new BadRequestException(`Unepected Error Occured in CreateOne`); throw new BadRequestException(`Unepected Error Occured in CreateOne`);
const data = await queryRunner.manager.save(this.repo.metadata.name, body); const data = await queryRunner.manager.save(this.repo.metadata.name, body);
await this.insertDetailData(body, this.DETAIL_DATA_FORMAT, queryRunner, data); await this.insertDetailData(body, this.DETAIL_DATA_FORMAT, queryRunner, data);
await this.afterCreateOne(body); await this.afterCreateOne(body);
await queryRunner.commitTransaction(); await queryRunner.commitTransaction();
@ -151,7 +152,7 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
const filter: FindManyOptions = await this.getFilterWithPrimaryKey(body); const filter: FindManyOptions = await this.getFilterWithPrimaryKey(body);
const result = await this.findOne(filter, data[this.MAIN_KEY]); const result = await this.findOne(filter, data[this.MAIN_KEY]);
return await this.postCreateOne(body, result); return await this.postCreateOne(body, result);
} catch (err) { } catch (err) {
// since we have errors lets rollback changes we made // since we have errors lets rollback changes we made
@ -197,28 +198,28 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
async insertDetailData(body: T, detailData: TransactionDetailDto[], queryRunner: QueryRunner, insertedData: T): Promise<void> { async insertDetailData(body: T, detailData: TransactionDetailDto[], queryRunner: QueryRunner, insertedData: T): Promise<void> {
for (let row of detailData) { for (let row of detailData) {
await this.insertDetailData2ndLevel(body[row.detailName], row, queryRunner, insertedData, insertedData); await this.insertDetailData2ndLevel(body[row.detailName], row, queryRunner, insertedData, insertedData);
} }
} }
async deleteDetailDataTabels(id: string | number, detailDataFormat: TransactionDetailDto[], queryRunner: QueryRunner): Promise<any> { async deleteDetailDataTabels(id: string | number, detailDataFormat: TransactionDetailDto[], queryRunner: QueryRunner): Promise<any> {
for (let row of detailDataFormat) { for (let row of detailDataFormat) {
await this.deleteDetailTableData(id, row, queryRunner); await this.deleteDetailTableData(id, row, queryRunner);
} }
} }
async deleteDetailTableData(id: string | number, detailData: TransactionDetailDto, queryRunner: QueryRunner): Promise<any> { async deleteDetailTableData(id: string | number, detailData: TransactionDetailDto, queryRunner: QueryRunner): Promise<any> {
if (detailData.childDetail && detailData.childDetail.length > 0) { if (detailData.childDetail && detailData.childDetail.length > 0) {
for (let child of detailData.childDetail) { for (let child of detailData.childDetail) {
await this.deleteDetailTableData(id, child, queryRunner); await this.deleteDetailTableData(id, child, queryRunner);
} }
} }
if (id) { if (id) {
let filter = {}; let filter = {};
if(detailData.foreignKeyColumnName) { if (detailData.foreignKeyColumnName) {
filter[detailData.foreignKeyColumnName] = id; filter[detailData.foreignKeyColumnName] = id;
}else{ } else {
filter[detailData.foreignKeyAssignmentColumnName.columnName] = id; filter[detailData.foreignKeyAssignmentColumnName.columnName] = id;
} }
await queryRunner.manager.delete(detailData.repo.metadata.name, filter); await queryRunner.manager.delete(detailData.repo.metadata.name, filter);
@ -235,7 +236,7 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
detData["crud"] = "D"; detData["crud"] = "D";
} }
} }
row[child.detailName] = await this.deleteDetailData(row[child.detailName], child, queryRunner); row[child.detailName] = await this.deleteDetailData(row[child.detailName], child, queryRunner);
} }
} }
} }
@ -258,13 +259,13 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
for (let col of eagerCols) { for (let col of eagerCols) {
delete row[col]; delete row[col];
} }
if (this.TXN_TYPE) row[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE; if (this.TXN_TYPE) row[this.DETAIL_DATA_FORMAT[0].transactionTypeColumnName] = this.TXN_TYPE;
if(detailData.foreignKeyColumnName){ if (detailData.foreignKeyColumnName) {
row[detailData.foreignKeyColumnName]=headerData[this.MAIN_KEY]; row[detailData.foreignKeyColumnName] = headerData[this.MAIN_KEY];
}else{ } else {
row[detailData.foreignKeyAssignmentColumnName.columnName] row[detailData.foreignKeyAssignmentColumnName.columnName]
= detailHeaderData[detailData.foreignKeyAssignmentColumnName.headerColumn]; = detailHeaderData[detailData.foreignKeyAssignmentColumnName.headerColumn];
} }
row["createdBy"] = 'SYSTEM'; row["createdBy"] = 'SYSTEM';
row["modifiedBy"] = 'SYSTEM'; row["modifiedBy"] = 'SYSTEM';
@ -278,7 +279,7 @@ export class PcdTransactionService<T> implements PcdtTransactionInterface {
if (detailData.childDetail && detailData.childDetail.length > 0) { if (detailData.childDetail && detailData.childDetail.length > 0) {
for (let child of detailData.childDetail) { for (let child of detailData.childDetail) {
if (body && body.length > 0) { if (body && body.length > 0) {
await this.insertDetailData2ndLevel(row[child.detailName], child, queryRunner, headerData, deatilInsResult); await this.insertDetailData2ndLevel(row[child.detailName], child, queryRunner, headerData, deatilInsResult);
} }
} }
} }

6
src/tables/covers-lov/covers-lov.entity.ts
Unescape Escape View File

@ -1,6 +1,7 @@
import { PcdBaseDto } from "src/framework/custom/pcd-dto.custom"; import { PcdBaseDto } from "src/framework/custom/pcd-dto.custom";
import { PcdBaseEntity } from "src/framework/custom/pcd-entity.custom"; import { PcdBaseEntity } from "src/framework/custom/pcd-entity.custom";
import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
import { CoverDoc } from "../covers-master/covers-master.entity";
@Entity('covers-lov') @Entity('covers-lov')
export class CoversLov extends PcdBaseEntity{ export class CoversLov extends PcdBaseEntity{
@ -18,4 +19,7 @@ export class CoversLov extends PcdBaseEntity{
}) })
coverType:string coverType:string
@OneToMany(() => CoverDoc, (coverDoc) => coverDoc.coverTypeD )
coverDoc:CoverDoc[]
} }

14
src/tables/covers-master/covers-master.controller.ts
Unescape Escape View File

@ -1,4 +1,16 @@
import { Controller } from '@nestjs/common'; import { Controller } from '@nestjs/common';
import { CoverMasterDto } from 'src/dto/cover-master.dto';
import { PcdFormGridController } from 'src/framework/beans/pcd-form-grid.controller';
import { CoversMasterService } from './covers-master.service';
@Controller('covers-master') @Controller('covers-master')
export class CoversMasterController {} export class CoversMasterController extends PcdFormGridController<CoverMasterDto>{
constructor(
private coversMasterService: CoversMasterService
) {
super(coversMasterService);
}
}

61
src/tables/covers-master/covers-master.entity.ts
Unescape Escape View File

@ -1,47 +1,56 @@
import { PcdBaseEntity } from "src/framework/custom/pcd-entity.custom"; import { PcdBaseEntity } from "src/framework/custom/pcd-entity.custom";
import { TenderMaster } from "src/tables/tender-master/tender-master.entity"; import { TenderMaster } from "src/tables/tender-master/tender-master.entity";
import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm";
import { CoversLov } from "../covers-lov/covers-lov.entity";
import { FileFormat } from "../file-format-lov/file-format-lov.entity";
@Entity('cover-doc-master') @Entity('cover-doc-master')
export class CoverDoc extends PcdBaseEntity{ export class CoverDoc extends PcdBaseEntity {
@PrimaryColumn({ @PrimaryGeneratedColumn({
name:"id" name: "id"
}) })
id:number id: number
@Column({ @Column({
name:"tender_id", name: "tender_id",
type:"numeric", type: "numeric",
//length:500, //length:500,
nullable:true nullable: true
}) })
tenderId:number tenderId: number
@Column({ @Column({
name:"cover_type", name: "cover_type",
type:"varchar", type: "numeric",
length:500,
nullable:true nullable: true
}) })
coverType:string coverType: string
@Column({ @Column({
name:"desc", name: "desc",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
Description:string Description: string
@Column({ @Column({
name:"file_format", name: "file_format",
type:"varchar", type: "numeric",
length:500,
nullable:true nullable: true
}) })
fileFormat:string fileFormat: string
@ManyToOne(() => TenderMaster,(tenderMaster)=> tenderMaster.coverDoc) @ManyToOne(() => TenderMaster, (tenderMaster) => tenderMaster.coverDoc)
@JoinColumn([{ name: "tender_id", referencedColumnName: "id" }]) @JoinColumn([{ name: "tender_id", referencedColumnName: "id" }])
tenderIdD:TenderMaster tenderIdD: TenderMaster
@ManyToOne(() => CoversLov, (coversLov) => coversLov.coverType, { eager: true })
@JoinColumn([{ name: "cover_type", referencedColumnName: "id" }])
coverTypeD: CoversLov
@ManyToOne(() => FileFormat, (fileFormat) => fileFormat.fileFormat, { eager: true })
@JoinColumn([{ name: "file_format", referencedColumnName: "id" }])
fileFormatD: FileFormat
} }

7
src/tables/covers-master/covers-master.module.ts
Unescape Escape View File

@ -1,8 +1,15 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { CoversMasterService } from './covers-master.service'; import { CoversMasterService } from './covers-master.service';
import { CoversMasterController } from './covers-master.controller'; import { CoversMasterController } from './covers-master.controller';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AuthModule } from 'src/auth/auth.module';
import { CoverMasterRepository } from './covers-master.repository';
@Module({ @Module({
imports: [
TypeOrmModule.forFeature([CoverMasterRepository]),
AuthModule
],
providers: [CoversMasterService], providers: [CoversMasterService],
controllers: [CoversMasterController] controllers: [CoversMasterController]
}) })

2
src/tables/covers-master/covers-master.repository.ts
Unescape Escape View File

@ -2,6 +2,6 @@ import { EntityRepository, Repository } from "typeorm";
import { CoverDoc } from "./covers-master.entity"; import { CoverDoc } from "./covers-master.entity";
@EntityRepository(CoverDoc) @EntityRepository(CoverDoc)
export class importantDocRepository extends Repository<CoverDoc>{ export class CoverMasterRepository extends Repository<CoverDoc>{
} }

15
src/tables/covers-master/covers-master.service.ts
Unescape Escape View File

@ -1,4 +1,17 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { CoverMasterDto } from 'src/dto/cover-master.dto';
import { PcdFormGridService } from 'src/framework/beans/pcd-form-grid.service';
import { CoverMasterRepository } from './covers-master.repository';
@Injectable() @Injectable()
export class CoversMasterService {} export class CoversMasterService extends PcdFormGridService<CoverMasterDto>{
constructor(
@InjectRepository(CoverMasterRepository)
private coverMasterRepository: CoverMasterRepository,
) {
super(coverMasterRepository);
}
}

6
src/tables/file-format-lov/file-format-lov.entity.ts
Unescape Escape View File

@ -1,5 +1,6 @@
import { PcdBaseEntity } from "src/framework/custom/pcd-entity.custom"; import { PcdBaseEntity } from "src/framework/custom/pcd-entity.custom";
import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
import { CoverDoc } from "../covers-master/covers-master.entity";
@Entity('file-format') @Entity('file-format')
export class FileFormat extends PcdBaseEntity{ export class FileFormat extends PcdBaseEntity{
@ -15,4 +16,7 @@ export class FileFormat extends PcdBaseEntity{
nullable:true nullable:true
}) })
fileFormat:string fileFormat:string
@OneToMany(() => CoverDoc, (coverDoc) => coverDoc.fileFormatD )
coverDoc:CoverDoc[]
} }

1
src/tables/form-of-contract/form-of-contract.module.ts
Unescape Escape View File

@ -1,7 +1,6 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { FormOfContractController } from './form-of-contract.controller'; import { FormOfContractController } from './form-of-contract.controller';
import { FormOfContractService } from './form-of-contract.service'; import { FormOfContractService } from './form-of-contract.service';
import { typeOrmConfig } from 'src/config/typeorm.config';
import { TypeOrmModule } from '@nestjs/typeorm'; import { TypeOrmModule } from '@nestjs/typeorm';
import { FormOfContractRepository } from './form-of-contract.repository'; import { FormOfContractRepository } from './form-of-contract.repository';
import { AuthModule } from 'src/auth/auth.module'; import { AuthModule } from 'src/auth/auth.module';

2
src/tables/tender-documents/tender-doc.entity.ts
Unescape Escape View File

@ -48,7 +48,7 @@ export class TenderDoc extends PcdBaseEntity{
type:"varchar", type:"varchar",
nullable:true nullable:true
}) })
docCategory:string documentCategory:string
@ManyToOne(() => TenderMaster,(tenderMaster)=> tenderMaster.TenderDoc) @ManyToOne(() => TenderMaster,(tenderMaster)=> tenderMaster.TenderDoc)
@JoinColumn([{ name: "tender_id", referencedColumnName: "id" }]) @JoinColumn([{ name: "tender_id", referencedColumnName: "id" }])

508
src/tables/tender-master/tender-master.entity.ts
Unescape Escape View File

@ -11,386 +11,386 @@ import { Column, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryColumn, Primar
import { CoverDoc } from "../covers-master/covers-master.entity"; import { CoverDoc } from "../covers-master/covers-master.entity";
@Entity('tender_master') @Entity('tender_master')
export class TenderMaster extends PcdBaseEntity{ export class TenderMaster extends PcdBaseEntity {
@PrimaryGeneratedColumn({ @PrimaryGeneratedColumn({
name:'id' name: 'id'
}) })
id:number id: number
@Column({ @Column({
name:'org_chain', name: 'org_chain',
type:'varchar', type: 'varchar',
length:500, length: 500,
nullable:true nullable: true
}) })
orgChain:string orgChain: string
@Column({ @Column({
name:'tender_ref_no', name: 'tender_ref_no',
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
tenderRefNo:string tenderRefNo: string
@Column({ @Column({
name:"tender_id", name: "tender_id",
type:'varchar', type: 'varchar',
length:510, length: 510,
nullable:true nullable: true
}) })
tenderId:string tenderId: string
@Column({ @Column({
name:"allow_tech_eval", name: "allow_tech_eval",
type:"char", type: "char",
length:1, length: 1,
nullable:true nullable: true
}) })
allowTechEval:string allowTechEval: string
@Column({ @Column({
name:"payment_mode", name: "payment_mode",
type:'numeric', type: 'numeric',
nullable:true nullable: true
}) })
paymentMode:number paymentMode: number
@Column({ @Column({
name:'allow_withdraw', name: 'allow_withdraw',
type :'char', type: 'char',
length:1, length: 1,
nullable:true nullable: true
}) })
allowWithdraw:string allowWithdraw: string
@Column({ @Column({
name:'no_of_covers', name: 'no_of_covers',
type:'int', type: 'int',
nullable:true, nullable: true,
default: () => "(0)" default: () => "(0)"
}) })
noOfCovers:string noOfCovers: string
@Column({ @Column({
name:'itemwise_tech_eval', name: 'itemwise_tech_eval',
type:'char', type: 'char',
length:1, length: 1,
nullable:true nullable: true
}) })
itemwiseTechEval:string itemwiseTechEval: string
@Column({ @Column({
name:'allow_two_stage', name: 'allow_two_stage',
type:'char', type: 'char',
length:1, length: 1,
nullable:true nullable: true
}) })
allowTwoStageBid:string allowTwoStageBid: string
@Column({ @Column({
name:'tender_fee', name: 'tender_fee',
type:'int', type: 'int',
nullable:true nullable: true
}) })
tenderFee:string tenderFee: string
@Column({ @Column({
name:'fee_pay_to', name: 'fee_pay_to',
type:"varchar", type: "varchar",
length:100, length: 100,
default:()=>"'Nil'" default: () => "'Nil'"
}) })
feePayableTo:string feePayableTo: string
@Column({ @Column({
name:'fee_pay_at', name: 'fee_pay_at',
type:"varchar", type: "varchar",
length:100, length: 100,
default:()=>"'Nil'" default: () => "'Nil'"
}) })
feePayableAt:string feePayableAt: string
@Column({ @Column({
name:"t_fee_Exemption", name: "t_fee_Exemption",
type:"char", type: "char",
length:1, length: 1,
nullable:true nullable: true
}) })
tenderFeeExemption:string tenderFeeExemption: string
@Column({ @Column({
name:'emd_amt', name: 'emd_amt',
type:'int', type: 'int',
nullable:true nullable: true
}) })
emdAmt:string emdAmt: string
@Column({ @Column({
name:"emd_payable_to", name: "emd_payable_to",
type:"varchar", type: "varchar",
length:100, length: 100,
default :() =>"'Nil'" default: () => "'Nil'"
}) })
emdPayableTo:string emdPayableTo: string
@Column({ @Column({
name:"allow_emd_bg_st", name: "allow_emd_bg_st",
type:"char", type: "char",
length:1, length: 1,
nullable:true nullable: true
}) })
allowEmdBgOrSt:string allowEmdBgOrSt: string
@Column({ @Column({
name:"emd_percentage", name: "emd_percentage",
type:"int", type: "int",
nullable:true nullable: true
}) })
emdPercentage:string emdPercentage: string
@Column({ @Column({
name:"emd_payable_at", name: "emd_payable_at",
type:"varchar", type: "varchar",
length:100, length: 100,
default:() =>"'Nil'" default: () => "'Nil'"
}) })
emdPayableAt:string emdPayableAt: string
@Column({ @Column({
name:"title", name: "title",
type:'varchar', type: 'varchar',
length:500, length: 500,
nullable:true nullable: true
}) })
title:string title: string
@Column({ @Column({
name:"work_desc", name: "work_desc",
type:'varchar', type: 'varchar',
length:500, length: 500,
nullable:true nullable: true
}) })
workDesc:string workDesc: string
@Column({ @Column({
name:"nda_pre_quali", name: "nda_pre_quali",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
ndaPreQualification:string ndaPreQualification: string
@Column({ @Column({
name:"remarks", name: "remarks",
type:"varchar", type: "varchar",
length:500, length: 500,
default:()=>"'NA'" default: () => "'NA'"
}) })
remarks:string remarks: string
@Column({ @Column({
name:"tender_value", name: "tender_value",
type:"int", type: "int",
nullable:true nullable: true
}) })
tenderValue:string tenderValue: string
@Column({ @Column({
name:"contract_type", name: "contract_type",
type:"varchar", type: "varchar",
length:200, length: 200,
nullable:true nullable: true
}) })
contractType:string contractType: string
@Column({ @Column({
name:"location", name: "location",
type :"varchar", type: "varchar",
length:200, length: 200,
nullable:true nullable: true
}) })
location:string location: string
@Column({ @Column({
name:"pre_bid_meet_add", name: "pre_bid_meet_add",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
preBidMeetAdd:string preBidMeetAdd: string
@Column({ @Column({
name:"allow_nda_tender", name: "allow_nda_tender",
type:"char", type: "char",
length:1, length: 1,
nullable:true nullable: true
}) })
allowNdaTender:string allowNdaTender: string
@Column({ @Column({
name:"product_cat", name: "product_cat",
type:"varchar", type: "varchar",
nullable:true nullable: true
}) })
productCategory:string productCategory: string
@Column({ @Column({
name:"bid_validity", name: "bid_validity",
type:'int', type: 'int',
nullable:true nullable: true
}) })
bidValidity:string bidValidity: string
@Column({ @Column({
name:"pincode", name: "pincode",
type:"int", type: "int",
nullable:true nullable: true
}) })
pincode:string pincode: string
@Column({ @Column({
name:"pre_bid_date", name: "pre_bid_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
preBidDate:Date preBidDate: Date
@Column({ @Column({
name:"allow_prefer_bidder", name: "allow_prefer_bidder",
type:"char", type: "char",
length:1, length: 1,
nullable:true nullable: true
}) })
allowPreferencialBidder:string allowPreferencialBidder: string
@Column({ @Column({
name:"sub_category", name: "sub_category",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
subCategory:string subCategory: string
@Column({ @Column({
name:"period_of_work", name: "period_of_work",
type:"int", type: "int",
nullable:true nullable: true
}) })
periodOfWork:string periodOfWork: string
@Column({ @Column({
name:"pre_meet_place", name: "pre_meet_place",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
preBidMeetPlace:string preBidMeetPlace: string
@Column({ @Column({
name:"bid_open_place", name: "bid_open_place",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
bidOpeningPlace:string bidOpeningPlace: string
@Column({ @Column({
name:"publish_date", name: "publish_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
publishDate:Date publishDate: Date
@Column({ @Column({
name:"sale_start_date", name: "sale_start_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
saleStartDate:Date saleStartDate: Date
@Column({ @Column({
name:"clarification_start_d", name: "clarification_start_d",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
clarificationStartDate:Date clarificationStartDate: Date
@Column({ @Column({
name:"bid_sub_start_date", name: "bid_sub_start_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
bidSubStartDate:Date bidSubStartDate: Date
@Column({ @Column({
name:"bid_open_date", name: "bid_open_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
bidOpenDate:Date bidOpenDate: Date
@Column({ @Column({
name:"sale_end_date", name: "sale_end_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
saleEndDate:Date saleEndDate: Date
@Column({ @Column({
name:"clarification_end_d", name: "clarification_end_d",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
clarificationEndDate:Date clarificationEndDate: Date
@Column({ @Column({
name:"bid_sub_end_date", name: "bid_sub_end_date",
type:"timestamp", type: "timestamp",
nullable:true nullable: true
}) })
bidSubEndDate:Date bidSubEndDate: Date
@Column({ @Column({
name:"tender_inv_name", name: "tender_inv_name",
type:"varchar", type: "varchar",
length:100, length: 100,
nullable:true nullable: true
}) })
tenderInvName:string tenderInvName: string
@Column({ @Column({
name:"tender_inv_address", name: "tender_inv_address",
type:"varchar", type: "varchar",
length:500, length: 500,
nullable:true nullable: true
}) })
tenderInvAddess:string tenderInvAddess: string
@Column({ @Column({
name:"tender_type", name: "tender_type",
type:"numeric", type: "numeric",
nullable:true nullable: true
}) })
tenderType:number tenderType: number
@Column({ @Column({
name:"tender_category", name: "tender_category",
type:"numeric", type: "numeric",
nullable:true nullable: true
}) })
tenderCategory:number tenderCategory: number
@Column({ @Column({
name:"form_of_contract", name: "form_of_contract",
type:"numeric", type: "numeric",
nullable:true nullable: true
}) })
formOfContract:number formOfContract: number
@Column({ @Column({
name:"emd_fee_type", name: "emd_fee_type",
type:"varchar", type: "varchar",
nullable:true nullable: true
}) })
emd_fee_type:string emdFeeType: string
@Column({ @Column({
name:"activeyn", name: "activeyn",
type:"varchar", type: "varchar",
length:1, length: 1,
nullable:true nullable: true
}) })
activeYn:string activeYn: string
@OneToMany(() => CoverDoc, (coverDoc) => coverDoc.tenderIdD ) @OneToMany(() => CoverDoc, (coverDoc) => coverDoc.tenderIdD)
coverDoc:CoverDoc[] coverDoc: CoverDoc[]
@OneToMany(() => paymentInstrument, (paymentInstrument) => paymentInstrument.tenderIdD ) @OneToMany(() => paymentInstrument, (paymentInstrument) => paymentInstrument.tenderIdD)
paymentInstrument:paymentInstrument[] paymentInstrument: paymentInstrument[]
@OneToMany(() => TenderDoc, (TenderDoc) => TenderDoc.tenderIdD ) @OneToMany(() => TenderDoc, (TenderDoc) => TenderDoc.tenderIdD)
TenderDoc:TenderDoc[] TenderDoc: TenderDoc[]
@ManyToOne(() => TenderType,(tenderType)=> tenderType.tenderMaster,{eager:true}) @ManyToOne(() => TenderType, (tenderType) => tenderType.tenderMaster, { eager: true })
@JoinColumn([{ name: "tender_type", referencedColumnName: "id" }]) @JoinColumn([{ name: "tender_type", referencedColumnName: "id" }])
tenderTypeD:TenderType tenderTypeD: TenderType
@ManyToOne(() => TenderCategory,(tenderCategory)=> tenderCategory.tenderMaster,{eager:true}) @ManyToOne(() => TenderCategory, (tenderCategory) => tenderCategory.tenderMaster, { eager: true })
@JoinColumn([{ name: "tender_category", referencedColumnName: "id" }]) @JoinColumn([{ name: "tender_category", referencedColumnName: "id" }])
tenderCategoryD:TenderCategory tenderCategoryD: TenderCategory
@ManyToOne(() => PaymentMode,(paymentMode)=> paymentMode.tenderMaster,{eager:true}) @ManyToOne(() => PaymentMode, (paymentMode) => paymentMode.tenderMaster, { eager: true })
@JoinColumn([{ name: "payment_mode", referencedColumnName: "id" }]) @JoinColumn([{ name: "payment_mode", referencedColumnName: "id" }])
paymentModeD:PaymentMode paymentModeD: PaymentMode
@ManyToOne(() => FormOfContract,(formOfContract)=> formOfContract.tenderMaster,{eager:true}) @ManyToOne(() => FormOfContract, (formOfContract) => formOfContract.tenderMaster, { eager: true })
@JoinColumn([{ name: "form_of_contract", referencedColumnName: "id" }]) @JoinColumn([{ name: "form_of_contract", referencedColumnName: "id" }])
formOfContractD:FormOfContract formOfContractD: FormOfContract
@ManyToOne(() => ProductCategory,(productCategory)=> productCategory.tenderMaster,{eager:true}) @ManyToOne(() => ProductCategory, (productCategory) => productCategory.tenderMaster, { eager: true })
@JoinColumn([{ name: "product_cat", referencedColumnName: "id" }]) @JoinColumn([{ name: "product_cat", referencedColumnName: "id" }])
productCategoryD:ProductCategory productCategoryD: ProductCategory
@ManyToOne(() => EmdFeeType,(EmdFeeType)=> EmdFeeType.tenderMaster,{eager:true}) @ManyToOne(() => EmdFeeType, (EmdFeeType) => EmdFeeType.tenderMaster, { eager: true })
@JoinColumn([{ name: "emd_fee_type", referencedColumnName: "id" }]) @JoinColumn([{ name: "emd_fee_type", referencedColumnName: "id" }])
emdFeeTypeD:ProductCategory emdFeeTypeD: ProductCategory
} }

11
src/transactions/tender/tender.controller.ts
Unescape Escape View File

@ -1,4 +1,4 @@
import { Controller,UseGuards } from '@nestjs/common'; import { Body, Controller, Get, UseGuards } from '@nestjs/common';
import { TenderDetailDto } from 'src/dto/tender-master.dto'; import { TenderDetailDto } from 'src/dto/tender-master.dto';
import { PcdTransactionController } from 'src/framework/beans/pcd-transaction.controller'; import { PcdTransactionController } from 'src/framework/beans/pcd-transaction.controller';
import { TenderService } from './tender.service'; import { TenderService } from './tender.service';
@ -11,4 +11,11 @@ export class TenderController extends PcdTransactionController<TenderDetailDto>
private tenderService: TenderService private tenderService: TenderService
) { ) {
super(tenderService); super(tenderService);
}} }
@Get('admin')
async getTender() {
return this.tenderService.GetAdminTenderD()
}
}

1
src/transactions/tender/tender.module.ts
Unescape Escape View File

@ -8,6 +8,7 @@ import { AuthModule } from 'src/auth/auth.module';
@Module({ @Module({
imports: [ imports: [
TypeOrmModule.forFeature([TenderMasterRepository]), TypeOrmModule.forFeature([TenderMasterRepository]),
AuthModule
], ],
controllers: [TenderController], controllers: [TenderController],
providers: [TenderService] providers: [TenderService]

34
src/transactions/tender/tender.service.ts
Unescape Escape View File

@ -1,11 +1,13 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { PcduserDto } from 'src/auth/dto/pcd-user.dto';
import { TenderDetailDto } from 'src/dto/tender-master.dto'; import { TenderDetailDto } from 'src/dto/tender-master.dto';
import { PcdTransactionService } from 'src/framework/beans/pcd-transaction.service'; import { PcdTransactionService } from 'src/framework/beans/pcd-transaction.service';
import { TransactionDetailDto } from 'src/framework/custom/transaction-detail.dto'; import { TransactionDetailDto } from 'src/framework/custom/transaction-detail.dto';
import { CoverMasterRepository } from 'src/tables/covers-master/covers-master.repository';
import { tenderDocRepository } from 'src/tables/tender-documents/tender-doc.repository'; import { tenderDocRepository } from 'src/tables/tender-documents/tender-doc.repository';
import { TenderMasterRepository } from 'src/tables/tender-master/tender-master.repository'; import { TenderMasterRepository } from 'src/tables/tender-master/tender-master.repository';
import { Connection } from 'typeorm'; import { Connection, FindManyOptions, LessThanOrEqual, MoreThanOrEqual } from 'typeorm';
@Injectable() @Injectable()
export class TenderService extends PcdTransactionService<TenderDetailDto>{ export class TenderService extends PcdTransactionService<TenderDetailDto>{
@ -13,7 +15,15 @@ export class TenderService extends PcdTransactionService<TenderDetailDto>{
DETAIL_DATA_FORMAT: TransactionDetailDto[] = [ DETAIL_DATA_FORMAT: TransactionDetailDto[] = [
{ {
detailName: "tenderDoc", repo: this.conn.getCustomRepository(tenderDocRepository), detailName: "tenderDoc", repo: this.conn.getCustomRepository(tenderDocRepository),
filter: [{ columnName: "tenderId", headerColumn: "id" }],
foreignKeyColumnName: "tenderId",
childDetail: [],
addtionalSettingOfRowsInInsertion: [],
orderByColumn: { columnName: "id", sort: "DESC" }
},
{
detailName: "covers", repo: this.conn.getCustomRepository(CoverMasterRepository),
filter: [{ columnName: "tenderId", headerColumn: "id" }], filter: [{ columnName: "tenderId", headerColumn: "id" }],
foreignKeyColumnName: "tenderId", foreignKeyColumnName: "tenderId",
childDetail: [], childDetail: [],
@ -25,9 +35,23 @@ export class TenderService extends PcdTransactionService<TenderDetailDto>{
private conn: Connection, private conn: Connection,
@InjectRepository(TenderMasterRepository) @InjectRepository(TenderMasterRepository)
private tenderMasterRepository: TenderMasterRepository, private tenderMasterRepository: TenderMasterRepository,
){ ) {
super(conn, conn.getCustomRepository(TenderMasterRepository)); super(conn, conn.getCustomRepository(TenderMasterRepository));
// this.TenderMasterRepository = conn.getCustomRepository(SisPaymentDetailRepository) // this.TenderMasterRepository = conn.getCustomRepository(SisPaymentDetailRepository)
} }
async preFindList(filter: FindManyOptions, user: PcduserDto): Promise<boolean> {
if (!filter.where) filter.where = {};
if (!user || user.secuLevel == 'U') {
filter.where["publishDate"] = LessThanOrEqual(new Date());
filter.where["bidOpenDate"] = MoreThanOrEqual(new Date());
}
return true
}
async GetAdminTenderD() {
return this.tenderMasterRepository.find()
}
} }

Write Preview
Loading…
Cancel
Save