Merge pull request #241 from hathitrust/DEV-529

changed back costreport output path
hathitrust · Dec 5, 2022 · af48b8f · af48b8f
2 parents 1f72ef0 + 4b9eb2f
commit af48b8f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/reports/cost_report.rb b/lib/reports/cost_report.rb
@@ -190,9 +190,15 @@ def total_cost_for_member(member)
     private
 
     def report_file
-      FileUtils.mkdir_p(Settings.cost_report_path)
-      iso_stamp = Time.now.strftime("%Y%m%d-%H%M%S")
-      File.join(Settings.cost_report_path, "cost_report_#{iso_stamp}.txt")
+      year = Time.now.year.to_s
+      FileUtils.mkdir_p(File.join(Settings.cost_report_path, year))
+      iso_stamp = Time.now.strftime("%Y%m%d")
+
+      File.join(
+        Settings.cost_report_path,
+        year,
+        "cost_report_#{iso_stamp}.tsv"
+      )
     end
   end
 end
diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb
@@ -98,8 +98,8 @@ def cleanup(output)
 
     it "CostReport produces output" do
       phctl(*%w[report costreport])
-
-      expect(File.read(Dir.glob("/tmp/cost_reports/*").first))
+      year = Time.new.year.to_s
+      expect(File.read(Dir.glob("/tmp/cost_reports/#{year}/*").first))
         .to match(/Target cost: 9999/)
     end