write some tests

Author: leafo

models/streaks.moon

@@ -313,7 +313,7 @@ class Streaks extends Model
       else
         error "don't know how to format date for rate"
 
-  -- move UTC date to closest unit start in UTC
+  -- return new date to closest unit start in UTC, returns in UTC time
   truncate_date: (d) =>
     start = @start_datetime!
 
@@ -351,6 +351,7 @@ class Streaks extends Model
     @increment_date_by_unit @current_unit!
 
   -- UTC date to unit number
+  -- NOTE: this does not verify that d is in valid date in streak
   unit_number_for_date: (d) =>
     @unit_span @start_datetime!, d
 
@@ -579,21 +580,27 @@ class Streaks extends Model
 
   -- each unit of the streak in UTC between (inclusive) the specified range
   each_unit_in_range: (range_left, range_right) =>
+    range_right = date range_right
     current = @truncate_date range_left
     -- NOTE: truncate shifts before, so we increment once if the truncated
     -- date falls before our desired range
 
-    if current < range_left
+    if current < date(range_left)
       current = @increment_date_by_unit current
 
+    -- don't show dates before the streak
+    streak_start = @start_datetime!
+    if current < streak_start
+      current = streak_start
+
     stop = @end_datetime!
 
     limit = 1000
 
     coroutine.wrap ->
       while true
         break if current > range_right
-        break if stop and current > stop
+        break if stop and current >= stop
 
         limit -= 1
         if limit == 0

spec/models/streaks_spec.moon

@@ -221,7 +221,7 @@ describe "models.streaks", ->
         {k, true for k in pairs user2\get_completed_units!}
 
   describe "time functions", ->
-    describe "daily", ->
+    describe "daily unending", ->
       local streak
 
       before_each ->
@@ -241,6 +241,69 @@ describe "models.streaks", ->
         some_date = streak\start_datetime!\addhours 2922
         assert.same 1, streak\unit_span some_date, some_date
 
+    describe "daily ending", ->
+      local streak
+
+      before_each ->
+        db = require "lapis.db"
+        streak = factory.Streaks {
+          start_date: "2019-1-10"
+          end_date: "2019-1-20"
+          hour_offset: -8
+          rate: "daily"
+        }
+
+      it "each_unit", ->
+        units = [unit\fmt "%Y-%m-%d %H:%M:%S" for unit in streak\each_unit!]
+
+        assert.same {
+          "2019-01-10 08:00:00",
+          "2019-01-11 08:00:00",
+          "2019-01-12 08:00:00",
+          "2019-01-13 08:00:00",
+          "2019-01-14 08:00:00",
+          "2019-01-15 08:00:00",
+          "2019-01-16 08:00:00",
+          "2019-01-17 08:00:00",
+          "2019-01-18 08:00:00",
+          "2019-01-19 08:00:00"
+        }, units
+
+      it "each_unit_in_range", ->
+        do -- range before start and before end
+          units = [unit\fmt "%Y-%m-%d %H:%M:%S" for unit in streak\each_unit_in_range "2019-1-1", "2019-1-15"]
+          assert.same {
+            "2019-01-10 08:00:00"
+            "2019-01-11 08:00:00"
+            "2019-01-12 08:00:00"
+            "2019-01-13 08:00:00"
+            "2019-01-14 08:00:00"
+          }, units
+
+        do -- exact range should return all units
+          units = [unit\fmt "%Y-%m-%d %H:%M:%S" for unit in streak\each_unit_in_range "2019-01-10 08:00:00", "2019-01-19 08:00:00"]
+          assert.same {
+            "2019-01-10 08:00:00",
+            "2019-01-11 08:00:00",
+            "2019-01-12 08:00:00",
+            "2019-01-13 08:00:00",
+            "2019-01-14 08:00:00",
+            "2019-01-15 08:00:00",
+            "2019-01-16 08:00:00",
+            "2019-01-17 08:00:00",
+            "2019-01-18 08:00:00",
+            "2019-01-19 08:00:00"
+          }, units
+
+        do -- range extends past end of streak
+          units = [unit\fmt "%Y-%m-%d %H:%M:%S" for unit in streak\each_unit_in_range "2019-01-16", "2019-01-30"]
+          assert.same {
+            "2019-01-16 08:00:00",
+            "2019-01-17 08:00:00",
+            "2019-01-18 08:00:00",
+            "2019-01-19 08:00:00"
+          }, units
+
     describe "weekly", ->
       local streak