김성욱

Modify conflict code

Showing 1 changed file with 369 additions and 376 deletions
...@@ -5,7 +5,6 @@ const bodyParser = require('body-parser'); ...@@ -5,7 +5,6 @@ const bodyParser = require('body-parser');
5 5
6 const apiRouter = express.Router(); 6 const apiRouter = express.Router();
7 7
8 -
9 app.use(bodyParser.json()); 8 app.use(bodyParser.json());
10 app.use(bodyParser.urlencoded({ 9 app.use(bodyParser.urlencoded({
11 extended: true 10 extended: true
...@@ -14,11 +13,7 @@ app.use(bodyParser.urlencoded({ ...@@ -14,11 +13,7 @@ app.use(bodyParser.urlencoded({
14 app.use('/api', apiRouter); 13 app.use('/api', apiRouter);
15 14
16 let userDB = new Array(); 15 let userDB = new Array();
17 -let mbtiper = new Array();
18 16
19 -<<<<<<< HEAD
20 -apiRouter.post('/test', (req, res) => {
21 -=======
22 apiRouter.post('/sayHello', function(req, res) { 17 apiRouter.post('/sayHello', function(req, res) {
23 const responseBody = { 18 const responseBody = {
24 version: "2.0", 19 version: "2.0",
...@@ -52,35 +47,19 @@ apiRouter.post('/question1', (req, res) => { ...@@ -52,35 +47,19 @@ apiRouter.post('/question1', (req, res) => {
52 console.log('[q1:user message] ', mesg); 47 console.log('[q1:user message] ', mesg);
53 userDB[userId] = ['','','','','']; 48 userDB[userId] = ['','','','',''];
54 console.log(userDB[userId]); 49 console.log(userDB[userId]);
55 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
56 const responseBody = { 50 const responseBody = {
57 version: "2.0", 51 version: "2.0",
58 template: { 52 template: {
59 outputs: [ 53 outputs: [
60 { 54 {
61 simpleText: { 55 simpleText: {
62 -<<<<<<< HEAD
63 - text: 'MBTI 테스트 question8-14\n시작하려면 시작하기 버튼을 눌러주세요!'
64 -=======
65 text: '금방 새로운 직장 사람들과 어울리기 시작합니다.' 56 text: '금방 새로운 직장 사람들과 어울리기 시작합니다.'
66 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
67 } 57 }
68 } 58 }
69 ], 59 ],
70 quickReplies: [ 60 quickReplies: [
71 { 61 {
72 action: "block", 62 action: "block",
73 -<<<<<<< HEAD
74 - label: "시작하기",
75 - message: "시작하기",
76 - blockId: "62977ff05ceed96c385449b9"
77 - },
78 - {
79 - action: "block",
80 - label: "나중에 하기",
81 - message: "나중에 하기",
82 - blockId: "6297861be7a0253c7662ccb8"
83 -=======
84 label: "네", 63 label: "네",
85 message: "네", 64 message: "네",
86 blockId: "6297b11ae7a0253c7662ccea" 65 blockId: "6297b11ae7a0253c7662ccea"
...@@ -90,7 +69,6 @@ apiRouter.post('/question1', (req, res) => { ...@@ -90,7 +69,6 @@ apiRouter.post('/question1', (req, res) => {
90 label: "아니오", 69 label: "아니오",
91 message: "아니오", 70 message: "아니오",
92 blockId: "6297b11ae7a0253c7662ccea" 71 blockId: "6297b11ae7a0253c7662ccea"
93 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
94 } 72 }
95 ] 73 ]
96 } 74 }
...@@ -98,13 +76,6 @@ apiRouter.post('/question1', (req, res) => { ...@@ -98,13 +76,6 @@ apiRouter.post('/question1', (req, res) => {
98 res.status(200).send(responseBody); 76 res.status(200).send(responseBody);
99 }); 77 });
100 78
101 -<<<<<<< HEAD
102 -apiRouter.post('/question8', (req, res) => {
103 - var userId = req.body.userRequest.user.id;
104 - userDB[userId] = ['','','','',''];
105 - console.log(userDB);
106 - const responseBody = {
107 -=======
108 apiRouter.post('/question2', (req, res) => { 79 apiRouter.post('/question2', (req, res) => {
109 var userId = req.body.userRequest.user.id; 80 var userId = req.body.userRequest.user.id;
110 var mesg = req.body.userRequest.utterance; 81 var mesg = req.body.userRequest.utterance;
...@@ -118,34 +89,18 @@ apiRouter.post('/question2', (req, res) => { ...@@ -118,34 +89,18 @@ apiRouter.post('/question2', (req, res) => {
118 userDB[userId][0] += mbti; 89 userDB[userId][0] += mbti;
119 console.log(userDB[userId]); 90 console.log(userDB[userId]);
120 const responseBody = { 91 const responseBody = {
121 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
122 version: "2.0", 92 version: "2.0",
123 template: { 93 template: {
124 outputs: [ 94 outputs: [
125 { 95 {
126 simpleText: { 96 simpleText: {
127 -<<<<<<< HEAD
128 - text: '[question8]\n여행 계획을 어떻게 세우시나요?'
129 -=======
130 text: '평소 깻잎논쟁에 대해 1시간 이상을 생각해 보는 편입니다.' 97 text: '평소 깻잎논쟁에 대해 1시간 이상을 생각해 보는 편입니다.'
131 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
132 } 98 }
133 } 99 }
134 ], 100 ],
135 quickReplies: [ 101 quickReplies: [
136 { 102 {
137 action: "block", 103 action: "block",
138 -<<<<<<< HEAD
139 - label: "테마만 정한다(ex.맛집 방문하는 날, 사진 찍는 날)",
140 - message: "테마만 정한다(ex.맛집 방문하는 날, 사진 찍는 날)",
141 - blockId: "629780e9e7a0253c7662cca6"
142 - },
143 - {
144 - action: "block",
145 - label: "시간과 장소를 자세하게 정한다",
146 - message: "시간과 장소를 자세하게 정한다",
147 - blockId: "629780e9e7a0253c7662cca6"
148 -=======
149 label: "네", 104 label: "네",
150 message: "네", 105 message: "네",
151 blockId: "6297b122ab89e678ee86b331" 106 blockId: "6297b122ab89e678ee86b331"
...@@ -155,7 +110,6 @@ apiRouter.post('/question2', (req, res) => { ...@@ -155,7 +110,6 @@ apiRouter.post('/question2', (req, res) => {
155 label: "아니오", 110 label: "아니오",
156 message: "아니오", 111 message: "아니오",
157 blockId: "6297b122ab89e678ee86b331" 112 blockId: "6297b122ab89e678ee86b331"
158 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
159 } 113 }
160 ] 114 ]
161 } 115 }
...@@ -163,20 +117,6 @@ apiRouter.post('/question2', (req, res) => { ...@@ -163,20 +117,6 @@ apiRouter.post('/question2', (req, res) => {
163 res.status(200).send(responseBody); 117 res.status(200).send(responseBody);
164 }); 118 });
165 119
166 -<<<<<<< HEAD
167 -apiRouter.post('/question9', (req, res) => {
168 - var mesg = req.body.userRequest.utterance;
169 - var userId = req.body.userRequest.user.id;
170 - var mbti = '';
171 - if (mesg == "테마만 정한다(ex.맛집 방문하는 날, 사진 찍는 날)"){
172 - mbti = 'P';
173 - }
174 - else if (mesg == "시간과 장소를 자세하게 정한다") {
175 - mbti = 'J';
176 - }
177 - userDB[userId][3] += mbti;
178 - console.log(userDB);
179 -=======
180 apiRouter.post('/question3', function(req, res) { 120 apiRouter.post('/question3', function(req, res) {
181 var userId = req.body.userRequest.user.id; 121 var userId = req.body.userRequest.user.id;
182 var mesg = req.body.userRequest.utterance; 122 var mesg = req.body.userRequest.utterance;
...@@ -230,242 +170,17 @@ apiRouter.post('/question4', (req, res) => { ...@@ -230,242 +170,17 @@ apiRouter.post('/question4', (req, res) => {
230 } 170 }
231 userDB[userId][2] += mbti; 171 userDB[userId][2] += mbti;
232 console.log(userDB[userId]); 172 console.log(userDB[userId]);
233 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
234 const responseBody = { 173 const responseBody = {
235 version: "2.0", 174 version: "2.0",
236 template: { 175 template: {
237 outputs: [ 176 outputs: [
238 { 177 {
239 simpleText: { 178 simpleText: {
240 -<<<<<<< HEAD
241 - text: '[question9]\n재미있는 책이나 비디오 게임이 사교 모임보다 더 낫습니다.'
242 -=======
243 text: "주의깊게 미리 계획하기 보다는 즉흥적으로 움직입니다." 179 text: "주의깊게 미리 계획하기 보다는 즉흥적으로 움직입니다."
244 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
245 - }
246 - }
247 - ],
248 - quickReplies: [
249 -<<<<<<< HEAD
250 - {
251 - action: "block",
252 - label: "네",
253 - message: "네",
254 - blockId: "629780f4ab89e678ee86b2de"
255 - },
256 - {
257 - action: "block",
258 - label: "아니오",
259 - message: "아니오",
260 - blockId: "629780f4ab89e678ee86b2de"
261 - }
262 - ]
263 - }
264 - }
265 - res.status(200).send(responseBody);
266 -});
267 -
268 -apiRouter.post('/question10', (req, res) => {
269 - var mesg = req.body.userRequest.utterance;
270 - var userId = req.body.userRequest.user.id;
271 - var mbti = '';
272 - if (mesg == "네"){
273 - mbti = 'I';
274 - }
275 - else if (mesg == "아니오") {
276 - mbti = 'E';
277 - }
278 - userDB[userId][0] += mbti;
279 - console.log(userDB);
280 - const responseBody = {
281 - version: "2.0",
282 - template: {
283 - outputs: [
284 - {
285 - simpleText: {
286 - text: '[question10]\n본인이 창의적이기보다 현실적인 사람이라고 생각합니다.'
287 - }
288 - }
289 - ],
290 - quickReplies: [
291 - {
292 - action: "block",
293 - label: "네",
294 - message: "네",
295 - blockId: "629781015ceed96c385449c8"
296 - },
297 - {
298 - action: "block",
299 - label: "아니오",
300 - message: "아니오",
301 - blockId: "629781015ceed96c385449c8"
302 - }
303 - ]
304 - }
305 - }
306 - res.status(200).send(responseBody);
307 -});
308 -
309 -apiRouter.post('/question11', (req, res) => {
310 - var mesg = req.body.userRequest.utterance;
311 - var userId = req.body.userRequest.user.id;
312 - var mbti = '';
313 - if (mesg == "네"){
314 - mbti = 'S';
315 - }
316 - else if (mesg == "아니오") {
317 - mbti = 'N';
318 - }
319 - userDB[userId][1] += mbti;
320 - console.log(userDB);
321 - const responseBody = {
322 - version: "2.0",
323 - template: {
324 - outputs: [
325 - {
326 - simpleText: {
327 - text: '[question11]\n팀플을 하는 경우, 충실하지만 실적을 못 내는 팀원을 제명하기 어려워합니다.'
328 - }
329 - }
330 - ],
331 - quickReplies: [
332 - {
333 - action: "block",
334 - label: "네",
335 - message: "네",
336 - blockId: "6297810fe7a0253c7662cca8"
337 - },
338 - {
339 - action: "block",
340 - label: "아니오",
341 - message: "아니오",
342 - blockId: "6297810fe7a0253c7662cca8"
343 - }
344 - ]
345 - }
346 - }
347 - res.status(200).send(responseBody);
348 -});
349 -
350 -apiRouter.post('/question12', (req, res) => {
351 - var mesg = req.body.userRequest.utterance;
352 - var userId = req.body.userRequest.user.id;
353 - var mbti = '';
354 - if (mesg == "네"){
355 - mbti = 'F';
356 - }
357 - else if (mesg == "아니오") {
358 - mbti = 'T';
359 - }
360 - userDB[userId][2] += mbti;
361 - console.log(userDB);
362 - const responseBody = {
363 - version: "2.0",
364 - template: {
365 - outputs: [
366 - {
367 - simpleText: {
368 - text: '[question12]\n집과 업무 환경이 잘 정돈되어 있습니다.'
369 - }
370 - }
371 - ],
372 - quickReplies: [
373 - {
374 - action: "block",
375 - label: "네",
376 - message: "네",
377 - blockId: "6297811bf591aa190554a22e"
378 - },
379 - {
380 - action: "block",
381 - label: "아니오",
382 - message: "아니오",
383 - blockId: "6297811bf591aa190554a22e"
384 - }
385 - ]
386 - }
387 - }
388 - res.status(200).send(responseBody);
389 -});
390 -
391 -apiRouter.post('/question13', (req, res) => {
392 - var mesg = req.body.userRequest.utterance;
393 - var userId = req.body.userRequest.user.id;
394 - var mbti = '';
395 - if (mesg == "네"){
396 - mbti = 'J';
397 - }
398 - else if (mesg == "아니오") {
399 - mbti = 'P';
400 - }
401 - userDB[userId][3] += mbti;
402 - console.log(userDB);
403 - const responseBody = {
404 - version: "2.0",
405 - template: {
406 - outputs: [
407 - {
408 - simpleText: {
409 - text: '[question13]\n친구 관계가 좁고 깊은 편입니다.'
410 - }
411 - }
412 - ],
413 - quickReplies: [
414 - {
415 - action: "block",
416 - label: "네",
417 - message: "네",
418 - blockId: "62978127ab89e678ee86b2e2"
419 - },
420 - {
421 - action: "block",
422 - label: "아니오",
423 - message: "아니오",
424 - blockId: "62978127ab89e678ee86b2e2"
425 - }
426 - ]
427 - }
428 - }
429 - res.status(200).send(responseBody);
430 -});
431 -
432 -apiRouter.post('/question14', (req, res) => {
433 - var mesg = req.body.userRequest.utterance;
434 - var userId = req.body.userRequest.user.id;
435 - var mbti = '';
436 - if (mesg == "네"){
437 - mbti = 'I';
438 - }
439 - else if (mesg == "아니오") {
440 - mbti = 'E';
441 - }
442 - userDB[userId][0] += mbti;
443 - console.log(userDB);
444 - const responseBody = {
445 - version: "2.0",
446 - template: {
447 - outputs: [
448 - {
449 - simpleText: {
450 - text: '[question14]\n공부하기 싫을 때 공부는 왜 해야 하는 것인지 고민에 빠질 때가 있습니다.'
451 } 180 }
452 } 181 }
453 ], 182 ],
454 quickReplies: [ 183 quickReplies: [
455 - {
456 - action: "block",
457 - label: "네",
458 - message: "네",
459 - blockId: "62979c9ce7a0253c7662ccd4"
460 - },
461 - {
462 - action: "block",
463 - label: "아니오",
464 - message: "아니오",
465 - blockId: "62979c9ce7a0253c7662ccd4"
466 - }
467 - ]
468 -=======
469 { 184 {
470 action: "block", 185 action: "block",
471 label: "네", 186 label: "네",
...@@ -479,7 +194,6 @@ apiRouter.post('/question14', (req, res) => { ...@@ -479,7 +194,6 @@ apiRouter.post('/question14', (req, res) => {
479 blockId: "6297b12be7a0253c7662ccec" 194 blockId: "6297b12be7a0253c7662ccec"
480 } 195 }
481 ] 196 ]
482 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9
483 } 197 }
484 } 198 }
485 res.status(200).send(responseBody); 199 res.status(200).send(responseBody);
...@@ -608,118 +322,287 @@ apiRouter.post('/question7', (req, res) => { ...@@ -608,118 +322,287 @@ apiRouter.post('/question7', (req, res) => {
608 res.status(200).send(responseBody); 322 res.status(200).send(responseBody);
609 }); 323 });
610 324
611 -apiRouter.post('/result', (req, res) => { 325 +apiRouter.post('/question8', (req, res) => {
612 - var mesg = req.body.userRequest.utterance;
613 var userId = req.body.userRequest.user.id; 326 var userId = req.body.userRequest.user.id;
614 -<<<<<<< HEAD 327 + userDB[userId] = ['','','','',''];
615 - mbtiper = ['','','','','','','','']; 328 + console.log(userDB);
616 - var mbti = '';
617 - if (mesg == "네"){
618 - mbti = 'N';
619 - }
620 - else if (mesg == "아니오") {
621 - mbti = 'S';
622 - }
623 - userDB[userId][1] += mbti;
624 - var e = 0;
625 - var n = 0;
626 - var f = 0;
627 - var j = 0;
628 - for(i=0; i<2; i++){
629 - if(userDB[userId][0][i] == "E"){
630 - e++;
631 - }
632 - }
633 - for(i=0; i<2; i++){
634 - if(userDB[userId][1][i] == "N"){
635 - n++;
636 - }
637 - }
638 - for(i=0; i<1; i++){
639 - if(userDB[userId][2][i] == "F"){
640 - f++;
641 - }
642 - }
643 - for(i=0; i<2; i++){
644 - if(userDB[userId][3][i] == "J"){
645 - j++;
646 - }
647 - }
648 - var i = 2-e;
649 - var s = 2-n;
650 - var t = 1-f;
651 - var p = 2-j;
652 - mbtiper[0] += 20 * e;
653 - mbtiper[1] += 20 * i;
654 - mbtiper[2] += 20 * n;
655 - mbtiper[3] += 20 * s;
656 - mbtiper[4] += 20 * t;
657 - mbtiper[5] += 20 * f;
658 - mbtiper[6] += 20 * j;
659 - mbtiper[7] += 20 * p;
660 - if(mbtiper[0]>mbtiper[1]){
661 - userDB[userId][4] += 'E';
662 - } else {
663 - userDB[userId][4] += 'I';
664 - }
665 - if(mbtiper[2]>mbtiper[3]){
666 - userDB[userId][4] += 'N';
667 - } else {
668 - userDB[userId][4] += 'S';
669 - }
670 - if(mbtiper[4]>mbtiper[5]){
671 - userDB[userId][4] += 'T';
672 - } else {
673 - userDB[userId][4] += 'F';
674 - }
675 - if(mbtiper[6]>mbtiper[7]){
676 - userDB[userId][4] += 'J';
677 - } else {
678 - userDB[userId][4] += 'P';
679 - }
680 const responseBody = { 329 const responseBody = {
681 version: "2.0", 330 version: "2.0",
682 template: { 331 template: {
683 outputs: [ 332 outputs: [
684 { 333 {
685 simpleText: { 334 simpleText: {
686 - text: "당신의 MBTI는 : "+userDB[userId][4] 335 + text: '[question8]\n여행 계획을 어떻게 세우시나요?'
687 } 336 }
688 } 337 }
689 ], 338 ],
690 - quickReplies: [{ 339 + quickReplies: [
691 - action: "block", 340 + {
692 - label: "MBTI 테스트 다시하기", 341 + action: "block",
693 - message: "MBTI 테스트 다시하기", 342 + label: "테마만 정한다(ex.맛집 방문하는 날, 사진 찍는 날)",
694 - blockId : "62977ff05ceed96c385449b9" 343 + message: "테마만 정한다(ex.맛집 방문하는 날, 사진 찍는 날)",
695 - }, 344 + blockId: "629780e9e7a0253c7662cca6"
696 - { 345 + },
697 - action: "block", 346 + {
698 - label: "결과 상세보기", 347 + action: "block",
699 - message: "결과 상세보기", 348 + label: "시간과 장소를 자세하게 정한다",
700 - blockId: "62987b78e7a0253c7662dcd9" 349 + message: "시간과 장소를 자세하게 정한다",
701 - }] 350 + blockId: "629780e9e7a0253c7662cca6"
702 - } 351 + }
703 - } 352 + ]
704 - res.status(200).send(responseBody); 353 + }
705 - }); 354 + }
706 - 355 + res.status(200).send(responseBody);
707 -apiRouter.post('/percent', (req, res) => { 356 + });
357 +
358 + apiRouter.post('/question9', (req, res) => {
359 + var mesg = req.body.userRequest.utterance;
360 + var userId = req.body.userRequest.user.id;
361 + var mbti = '';
362 + if (mesg == "테마만 정한다(ex.맛집 방문하는 날, 사진 찍는 날)"){
363 + mbti = 'P';
364 + }
365 + else if (mesg == "시간과 장소를 자세하게 정한다") {
366 + mbti = 'J';
367 + }
368 + userDB[userId][3] += mbti;
369 + console.log(userDB);
708 const responseBody = { 370 const responseBody = {
709 version: "2.0", 371 version: "2.0",
710 template: { 372 template: {
711 outputs: [ 373 outputs: [
712 { 374 {
713 simpleText: { 375 simpleText: {
714 - text: 'E: '+mbtiper[0]+'%\nI: '+mbtiper[1]+'%\nN: '+mbtiper[2]+'%\nS: '+mbtiper[3]+'%\nT: '+mbtiper[4]+'%\nF: '+mbtiper[5]+'%\nJ: '+mbtiper[6]+'%\nP: '+mbtiper[7]+'%' 376 + text: '[question9]\n재미있는 책이나 비디오 게임이 사교 모임보다 더 낫습니다.'
377 + }
378 + }
379 + ],
380 + quickReplies: [
381 + {
382 + action: "block",
383 + label: "네",
384 + message: "네",
385 + blockId: "629780f4ab89e678ee86b2de"
386 + },
387 + {
388 + action: "block",
389 + label: "아니오",
390 + message: "아니오",
391 + blockId: "629780f4ab89e678ee86b2de"
392 + }
393 + ]
394 + }
395 + }
396 + res.status(200).send(responseBody);
397 + });
398 +
399 + apiRouter.post('/question10', (req, res) => {
400 + var mesg = req.body.userRequest.utterance;
401 + var userId = req.body.userRequest.user.id;
402 + var mbti = '';
403 + if (mesg == "네"){
404 + mbti = 'I';
405 + }
406 + else if (mesg == "아니오") {
407 + mbti = 'E';
408 + }
409 + userDB[userId][0] += mbti;
410 + console.log(userDB);
411 + const responseBody = {
412 + version: "2.0",
413 + template: {
414 + outputs: [
415 + {
416 + simpleText: {
417 + text: '[question10]\n본인이 창의적이기보다 현실적인 사람이라고 생각합니다.'
418 + }
419 + }
420 + ],
421 + quickReplies: [
422 + {
423 + action: "block",
424 + label: "네",
425 + message: "네",
426 + blockId: "629781015ceed96c385449c8"
427 + },
428 + {
429 + action: "block",
430 + label: "아니오",
431 + message: "아니오",
432 + blockId: "629781015ceed96c385449c8"
433 + }
434 + ]
435 + }
436 + }
437 + res.status(200).send(responseBody);
438 + });
439 +
440 + apiRouter.post('/question11', (req, res) => {
441 + var mesg = req.body.userRequest.utterance;
442 + var userId = req.body.userRequest.user.id;
443 + var mbti = '';
444 + if (mesg == "네"){
445 + mbti = 'S';
446 + }
447 + else if (mesg == "아니오") {
448 + mbti = 'N';
449 + }
450 + userDB[userId][1] += mbti;
451 + console.log(userDB);
452 + const responseBody = {
453 + version: "2.0",
454 + template: {
455 + outputs: [
456 + {
457 + simpleText: {
458 + text: '[question11]\n팀플을 하는 경우, 충실하지만 실적을 못 내는 팀원을 제명하기 어려워합니다.'
459 + }
460 + }
461 + ],
462 + quickReplies: [
463 + {
464 + action: "block",
465 + label: "네",
466 + message: "네",
467 + blockId: "6297810fe7a0253c7662cca8"
468 + },
469 + {
470 + action: "block",
471 + label: "아니오",
472 + message: "아니오",
473 + blockId: "6297810fe7a0253c7662cca8"
474 + }
475 + ]
476 + }
477 + }
478 + res.status(200).send(responseBody);
479 + });
480 +
481 + apiRouter.post('/question12', (req, res) => {
482 + var mesg = req.body.userRequest.utterance;
483 + var userId = req.body.userRequest.user.id;
484 + var mbti = '';
485 + if (mesg == "네"){
486 + mbti = 'F';
487 + }
488 + else if (mesg == "아니오") {
489 + mbti = 'T';
490 + }
491 + userDB[userId][2] += mbti;
492 + console.log(userDB);
493 + const responseBody = {
494 + version: "2.0",
495 + template: {
496 + outputs: [
497 + {
498 + simpleText: {
499 + text: '[question12]\n집과 업무 환경이 잘 정돈되어 있습니다.'
500 + }
501 + }
502 + ],
503 + quickReplies: [
504 + {
505 + action: "block",
506 + label: "네",
507 + message: "네",
508 + blockId: "6297811bf591aa190554a22e"
509 + },
510 + {
511 + action: "block",
512 + label: "아니오",
513 + message: "아니오",
514 + blockId: "6297811bf591aa190554a22e"
515 + }
516 + ]
517 + }
518 + }
519 + res.status(200).send(responseBody);
520 + });
521 +
522 + apiRouter.post('/question13', (req, res) => {
523 + var mesg = req.body.userRequest.utterance;
524 + var userId = req.body.userRequest.user.id;
525 + var mbti = '';
526 + if (mesg == "네"){
527 + mbti = 'J';
528 + }
529 + else if (mesg == "아니오") {
530 + mbti = 'P';
531 + }
532 + userDB[userId][3] += mbti;
533 + console.log(userDB);
534 + const responseBody = {
535 + version: "2.0",
536 + template: {
537 + outputs: [
538 + {
539 + simpleText: {
540 + text: '[question13]\n친구 관계가 좁고 깊은 편입니다.'
715 } 541 }
716 } 542 }
543 + ],
544 + quickReplies: [
545 + {
546 + action: "block",
547 + label: "네",
548 + message: "네",
549 + blockId: "62978127ab89e678ee86b2e2"
550 + },
551 + {
552 + action: "block",
553 + label: "아니오",
554 + message: "아니오",
555 + blockId: "62978127ab89e678ee86b2e2"
556 + }
557 + ]
558 + }
559 + }
560 + res.status(200).send(responseBody);
561 + });
562 +
563 + apiRouter.post('/question14', (req, res) => {
564 + var mesg = req.body.userRequest.utterance;
565 + var userId = req.body.userRequest.user.id;
566 + var mbti = '';
567 + if (mesg == "네"){
568 + mbti = 'I';
569 + }
570 + else if (mesg == "아니오") {
571 + mbti = 'E';
572 + }
573 + userDB[userId][0] += mbti;
574 + console.log(userDB);
575 + const responseBody = {
576 + version: "2.0",
577 + template: {
578 + outputs: [
579 + {
580 + simpleText: {
581 + text: '[question14]\n공부하기 싫을 때 공부는 왜 해야 하는 것인지 고민에 빠질 때가 있습니다.'
582 + }
583 + }
584 + ],
585 + quickReplies: [
586 + {
587 + action: "block",
588 + label: "네",
589 + message: "네",
590 + blockId: "62979c9ce7a0253c7662ccd4"
591 + },
592 + {
593 + action: "block",
594 + label: "아니오",
595 + message: "아니오",
596 + blockId: "62979c9ce7a0253c7662ccd4"
597 + }
717 ] 598 ]
718 } 599 }
719 } 600 }
720 res.status(200).send(responseBody); 601 res.status(200).send(responseBody);
721 }); 602 });
722 -======= 603 +
604 +apiRouter.post('/result', (req, res) => {
605 + var userId = req.body.userRequest.user.id;
723 var mesg = req.body.userRequest.utterance; 606 var mesg = req.body.userRequest.utterance;
724 console.log('[result:user message] ', mesg); 607 console.log('[result:user message] ', mesg);
725 var mbti = ''; 608 var mbti = '';
...@@ -890,7 +773,117 @@ function result(Array){ ...@@ -890,7 +773,117 @@ function result(Array){
890 Array[4]+='J'; 773 Array[4]+='J';
891 } 774 }
892 775
893 ->>>>>>> 9cc768840e30632a42343600db176f035dc0ebf9 776 +apiRouter.post('/result', (req, res) => {
777 + var mesg = req.body.userRequest.utterance;
778 + var userId = req.body.userRequest.user.id;
779 + mbtiper = ['','','','','','','',''];
780 + var mbti = '';
781 + if (mesg == "네"){
782 + mbti = 'N';
783 + }
784 + else if (mesg == "아니오") {
785 + mbti = 'S';
786 + }
787 + userDB[userId][1] += mbti;
788 + var e = 0;
789 + var n = 0;
790 + var f = 0;
791 + var j = 0;
792 + for(i=0; i<2; i++){
793 + if(userDB[userId][0][i] == "E"){
794 + e++;
795 + }
796 + }
797 + for(i=0; i<2; i++){
798 + if(userDB[userId][1][i] == "N"){
799 + n++;
800 + }
801 + }
802 + for(i=0; i<1; i++){
803 + if(userDB[userId][2][i] == "F"){
804 + f++;
805 + }
806 + }
807 + for(i=0; i<2; i++){
808 + if(userDB[userId][3][i] == "J"){
809 + j++;
810 + }
811 + }
812 + var i = 2-e;
813 + var s = 2-n;
814 + var t = 1-f;
815 + var p = 2-j;
816 + mbtiper[0] += 20 * e;
817 + mbtiper[1] += 20 * i;
818 + mbtiper[2] += 20 * n;
819 + mbtiper[3] += 20 * s;
820 + mbtiper[4] += 20 * t;
821 + mbtiper[5] += 20 * f;
822 + mbtiper[6] += 20 * j;
823 + mbtiper[7] += 20 * p;
824 + if(mbtiper[0]>mbtiper[1]){
825 + userDB[userId][4] += 'E';
826 + } else {
827 + userDB[userId][4] += 'I';
828 + }
829 + if(mbtiper[2]>mbtiper[3]){
830 + userDB[userId][4] += 'N';
831 + } else {
832 + userDB[userId][4] += 'S';
833 + }
834 + if(mbtiper[4]>mbtiper[5]){
835 + userDB[userId][4] += 'T';
836 + } else {
837 + userDB[userId][4] += 'F';
838 + }
839 + if(mbtiper[6]>mbtiper[7]){
840 + userDB[userId][4] += 'J';
841 + } else {
842 + userDB[userId][4] += 'P';
843 + }
844 + const responseBody = {
845 + version: "2.0",
846 + template: {
847 + outputs: [
848 + {
849 + simpleText: {
850 + text: "당신의 MBTI는 : "+userDB[userId][4]
851 + }
852 + }
853 + ],
854 + quickReplies: [{
855 + action: "block",
856 + label: "MBTI 테스트 다시하기",
857 + message: "MBTI 테스트 다시하기",
858 + blockId : "62977ff05ceed96c385449b9"
859 + },
860 + {
861 + action: "block",
862 + label: "결과 상세보기",
863 + message: "결과 상세보기",
864 + blockId: "62987b78e7a0253c7662dcd9"
865 + }]
866 + }
867 + }
868 + res.status(200).send(responseBody);
869 + });
870 +
871 +apiRouter.post('/percent', (req, res) => {
872 + const responseBody = {
873 + version: "2.0",
874 + template: {
875 + outputs: [
876 + {
877 + simpleText: {
878 + text: 'E: '+mbtiper[0]+'%\nI: '+mbtiper[1]+'%\nN: '+mbtiper[2]+'%\nS: '+mbtiper[3]+'%\nT: '+mbtiper[4]+'%\nF: '+mbtiper[5]+'%\nJ: '+mbtiper[6]+'%\nP: '+mbtiper[7]+'%'
879 + }
880 + }
881 + ]
882 + }
883 + }
884 + res.status(200).send(responseBody);
885 + });
886 +
894 app.listen((process.env.PORT || 3000), function() { 887 app.listen((process.env.PORT || 3000), function() {
895 console.log('Example skill server listening on port 3000!'); 888 console.log('Example skill server listening on port 3000!');
896 }); 889 });
...\ No newline at end of file ...\ No newline at end of file
......