Merge pull request #108 from hackberrydev/schedule-on-last-day

Schedule on last day

Author: strika

src/commands/schedule_tasks.janet

@@ -27,7 +27,8 @@
         "every 3 months" (and (= (date :day) 1)
                               (index-of (date :month) [1 4 7 10]))
         (string "every year on " (remove-year formatted-date)) true
-        (string "on " formatted-date) true))
+        (string "on " formatted-date) true
+        "every last day" (date/last-day-of-month? date)))
 
 (defn- missed-on-day [plan task date]
   (find (fn [day] (and (scheduled-for? task (day :date))

src/date.janet

@@ -86,6 +86,17 @@
       :day (+ (today :month-day) 1)
       :week-day (week-day-string (today :week-day))}))
 
+(defn +days [date n]
+  (def new-date-time (+ (to-time date) (* n seconds-in-day)))
+  (from-os-date-struct (os/date new-date-time)))
+
+(defn -days [date n]
+  (def new-date-time (- (to-time date) (* n seconds-in-day)))
+  (from-os-date-struct (os/date new-date-time)))
+
+(defn days-from-now [n]
+  (+days (today) n))
+
 (defn equal?
   [d1 d2]
   (= (to-time d1) (to-time d2)))
@@ -112,13 +123,10 @@
  [d1 d2]
  (>= (to-time d1) (to-time d2)))
 
-(defn +days [date n]
-  (def new-date-time (+ (to-time date) (* n seconds-in-day)))
-  (from-os-date-struct (os/date new-date-time)))
-
-(defn -days [date n]
-  (def new-date-time (- (to-time date) (* n seconds-in-day)))
-  (from-os-date-struct (os/date new-date-time)))
-
-(defn days-from-now [n]
-  (+days (today) n))
+(defn last-day-of-month?
+  ```
+  Returns true if date is the last day of a month.
+  ```
+  [date]
+  (def tomorrow (+days date 1))
+  (not= (date :month) (tomorrow :month)))

test/commands/schedule_tasks_test.janet

@@ -66,6 +66,23 @@
   (is (not (scheduled-for? task (d/date 2022 2 1))))
   (is (not (scheduled-for? task (d/date 2023 1 27)))))
 
+(deftest scheduled-for-last-day-of-month
+  (def task (task/build-scheduled-task "Review logs" "every last day"))
+  (is (scheduled-for? task (d/date 2022 1 31)))
+  (is (scheduled-for? task (d/date 2022 2 28)))
+  (is (scheduled-for? task (d/date 2022 3 31)))
+  (is (scheduled-for? task (d/date 2022 4 30)))
+  (is (scheduled-for? task (d/date 2022 5 31)))
+  (is (scheduled-for? task (d/date 2022 6 30)))
+  (is (scheduled-for? task (d/date 2022 7 31)))
+  (is (scheduled-for? task (d/date 2022 8 31)))
+  (is (scheduled-for? task (d/date 2022 9 30)))
+  (is (scheduled-for? task (d/date 2022 10 31)))
+  (is (scheduled-for? task (d/date 2022 11 30)))
+  (is (scheduled-for? task (d/date 2022 12 31)))
+  (is (scheduled-for? task (d/date 2023 1 31)))
+  (is (not (scheduled-for? task (d/date 2022 1 30)))))
+
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
 ## Test missed?
 

test/date_test.janet

@@ -68,6 +68,26 @@
   (is (d/after-or-eq? (d/date 2021 7 1) (d/date 2021 7 1)))
   (is (not (d/after-or-eq? (d/date 2021 7 1) (d/date 2021 7 15)))))
 
+## ————————————————————————————————————————————————————————————————————————————————————————————————
+## Test last-day-of-month?
+
+(deftest last-day-of-month?
+  (is (d/last-day-of-month? (d/date 2022 1 31)))
+  (is (d/last-day-of-month? (d/date 2022 2 28)))
+  (is (d/last-day-of-month? (d/date 2022 3 31)))
+  (is (d/last-day-of-month? (d/date 2022 4 30)))
+  (is (d/last-day-of-month? (d/date 2022 5 31)))
+  (is (d/last-day-of-month? (d/date 2022 6 30)))
+  (is (d/last-day-of-month? (d/date 2022 7 31)))
+  (is (d/last-day-of-month? (d/date 2022 8 31)))
+  (is (d/last-day-of-month? (d/date 2022 9 30)))
+  (is (d/last-day-of-month? (d/date 2022 10 31)))
+  (is (d/last-day-of-month? (d/date 2022 11 30)))
+  (is (d/last-day-of-month? (d/date 2022 12 31)))
+  (is (d/last-day-of-month? (d/date 2023 1 31)))
+  (is (not (d/last-day-of-month? (d/date 2022 1 30)))))
+
+
 ## ————————————————————————————————————————————————————————————————————————————————————————————————
 ## Test +days
 

test/schedule_parser_test.janet

@@ -16,22 +16,24 @@
     - Pay football practice (every month)
     - Martha's birthday (every 05-24)
     - Meeting with Jack (on 2022-05-03)
+    - Review logs (every last day)
     ```)
   (def result (schedule_parser/parse schedule-string))
   (def scheduled-tasks (result :tasks))
-  (is (= 6 (length scheduled-tasks)))
+  (is (= 7 (length scheduled-tasks)))
   (let [task (scheduled-tasks 0)]
     (is (= "Weekly Meeting" (task :title)))
     (is (= false (task :done)))
     (is (= "every Tuesday" (task :schedule))))
   (let [task (scheduled-tasks 1)]
     (is (= "Puzzle Storm on Lichess" (task :title)))
-    (is (= false (task :done)))
     (is (= "every day" (task :schedule))))
   (let [task (scheduled-tasks 5)]
     (is (= "Meeting with Jack" (task :title)))
-    (is (= false (task :done)))
-    (is (= "on 2022-05-03" (task :schedule)))))
+    (is (= "on 2022-05-03" (task :schedule))))
+  (let [task (scheduled-tasks 6)]
+    (is (= "Review logs" (task :title)))
+    (is (= "every last day" (task :schedule)))))
 
 (deftest parse-schedule-when-schedule-can-not-be-parsed
   (def schedule-string