ShinSeungMin

Solve conflict

...@@ -106,7 +106,6 @@ exports.geting_PlayingMovie= async() => { ...@@ -106,7 +106,6 @@ exports.geting_PlayingMovie= async() => {
106 let n = 0; 106 let n = 0;
107 console.log(movie_list); 107 console.log(movie_list);
108 for (item of movie_list) { 108 for (item of movie_list) {
109 - console.log(item.getAttribute('form-at'))
110 movie_data[n++]['running'] = await item.getAttribute('form-at'); 109 movie_data[n++]['running'] = await item.getAttribute('form-at');
111 } 110 }
112 console.log("Completed get Running"); 111 console.log("Completed get Running");
......
...@@ -153,6 +153,11 @@ app.post('/hook', asyncHandler(async (req, res, next) => { ...@@ -153,6 +153,11 @@ app.post('/hook', asyncHandler(async (req, res, next) => {
153 console.log(MEGA_PlayingMovieURL, megabox.movie_data); 153 console.log(MEGA_PlayingMovieURL, megabox.movie_data);
154 MEGA_flag = 4; 154 MEGA_flag = 4;
155 } 155 }
156 + else{
157 + const text1 = "영화를 보실 날짜를 다시 입력해주세요.";
158 + const text2 = "ex)20020409";
159 + SendMessage(eventObj, text1, text2);
160 + }
156 //원본 코드 161 //원본 코드
157 // MEGA_date = parseInt(eventObj.message.text); 162 // MEGA_date = parseInt(eventObj.message.text);
158 // if (MEGA_date && MEGA_TheaterLocationCode) { 163 // if (MEGA_date && MEGA_TheaterLocationCode) {
...@@ -179,15 +184,15 @@ app.post('/hook', asyncHandler(async (req, res, next) => { ...@@ -179,15 +184,15 @@ app.post('/hook', asyncHandler(async (req, res, next) => {
179 MEGA_PlayingMovieList[movietitle] = megabox.movie_data[n].movie_num; 184 MEGA_PlayingMovieList[movietitle] = megabox.movie_data[n].movie_num;
180 } 185 }
181 } 186 }
182 - console.log(Object.keys(megabox.movie_data).length); 187 + console.log(Object.keys(MEGA_PlayingMovieList).length);
183 - if (Object.keys(megabox.movie_data).length == 0) { 188 + if (Object.keys(MEGA_PlayingMovieList).length == 0) {
184 - PushMessage("현재상영작이 없습니다.","영화관 선택 단계로 이동합니다."); 189 + PushSingleMessage("현재상영작이 없습니다.\n영화관 선택 단계로 이동합니다.");
185 setTimeout(function () { 190 setTimeout(function () {
186 PushMessage("영화관 위치를 입력해주세요", "ex1)강남"); 191 PushMessage("영화관 위치를 입력해주세요", "ex1)강남");
187 }, 1000); 192 }, 1000);
188 MEGA_flag = 1; 193 MEGA_flag = 1;
189 }else if (Object.keys(MEGA_PlayingMovieList).length == 1) { 194 }else if (Object.keys(MEGA_PlayingMovieList).length == 1) {
190 - PlayingMovie += '1. ' + Object.keys(MEGA_PlayingMovieList)[0]; 195 + PlayingMovie += '1: ' + Object.keys(MEGA_PlayingMovieList)[0];
191 PushMessage(PlayingMovie, "바로 링크가 보내집니다."); 196 PushMessage(PlayingMovie, "바로 링크가 보내집니다.");
192 MEGA_title = MEGA_PlayingMovieList[Object.keys(MEGA_PlayingMovieList)[0]]; 197 MEGA_title = MEGA_PlayingMovieList[Object.keys(MEGA_PlayingMovieList)[0]];
193 setTimeout(function () { 198 setTimeout(function () {
...@@ -252,7 +257,6 @@ try { ...@@ -252,7 +257,6 @@ try {
252 console.log('[HTTPS] HTTPS 오류가 발생하였습니다. HTTPS 서버는 실행되지 않습니다.'); 257 console.log('[HTTPS] HTTPS 오류가 발생하였습니다. HTTPS 서버는 실행되지 않습니다.');
253 console.log(error); 258 console.log(error);
254 } 259 }
255 -
256 //오늘 날짜 구하기 260 //오늘 날짜 구하기
257 function GettingToday(){ 261 function GettingToday(){
258 var today = new Date(); 262 var today = new Date();
...@@ -401,4 +405,4 @@ function PushURLMessage(pcurl, smartphoneurl) {//push single message ...@@ -401,4 +405,4 @@ function PushURLMessage(pcurl, smartphoneurl) {//push single message
401 }, (error, response, body) => { 405 }, (error, response, body) => {
402 console.log(body) 406 console.log(body)
403 }); 407 });
404 -}
...\ No newline at end of file ...\ No newline at end of file
408 +}
......