Merge pull request #106 from hackberrydev/contact-repository-errors

Return array of errors from contacts repository

Author: strika

src/commands/list_contacts.janet

@@ -1,6 +1,7 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements the list contacts command.
 
+(import ../utils :prefix "")
 (import ../date :as d)
 (import ../contact/repository :as contacts_repository)
 
@@ -32,8 +33,8 @@
   (def argument (arguments "list-contacts"))
   (if argument
     (let [load-result (contacts_repository/load-contacts argument)
-          error (load-result :error)]
-      (if error
-        {:errors [(string "--list-contacts " (string/ascii-lower error))]}
+          errors (load-result :errors)]
+      (if errors
+        {:errors (format-command-errors "--list-contacts" errors)}
         {:command [print-contacts (load-result :contacts)]}))
     {}))

src/commands/schedule_contacts.janet

@@ -1,6 +1,8 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements a command for scheduling contacts for today in a plan.
 
+(import ../utils :prefix "")
+
 (import ../contact)
 (import ../date)
 (import ../day)
@@ -64,9 +66,9 @@
   (def argument (arguments "schedule-contacts"))
   (if argument
     (let [load-result (contacts_repository/load-contacts argument)
-          error (load-result :error)
+          errors (load-result :errors)
           contacts (load-result :contacts)]
-      (if error
-        {:errors [(string "--schedule-contacts " (string/ascii-lower error))]}
+      (if errors
+        {:errors (format-command-errors "--schedule-contacts" errors)}
         {:command [schedule-contacts contacts (date/today)]}))
     {}))

src/commands/schedule_tasks.janet

@@ -1,6 +1,8 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements a command for scheduling days for today in a plan.
 
+(import ../utils :prefix "")
+
 (import ../date)
 (import ../day)
 (import ../plan)
@@ -49,9 +51,6 @@
           (task/mark-as-missed task (day :date))))
        tasks))
 
-(defn- format-errors [errors]
-  (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))
-
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
 ## Public Interface
 
@@ -74,10 +73,10 @@
     (let [load-file-result (file_repository/load argument)
           errors (load-file-result :errors)]
       (if errors
-        {:errors (format-errors errors)}
+        {:errors (format-command-errors command errors)}
         (let [parse-result (schedule_parser/parse (load-file-result :text))
               errors (parse-result :errors)]
           (if errors
-            {:errors (format-errors errors)}
+            {:errors (format-command-errors command errors)}
             {:command [schedule-tasks (parse-result :tasks) (date/today)]}))))
     {}))

src/commands/stats.janet

@@ -1,7 +1,7 @@
 ### ————————————————————————————————————————————————————————————————————————————
 ### This module implements stats command.
 
-(import ../utils :as "u")
+(import ../utils :prefix "")
 (import ../plan)
 
 ## —————————————————————————————————————————————————————————————————————————————
@@ -12,9 +12,9 @@
   Prints stats for the plan. Returns the plan.
   ```
   [plan]
-  (print (u/pluralize (length (plan :days)) "day"))
-  (print (u/pluralize (length (plan/completed-tasks plan)) "completed task"))
-  (print (u/pluralize (length (plan/pending-tasks plan)) "pending task"))
+  (print (pluralize (length (plan :days)) "day"))
+  (print (pluralize (length (plan/completed-tasks plan)) "completed task"))
+  (print (pluralize (length (plan/pending-tasks plan)) "pending task"))
   plan)
 
 (defn build-command [arguments &]

src/contact/repository.janet

@@ -1,8 +1,9 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements a repository that loads contacts from Markdown files.
 
-(import ../file_repository)
 (import ../utils)
+
+(import ../file_repository)
 (import ./parser :as contact_parser)
 
 (defn- load-contact [contact-path]
@@ -22,4 +23,4 @@
                        (fn [contact-file] (load-contact (string directory "/" contact-file)))
                        (os/dir directory)))]
       {:contacts contacts})
-    {:error "Directory does not exist."}))
+    {:errors ["Directory does not exist"]}))

src/utils.janet

@@ -13,3 +13,6 @@
   (if (string/has-suffix? "/" path)
     (string/trimr path "/")
     path))
+
+(defn format-command-errors [command errors]
+  (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))

test/contact/repository_test.janet

@@ -14,6 +14,6 @@
 
 (deftest load-contacts-when-directory-does-not-exist
   (def result (load-contacts "test/missing-directory"))
-  (is (= "Directory does not exist." (result :error))))
+  (is (= "Directory does not exist" (first (result :errors)))))
 
 (run-tests!)