added the last day of the year to merch calendars, retail and fiscal

stitchfix · Dec 14, 2017 · 640fb80 · 640fb80
1 parent db124ba
commit 640fb80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/merch_calendar/retail_calendar.rb b/lib/merch_calendar/retail_calendar.rb
@@ -2,7 +2,9 @@
 
 module MerchCalendar
   class RetailCalendar
-
+    LAST_MONTH_OF_THE_YEAR = "January"
+    LAST_DAY_OF_THE_YEAR = 31
+
     QUARTER_1 = 1
     QUARTER_2 = 2
     QUARTER_3 = 3
@@ -16,7 +18,7 @@ class RetailCalendar
     # @param year [Integer] the retail year
     # @return [Date] the first date of the retail year
     def end_of_year(year)
-      year_end = Date.new((year + 1), 1, -1) # Jan 31st
+      year_end = Date.new((year + 1), Date::MONTHNAMES.index(LAST_MONTH_OF_THE_YEAR), LAST_DAY_OF_THE_YEAR) # Jan 31st
       wday = (year_end.wday + 1) % 7 
 
       if wday > 3

diff --git a/lib/merch_calendar/stitch_fix_fiscal_year_calendar.rb b/lib/merch_calendar/stitch_fix_fiscal_year_calendar.rb
@@ -1,5 +1,7 @@
 module MerchCalendar
   class StitchFixFiscalYearCalendar
+    LAST_MONTH_OF_THE_YEAR = "July"
+    LAST_DAY_OF_THE_YEAR = 31
 
     QUARTER_1 = 1
     QUARTER_2 = 2
@@ -22,7 +24,7 @@ def start_of_year(year)
     # @param year [Integer] the fiscal year
     # @return [Date] the last date of the fiscal year
     def end_of_year(year)
-      year_end = Date.new((year), 7, -1) # Jul 31st
+      year_end = Date.new((year), Date::MONTHNAMES.index(LAST_MONTH_OF_THE_YEAR), LAST_DAY_OF_THE_YEAR) # Jul 31st
       wday = (year_end.wday + 1) % 7
 
       if wday > 3