Merge pull request #28 from datacite/bug_variousfixes

Bug variousfixes
datacite · May 28, 2018 · dbc6a67 · dbc6a67
2 parents 148b5f5 + 16b012c
commit dbc6a67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/app/models/report.rb b/app/models/report.rb
@@ -28,12 +28,12 @@ class Report < ApplicationRecord
   serialize :exceptions, Array
   before_create :set_id
   before_validation :set_uid, on: :create
-  after_create :push_report
+  after_save :push_report
 
 
   def push_report
     logger.warn "calling queue for " + uid
-    queue_report if ENV["AWS_REGION"]
+    queue_report if ENV["AWS_REGION"].present?
   end
 
   private
@@ -44,6 +44,7 @@ def set_id
   end
 
   def set_uid
+    return ActionController::ParameterMissing if self.reporting_period.nil?
     self.uid = SecureRandom.uuid if uid.blank?
     month = Date.strptime(self.reporting_period["begin_date"],"%Y-%m-%d").month.to_s 
     year = Date.strptime(self.reporting_period["begin_date"],"%Y-%m-%d").year.to_s 

diff --git a/app/models/status_alerts.rb b/app/models/status_alerts.rb
diff --git a/lib/sushi_schema/sushi_schema.json b/lib/sushi_schema/sushi_schema.json
@@ -129,6 +129,13 @@
           "items" : {
             "$ref" : "#/definitions/sushi_report_header_report_attributes"
           }
+        },
+        "reporting-period" : {
+          "type" : "object",
+          "description" : "time the report is about. format as defined by date-time - rfc3339",
+          "items" : {
+            "$ref" : "#/definitions/counter_dataset_performance_period"
+          }
         }
       },
       "description" : "generalized report header that defines the requested report, the requestor, the customer, filters applied, reportattributes applied and any exceptions.",