diff --git a/exthernal-login-api/src/services/loginservice.js b/exthernal-login-api/src/services/loginservice.js index bb775cd..bd175ff 100644 --- a/exthernal-login-api/src/services/loginservice.js +++ b/exthernal-login-api/src/services/loginservice.js @@ -44,7 +44,7 @@ export class LoginService { this.generalService.devhint(2, 'loginservice.js', 'token generated successfully') - delete user.usrseq + // delete user.usrseq delete user.usrnam delete user.usrpwd delete user.usrorg diff --git a/exthernal-ttc-api/src/controllers/projectAddController.js b/exthernal-ttc-api/src/controllers/projectAddController.js index 71b63fb..175a605 100644 --- a/exthernal-ttc-api/src/controllers/projectAddController.js +++ b/exthernal-ttc-api/src/controllers/projectAddController.js @@ -6,6 +6,7 @@ import { verifyToken, generateToken } from '../utils/token.js' import { Interface } from '../interfaces/Interface.js'; import fs from 'fs'; import path from 'path'; +import { getDTM } from '../utils/date.js'; export class projectAdd { @@ -19,11 +20,7 @@ export class projectAdd { async onNavigate(req, res) { this.generalService.devhint(1, 'projectAdd.js', 'onNavigate() start'); - // Check Content-Type: ต้องเป็น multipart/form-data เท่านั้น ถ้ามีการส่งไฟล์ - // (multer เช็คให้ระดับนึงแล้ว แต่เพิ่มความชัวร์ถ้าต้องการ) - - let organization = ''; - + let organization = req.body.organization; const prommis = await this.onProjectAdd(req, res, organization); return prommis; } @@ -36,7 +33,6 @@ export class projectAdd { let token = req.headers.authorization?.split(' ')[1]; const decoded = verifyToken(token); - // Form-Data Body const requestData = req.body; let name = requestData.prjnam; @@ -56,7 +52,6 @@ export class projectAdd { let prommis = await this.makeArySave(req, currentSeq); return prommis } else { - // Cleanup Temp Files if Duplicate if (req.files) { req.files.forEach(f => { if (fs.existsSync(f.path)) fs.unlinkSync(f.path); @@ -71,8 +66,16 @@ export class projectAdd { const requestData = req.body; const nextSeq = latseq + 1; - const prjwntbdg = (requestData.prjwntbdg && requestData.prjwntbdg !== '') ? requestData.prjwntbdg : '0.00'; - const prjusrseq = (requestData.prjusrseq && requestData.prjusrseq !== '') ? requestData.prjusrseq : null; + let prjwntbdg = requestData.prjwntbdg; + if (!prjwntbdg || prjwntbdg === '' || prjwntbdg === 'undefined' || prjwntbdg === 'null') { + prjwntbdg = '0.00'; + } + + let prjusrseq = requestData.prjusrseq; + if (!prjusrseq || prjusrseq === '' || prjusrseq === 'undefined' || prjusrseq === 'null') { + prjusrseq = null; + } + const typ = requestData.typ; let arysave = { @@ -84,10 +87,9 @@ export class projectAdd { prjacpbdg: '0.00', prjbdgcod: '', prjcomstt: requestData.prjcomstt || 'UAC', - prjacpdtm: requestData.prjacpdtm || null + prjacpdtm: getDTM(), } - // Logic ย้ายหลายไฟล์ let savedFileNames = []; if (req.files && req.files.length > 0) { if (typ === 'prj') { @@ -98,14 +100,12 @@ export class projectAdd { fs.mkdirSync(targetDir, { recursive: true }); } - // Loop ย้ายไฟล์ทีละไฟล์ req.files.forEach(file => { const targetPath = path.join(targetDir, file.filename); fs.renameSync(file.path, targetPath); savedFileNames.push(file.filename); }); - // บันทึกชื่อไฟล์ลง DB (คั่นด้วย Comma) arysave.prjdoc = savedFileNames.join(','); } catch (err) { @@ -113,8 +113,6 @@ export class projectAdd { return sendError('ไม่สามารถบันทึกไฟล์ลงโฟลเดอร์โครงการได้'); } } else { - // ไม่ใช่ typ prj ไม่ย้าย (แต่ต้องเก็บชื่อไว้ หรือลบทิ้ง แล้วแต่ Business Logic) - // ในที่นี้เก็บชื่อ Temp ไว้ก่อน arysave.prjdoc = req.files.map(f => f.filename).join(','); } } diff --git a/exthernal-ttc-api/src/controllers/projectSearchController.js b/exthernal-ttc-api/src/controllers/projectSearchController.js index 05d584d..f41f4fe 100644 --- a/exthernal-ttc-api/src/controllers/projectSearchController.js +++ b/exthernal-ttc-api/src/controllers/projectSearchController.js @@ -34,13 +34,13 @@ export class projectSearch { if (columnParams == 'user') { - let column = `prjnam, prjwntbdg, prjcomstt` + let column = `prjseq, prjnam, prjwntbdg, prjcomstt` condition['prjusrseq'] = req.body.request.prjusrseq || decoded.id // เรียก Service ตัวเดิม (Simple) aryResult = await this.projectSearchService.getProjectSearch(database, column, condition); } else if (columnParams == 'edit') { - let column = `prjnam, prjwntbdg, prjcomstt` + let column = `prjseq, prjnam, prjwntbdg, prjcomstt` condition['prjseq'] = req.body.request.prjseq // เรียก Service ตัวเดิม (Simple)