waketime plus

@@ -21,19 +21,8 @@ exports.dialogflowFirebaseFulfillment = functions.https.onRequest((request, resp
     agent.add(`잘못된 입력값 입니다`);
   }
 
-  var mytime;
-  function test1(agent){
-    agent.add(new Card({
-         title: `Title: this is a card title`,
-         imageUrl: 'https://developers.google.com/actions/images/badges/XPM_BADGING_GoogleAssistant_VER.png',
-         text: `This is the body text of a card.  You can even use line\n  breaks and emoji! 💁`,
-         buttonText: 'This is a button',
-         buttonUrl: 'https://assistant.google.com/'
-      }));
-  }
-
   //기상시간 입력 및 추천 cycle 반환
-  function test2(agent) {
+  function mytime1(agent) {
     const hour = agent.parameters.hours;
     const min = agent.parameters.minutes;
     const gothour = hour.length > 0;
@@ -97,7 +86,7 @@ exports.dialogflowFirebaseFulfillment = functions.https.onRequest((request, resp
 
     if(gothour && gotmin) {
         agent.add(`좋습니다. 당신의 기상시간은 ${hour}시 ${min}분 입니다.`);
-      	agent.add(`기상시간을 참고한 결과 총 4개의 권장 취침 시간이 있습니다. ${myhour1}시  ${myhour1}분(6cycle) / ${myhour2}시  ${myhour2}분(5cycle) / ${myhour3}시  ${myhour3}분(4cycle) / ${myhour4}시  ${myhour4}(3cycle)분 중 원하는 시간에 주무시길 추천드립니다.'\n'`);
+      	agent.add(`한 번의 수면 cycle은 1시간 30분 (90분)입니다.\n 당신의 기상시간을 참고한 결과 총 4개의 권장 취침 시간(cycle)이 있습니다.\n 1. ${myhour1}시  ${myhour1}분(6cycle) \n 2. ${myhour2}시  ${myhour2}분(5cycle) \n 3. ${myhour3}시  ${myhour3}분(4cycle) \n 4. ${myhour4}시  ${myhour4}(3cycle)분 \n 원하는 시간에 주무시길 추천드립니다.`);
 
 
     } else if (gothour && !gotmin) {
@@ -108,40 +97,84 @@ exports.dialogflowFirebaseFulfillment = functions.https.onRequest((request, resp
         agent.add('기상시간을 입력해 주세요( 예시 - 6:26 21:40 ) ');
     }
   }
-  // // Uncomment and edit to make your own intent handler
-  // // uncomment `intentMap.set('your intent name here', yourFunctionHandler);`
-  // // below to get this function to be run when a Dialogflow intent is matched
-  // function yourFunctionHandler(agent) {
-  //   agent.add(`This message is from Dialogflow's Cloud Functions for Firebase editor!`);
-  //   agent.add(new Card({
-  //       title: `Title: this is a card title`,
-  //       imageUrl: 'https://developers.google.com/actions/images/badges/XPM_BADGING_GoogleAssistant_VER.png',
-  //       text: `This is the body text of a card.  You can even use line\n  breaks and emoji! 💁`,
-  //       buttonText: 'This is a button',
-  //       buttonUrl: 'https://assistant.google.com/'
-  //     })
-  //   );
-  //   agent.add(new Suggestion(`Quick Reply`));
-  //   agent.add(new Suggestion(`Suggestion`));
-  //   agent.setContext({ name: 'weather', lifespan: 2, parameters: { city: 'Rome' }});
-  // }
-
-  // // Uncomment and edit to make your own Google Assistant intent handler
-  // // uncomment `intentMap.set('your intent name here', googleAssistantHandler);`
-  // // below to get this function to be run when a Dialogflow intent is matched
-  // function googleAssistantHandler(agent) {
-  //   let conv = agent.conv(); // Get Actions on Google library conv instance
-  //   conv.ask('Hello from the Actions on Google client library!') // Use Actions on Google library
-  //   agent.add(conv); // Add Actions on Google library responses to your agent's response
-  // }
-  // // See https://github.com/dialogflow/fulfillment-actions-library-nodejs
-  // // for a complete Dialogflow fulfillment library Actions on Google client library v2 integration sample
-
-  // Run the proper function handler based on the matched Dialogflow intent name
+
+function mytime2(agent) {
+   const hour = agent.parameters.hours;
+   const min = agent.parameters.minutes;
+   const gothour = hour.length > 0;
+   const gotmin = min.length > 0;
+   var myhour1,myhour2,myhour3,myhour4;
+   var mymin1,mymin2,mymin3,mymin4;
+
+   if(Number(min)+30<60){
+     const rehour1 = Number(hour)+1;
+     const remin1 = Number(min)+30;
+
+     const rehour2 = Number(hour)+6;
+     const remin2 = Number(min);
+
+     const rehour3 = Number(hour)+7;
+     const remin3 = Number(min)+30;
+
+     const rehour4 = Number(hour)+9;
+     const remin4 = Number(min);
+
+     myhour1=rehour1; myhour2=rehour2; myhour3=rehour3; myhour4=rehour4;
+
+      //시간이 -값이 될때 값 설정
+      if(myhour1<0){myhour1=24+myhour1;}
+      if(myhour2<0){myhour2=24+myhour2;}
+      if(myhour3<0){myhour3=24+myhour3;}
+      if(myhour4<0){myhour4=24+myhour4;}
+
+      if(mymin1<0){mymin1=60+mymin1;}
+      if(mymin2<0){mymin1=60+mymin2;}
+      if(mymin3<0){mymin1=60+mymin3;}
+      if(mymin4<0){mymin1=60+mymin4;}
+
+   }else if(Number(min)+30>60){
+     const rehour1 = Number(hour)+2;
+     const remin1 = Number(min)-30;
+
+     const rehour2 = Number(hour)+6;
+     const remin2 = Number(min);
+
+     const rehour3 = Number(hour)+8;
+     const remin3 = Number(min)-30;
+
+     const rehour4 = Number(hour)+9;
+     const remin4 = Number(min);
+
+     myhour1=rehour1; myhour2=rehour2; myhour3=rehour3; myhour4=rehour4;
+
+      //시간이 -값이 될때 값 설정
+      if(myhour1<0){myhour1=24+myhour1;}
+      if(myhour2<0){myhour2=24+myhour2;}
+      if(myhour3<0){myhour3=24+myhour3;}
+      if(myhour4<0){myhour4=24+myhour4;}
+
+      if(mymin1<0){mymin1=60+mymin1;}
+      if(mymin2<0){mymin1=60+mymin2;}
+      if(mymin3<0){mymin1=60+mymin3;}
+      if(mymin4<0){mymin1=60+mymin4;}
+   }
+
+   if(gothour && gotmin) {
+     	agent.add(`좋습니다. 당신의 취침시간은 ${hour}시 ${min}분 입니다.`);
+      	agent.add(`한 번의 수면 cycle은 1시간 30분 (90분)입니다.\n 당신의 취침시간을 참고한 결과 총 4개의 권장 기상시간(cycle)이 있습니다.\n 1. ${myhour1}시  ${myhour1}분(6cycle) \n 2. ${myhour2}시  ${myhour2}분(5cycle) \n 3. ${myhour3}시  ${myhour3}분(4cycle) \n 4. ${myhour4}시  ${myhour4}(3cycle)분 \n 원하는 시간에 기상 하시길 추천드립니다.`);
+
+   } else if (gothour && !gotmin) {
+       agent.add('취침시간을 입력해 주세요( 예시 - 6:26 21:40 ) ');
+   } else if (gothour && !gothour) {
+       agent.add('취침시간을 입력해 주세요( 예시 - 6:26 21:40 ) ');
+   } else {
+       agent.add('취침시간을 입력해 주세요( 예시 - 6:26 21:40 ) ');
+   }
+ }
   let intentMap = new Map();
   intentMap.set('Default Welcome Intent', welcome);
   intentMap.set('Default Fallback Intent', fallback);
-  intentMap.set('time',test2);
-  intentMap.set('result',mytime);
+  intentMap.set('time',mytime1);
+  intentMap.set('time2',mytime2);
   agent.handleRequest(intentMap);
 });