fix login

@@ -41,7 +41,7 @@ ex)
 
 
 async function get_schedule(id, pw, target_date) {
 async function get_schedule(id, pw, target_date) {
     console.log("entered get_schedule_then")
     console.log("entered get_schedule_then")
-    const result = await using_selenium( async (driver) => {
+    const result = await using_selenium(async (driver) => {
         console.log("entered using_selenium_then")
         console.log("entered using_selenium_then")
         return await login(driver, id, pw)
         return await login(driver, id, pw)
             .then(async () => {
             .then(async () => {
@@ -95,21 +95,28 @@ async function load(driver, until) {
 
 
     const data = await driver.findElement(selenium.By.xpath('/html/body/div/div/div/div[2]/div/div/div[2]/pre'));
     const data = await driver.findElement(selenium.By.xpath('/html/body/div/div/div/div[2]/div/div/div[2]/pre'));
     const text = JSON.parse((await data.getText()).slice(9))
     const text = JSON.parse((await data.getText()).slice(9))
-
+    logout(driver)
     return text.filter(it =>
     return text.filter(it =>
-        !it.submissions.submitted && it.plannable_type === "assignment").map(it => new Map([['course_name', it.context_name], ['due_date', it.plannable.due_at], ['assignment_name', it.plannable.title], ['points', it.plannable.points_possible]]))
+        ((!it.submissions.submitted) && (!it.submissions.graded)) && it.plannable_type === "assignment").map(it => {
+            return {
+                "course_name": it.context_name,
+                "due_date": it.plannable.due_at,
+                "assignment_name": it.plannable.title,
+                "points": it.plannable.points_possible
+            }
+        })
 }
 }
 
 
 async function logout(driver) {
 async function logout(driver) {
-    await driver.get("https://khcanvas.khu.ac.kr/")
-
-    await driver.findElement(selenium.By.xpath('html/body/div[2]/header[2]/div[1]/ul/li[1]/button/div[1]')).click();
-    await sleep(1000)
-    const logout = await driver.findElement(selenium.By.xpath('html/body/div[3]/span/span/div/div/div/div/div/span/form/button'));
-    logout.click()
-    await sleep(1000)
+    // await driver.get("https://khcanvas.khu.ac.kr/")
 
 
+    // await driver.findElement(selenium.By.xpath('html/body/div[2]/header[2]/div[1]/ul/li[1]/button/div[1]')).click();
+    // await sleep(1000)
+    // const logout = await driver.findElement(selenium.By.xpath('html/body/div[3]/span/span/div/div/div/div/div/span/form/button'));
+    // logout.click()
+    // await sleep(1000)
     driver.quit()
     driver.quit()
+    console.log("quit")
 }
 }
 
 
 function sleep(ms) {
 function sleep(ms) {

@@ -74,7 +74,9 @@ function sendLocation(replyToken, latitude, longitude, locationAdd, locationName
 
 
 async function filter_date(date, id, pw) {
 async function filter_date(date, id, pw) {
     const schedule = await canvas.get_schedule(id, pw, date)
     const schedule = await canvas.get_schedule(id, pw, date)
-    const first_todo = selector.is_possible_schedule(date, schedule)
+    console.log(schedule)
+    const first_todo = await selector.is_possible_schedule(date, schedule)
+    
     //const first_todo = false
     //const first_todo = false
     if (first_todo) {
     if (first_todo) {
         return `제출되지 않은 과제가 있습니다. ${first_todo}`
         return `제출되지 않은 과제가 있습니다. ${first_todo}`

@@ -14,17 +14,19 @@
 const ADayForMS = 1000 * 60 * 60 * 24
 const ADayForMS = 1000 * 60 * 60 * 24
 
 
 async function is_possible_schedule(date, assignments) {
 async function is_possible_schedule(date, assignments) {
-    const assignments_dates = assignments.map(it => new Date(it.due_date))
+    const assignments_dates = assignments.map(it => [new Date(it.due_date), it])
     const is_disqualified = assignments_dates.filter(it => {
     const is_disqualified = assignments_dates.filter(it => {
         const current_timestamp = date.getTime()
         const current_timestamp = date.getTime()
-        const target_timestamp = it.getTime()
+        const target_timestamp = it[0].getTime()
 
 
-        return current_timestamp > (target_timestamp - ADayForMS)  
+        return current_timestamp > (target_timestamp - ADayForMS * 2)  
     })
     })
     
     
+    console.log(is_disqualified)
+
     if(is_disqualified.length > 0) {
     if(is_disqualified.length > 0) {
         const disq = is_disqualified.at(0)
         const disq = is_disqualified.at(0)
-        return `${disq.course_name}: ${disq.assignment_name} [${disq.points} 점]`
+        return `${disq[1].course_name}: ${disq[1].assignment_name} [${disq[1].points} 점]`
     } else {
     } else {
         return null
         return null
     }
     }

@@ -23,7 +23,10 @@ mocha.describe('khcanvas', () => {
         const b = tokens.pw
         const b = tokens.pw
 
 
         return await canvas.get_schedule(a, b, new Date())
         return await canvas.get_schedule(a, b, new Date())
-            .then(it => console.log("log at: " + it))
+            .then(it => { 
+                console.log("log at: ")
+                console.log(it)
+             })
             .catch(it => {
             .catch(it => {
                 console.log("log at (2): " + it)
                 console.log("log at (2): " + it)
                 assert.rejects(it)
                 assert.rejects(it)

+//@ts-check
+//https://github.com/gatoona/AWS-Selenium
+
+const canvas = require('../khcanvas')
+const rd = require('readline')
+const mocha = require('mocha')
+const process = require('node:process')
+const util = require('util')
+const assert = require('assert')
+const selector = require('../schedule_selector')
+
+mocha.describe('selector', () => {
+    mocha.it('get select', async () => {
+        selector.is_possible_schedule(new Date("2022-06-07T23:54:59Z"),  {size: 4, "course_name": "test", "due_date": "2022-06-08T23:54:59Z", "assignment_name": "test_course", "points": 10})
+    })
+});
\ No newline at end of file