Refactor job information for --show and --history

[candle] / src / main / server.lisp

diff --git a/src/main/server.lisp b/src/main/server.lisp
index 07f587b0753e356e1528a152adbbd678e43b664d..41ec48232f9b3b40703a0b35f9728d3540a099fe 100644 (file)
--- a/src/main/server.lisp
+++ b/src/main/server.lisp
@@ -70,6 +70,9 @@
   (mapcar #'nremove-branch (find-branch-by-project project))
   (nremove-project project)))
 
+(defun job->job-information (job)
+ (list (job-sha job) (job-status job) (job-create-date job)))
+
 (defun project-branch-information (name)
  (let
   ((project (find name *all-project* :test #'string= :key #'project-name)))
@@ -78,19 +81,11 @@
    (lambda (branch)
     (list
      (branch-name branch)
-     (job-status (branch-job branch))
-     (job-create-date (branch-job branch))
-     (job-sha (branch-job branch))))
+     (job->job-information (branch-job branch))))
    (remove-if-not #'branch-in-git (find-branch-by-project project)))))
 
 (defun project-job-information (name)
  (let
   ((project (find name *all-project* :test #'string= :key #'project-name)))
   (when (not project) (error "Project does not exists"))
-  (mapcar
-   (lambda (job)
-    (list
-     (job-sha job)
-     (job-status job)
-     (job-create-date job)))
-   (find-job-by-project project))))
+  (mapcar #'job->job-information (find-job-by-project project))))