diff --git a/exthernal-ttc-api/src/controllers/budgetAddController.js b/exthernal-ttc-api/src/controllers/budgetAddController.js index dda67da..3b0e3af 100644 --- a/exthernal-ttc-api/src/controllers/budgetAddController.js +++ b/exthernal-ttc-api/src/controllers/budgetAddController.js @@ -29,10 +29,11 @@ export class budgetAdd { let token = req.body.request.token; const decoded = verifyToken(token); - let id = decoded.bdgseq + let name = req.body.request.bdgnam; + let id = req.body.request.bdgseq; database = decoded.organization - aryResult = await this.budgetAddService.getBudgetAdd(database, id); // เช็คกับ db กลาง ส่ง jwttoken ออกมา + aryResult = await this.budgetAddService.getBudgetAdd(database, id, name); // เช็คกับ db กลาง ส่ง jwttoken ออกมา // this.generalService.devhint(1, 'budgetSearch.js', 'Login success'); } catch (error) { idx = 1; @@ -51,8 +52,10 @@ export class budgetAdd { let arysave = { methods: 'post', bdgseq: req.body.request.bdgseq, + bdgnam: req.body.request.bdgnam, + bdgcod: req.body.request.bdgcod, bdgttl: req.body.request.bdgttl } - return this.Interface.saveInterface('bdgmst', req, arysave); + return this.Interface.saveInterface('bdgmst', arysave, req); } } diff --git a/exthernal-ttc-api/src/interfaces/Interface.js b/exthernal-ttc-api/src/interfaces/Interface.js index 21238b6..cc7047e 100644 --- a/exthernal-ttc-api/src/interfaces/Interface.js +++ b/exthernal-ttc-api/src/interfaces/Interface.js @@ -14,7 +14,7 @@ export class Interface { // =============================================================== // 📌 saveInterface → แกะ token เอง และ route ไปยัง interface เฉพาะ table // =============================================================== - async saveInterface(tableName, req, data) { + async saveInterface(tableName, data, req) { // ------------------------------ // ✔ 1) จับ Interface ที่ตรงกับ table diff --git a/exthernal-ttc-api/src/interfaces/table/bdgmstInterface.js b/exthernal-ttc-api/src/interfaces/table/bdgmstInterface.js index c1abb87..e66d11f 100644 --- a/exthernal-ttc-api/src/interfaces/table/bdgmstInterface.js +++ b/exthernal-ttc-api/src/interfaces/table/bdgmstInterface.js @@ -9,7 +9,7 @@ export class BdgmstInterface { } async saveInterface(database, data) { - const method = data.method.toLowerCase() + const method = data.methods.toLowerCase() const payload = { ...data } delete payload.method diff --git a/exthernal-ttc-api/src/routes/route.js b/exthernal-ttc-api/src/routes/route.js index 76b32d4..698828c 100644 --- a/exthernal-ttc-api/src/routes/route.js +++ b/exthernal-ttc-api/src/routes/route.js @@ -7,7 +7,7 @@ import { budgetAdd } from '../controllers/budgetAddController.js' // import { sendResponse } from '../utils/response.js' const router = express.Router() -const controller_budgetSearch_get = new budgetSearch() +const controller_budgetSearch_post = new budgetSearch() const controller_budgetAdd_put = new budgetAdd() // router.post('/budgetSetup', async (req, res) => { @@ -21,7 +21,7 @@ router.post('/budgetadd', async (req, res) => { }) router.post('/budgetsearch', async (req, res) => { - const result = await controller_budgetSearch_get.onNavigate(req, res) + const result = await controller_budgetSearch_post.onNavigate(req, res) if (result) return res.json(result) }) diff --git a/exthernal-ttc-api/src/services/budgetAddService.js b/exthernal-ttc-api/src/services/budgetAddService.js index 6ffbdd4..2c6d51d 100644 --- a/exthernal-ttc-api/src/services/budgetAddService.js +++ b/exthernal-ttc-api/src/services/budgetAddService.js @@ -6,15 +6,15 @@ export class BudgetAddService { this.generalService = new GeneralService() } - async getBudgetAdd(database, id) { + async getBudgetAdd(database, id, name) { const sql = ` SELECT bdgseq, - bdgttl + bdgnam FROM ${database}.bdgmst - WHERE bdgseq = $1 + WHERE bdgseq = $1 AND bdgnam = $2 ` - const params = [id] + const params = [id, name] const result = await this.generalService.executeQueryParam(database, sql, params); return result }