Merge pull request #109 from katylouise/katylouise/webdev-836_add-bus…

…iness-item [WEBDEV-836] Added work_package to business item decorator
ukparliament · Oct 19, 2018 · 6e78adc · 6e78adc
2 parents 354923c + 2ee116e
commit 6e78adc
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 4 deletions.
diff --git a/lib/parliament/grom/decorator/business_item.rb b/lib/parliament/grom/decorator/business_item.rb
@@ -21,6 +21,17 @@ def procedure_step
         def date
           respond_to?(:businessItemDate) ? DateTime.parse(businessItemDate) : nil
         end
+
+        # Alias businessItemHasWorkPackage with fallback.
+        #
+        # @return [Grom::Node, nil] the WorkPackage of the Grom::Node or nil.
+        def work_package
+          return @work_package if @work_package
+
+          return nil unless respond_to?(:businessItemHasWorkPackage)
+
+          @work_package = Helpers::Utils.type_safe_first(businessItemHasWorkPackage, Parliament::Grom::Decorator::WorkPackage)
+        end
       end
     end
   end

diff --git a/lib/parliament/grom/decorator/version.rb b/lib/parliament/grom/decorator/version.rb
@@ -1,7 +1,7 @@
 module Parliament
   module Grom
     module Decorator
-      VERSION = '1.0.2'.freeze
+      VERSION = '1.0.3'.freeze
     end
   end
 end
diff --git a/..._BusinessItem/_work_package/node_does_not_have_businessItemHasWorkPackage/returns_nil.yml b/..._BusinessItem/_work_package/node_does_not_have_businessItemHasWorkPackage/returns_nil.yml
diff --git a/...Decorator_WorkPackage_object/returns_the_Parliament_Grom_Decorator_WorkPackage_object.yml b/...Decorator_WorkPackage_object/returns_the_Parliament_Grom_Decorator_WorkPackage_object.yml
diff --git a/...here_the_first_item_is_not_a_Parliament_Grom_Decorator_WorkPackage_object/returns_nil.yml b/...here_the_first_item_is_not_a_Parliament_Grom_Decorator_WorkPackage_object/returns_nil.yml
diff --git a/...package/node_has_businessItemHasWorkPackage/where_it_is_not_an_enumerable/returns_nil.yml b/...package/node_has_businessItemHasWorkPackage/where_it_is_not_an_enumerable/returns_nil.yml
diff --git a/...inessItem/_work_package/when_calling_work_package_twice/the_logic_is_only_called_once.yml b/...inessItem/_work_package/when_calling_work_package_twice/the_logic_is_only_called_once.yml
diff --git a/spec/parliament/grom/decorator/business_item_spec.rb b/spec/parliament/grom/decorator/business_item_spec.rb
@@ -15,15 +15,26 @@
 
   # Test #procedure_step
   include_examples(
-    'type_safe_first',
-    {
+  'type_safe_first',
+  {
       request:          request_object,
       filter_type:      'https://id.parliament.uk/schema/BusinessItem',
       predicate:        :businessItemHasProcedureStep,
       decorator_method: :procedure_step,
       type_klass:       Parliament::Grom::Decorator::ProcedureStep
     }
   )
+  # Test #work_package
+  include_examples(
+    'type_safe_first',
+    {
+      request:          request_object,
+      filter_type:      'https://id.parliament.uk/schema/BusinessItem',
+      predicate:        :businessItemHasWorkPackage,
+      decorator_method: :work_package,
+      type_klass:       Parliament::Grom::Decorator::WorkPackage
+    }
+  )
 
   describe '#date' do
     context 'Grom::Node has a date' do

diff --git a/spec/parliament/grom/decorator/laid_thing_spec.rb b/spec/parliament/grom/decorator/laid_thing_spec.rb
@@ -7,7 +7,7 @@
     decorators: Parliament::Grom::Decorator
   ).statutory_instrument_by_id
 
-  # Test #body
+  # Test #laying
   include_examples(
     'type_safe_first',
     {