Add attribute irregular to /semesters API

cvut · Feb 3, 2016 · 332f473 · 332f473
1 parent cf137b7
commit 332f473
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/app/representers/semesters_representer.rb b/app/representers/semesters_representer.rb
@@ -22,6 +22,7 @@ class SemestersRepresenter < Roar::Decorator
 
   collection :semester_periods, as: :periods do
     property :type
+    property :irregular
     property :starts_at
     property :ends_at
     property :first_week_parity

diff --git a/docs/Sirius.raml b/docs/Sirius.raml
@@ -446,37 +446,43 @@ resourceTypes:
                     "periods": [
                       {
                         "type": "teaching",
+                        "irregular": false,
                         "starts_at": "2015-10-05",
                         "ends_at": "2015-12-20",
                         "first_week_parity": "odd"
                       },
                       {
                         "type": "teaching",
+                        "irregular": true,
                         "starts_at": "2015-12-21",
                         "ends_at": "2015-12-21",
                         "first_week_parity": "even",
                         "first_day_override": "wednesday"
                       },
                       {
                         "type": "teaching",
+                        "irregular": true,
                         "starts_at": "2015-12-22",
                         "ends_at": "2015-12-22",
                         "first_week_parity": "odd",
                         "first_day_override": "tuesday"
                       },
                       {
                         "type": "holiday",
+                        "irregular": false,
                         "starts_at": "2015-12-23",
                         "ends_at": "2016-01-03"
                       },
                       {
                         "type": "teaching",
+                        "irregular": false,
                         "starts_at": "2016-01-04",
                         "ends_at": "2016-01-10",
                         "first_week_parity": "even"
                       },
                       {
                         "type": "exams",
+                        "irregular": false,
                         "starts_at": "2016-01-11",
                         "ends_at": "2016-02-20"
                       }

diff --git a/spec/api/semesters_endpoints_spec.rb b/spec/api/semesters_endpoints_spec.rb
@@ -31,19 +31,24 @@
     let!(:entity) { Fabricate(:faculty_semester) }
     let!(:semester_periods) { [
       Fabricate(:teaching_semester_period, faculty_semester: entity),
+      Fabricate(:irregular_semester_period, faculty_semester: entity),
       Fabricate(:holiday_semester_period, faculty_semester: entity),
-      Fabricate(:exams_semester_period, faculty_semester: entity),
-    ]}
+      Fabricate(:exams_semester_period, faculty_semester: entity)
+    ] }
 
     def period_for_json(period)
       ret = {
         type: period.type,
         starts_at: period.starts_at,
         ends_at: period.ends_at,
+        irregular: period.irregular
       }
       if period.first_week_parity
         ret[:first_week_parity] = period.first_week_parity
       end
+      if period.first_day_override
+        ret[:first_day_override] = period.first_day_override
+      end
       ret.freeze
     end
 

diff --git a/spec/fabricators/semester_period_fabricator.rb b/spec/fabricators/semester_period_fabricator.rb
@@ -3,6 +3,7 @@
 Fabricator(:semester_period) do
   faculty_semester
   type :teaching
+  irregular false
   first_week_parity :odd
   starts_at '2014-09-22'
   ends_at '2015-02-14'
@@ -28,3 +29,11 @@
   starts_at '2015-01-05'
   ends_at '2015-02-14'
 end
+
+Fabricator(:irregular_semester_period, from: :semester_period) do
+  type :teaching
+  irregular true
+  first_day_override :wednesday
+  starts_at '2014-12-22'
+  ends_at '2014-12-22'
+end