Refactored factory and component logic

Author: A-Wheeto

app/components/cms/footer_component/footer_component.html.erb

@@ -12,8 +12,8 @@
       </div>
       <% link_blocks.each do |block| %>
         <div class="cms-footer-component__link-block">
-          <% block[:links].each do |link| %>
-            <%= render link.render %>
+          <% block.each do |link| %>
+            <%= render link.render(additional_classes: ["govuk-footer__link", "ncce-link", "ncce-link--on-dark"]) %>
           <% end %>
         </div>
       <% end %>

app/services/cms/models/dynamic_components/content_blocks/link_with_icon.rb

@@ -3,17 +3,21 @@ module Models
     module DynamicComponents
       module ContentBlocks
         class LinkWithIcon
-          attr_accessor :link_text, :url, :icon, :additional_classes
+          attr_accessor :link_text, :url, :icon
 
-          def initialize(link_text:, url:, icon:, additional_classes:)
+          def initialize(link_text:, url:, icon:)
             @link_text = link_text
             @url = url
             @icon = icon
-            @additional_classes = additional_classes
           end
 
-          def render
-            Cms::LinkWithIconComponent.new(link_text:, url:, icon:, additional_classes:)
+          def render(additional_classes: nil)
+            Cms::LinkWithIconComponent.new(
+              link_text: @link_text,
+              url: @url,
+              icon: @icon,
+              additional_classes: additional_classes
+            )
           end
         end
       end

app/services/cms/models/meta/footer_link_block.rb

@@ -2,19 +2,15 @@ module Cms
   module Models
     module Meta
       class FooterLinkBlock
-        attr_accessor :link_block
+        attr_accessor :link_blocks
 
-        def initialize(link_block:)
-          @link_block = link_block
+        def initialize(link_blocks:)
+          @link_blocks = link_blocks
         end
 
         def process_blocks
-          @link_block.map do |block|
-            {
-              links: block[:links].map do |link|
-                link
-              end
-            }
+          @link_blocks.map do |block|
+            block
           end
         end
       end

app/services/cms/providers/strapi/factories/model_factory.rb

@@ -159,22 +159,20 @@ def self.to_menu(strapi_data, _all_data)
 
           def self.to_footer(strapi_data, _all_data)
             {
-              link_block: strapi_data.map do |link|
-                {
-                  links: link[:link].map {
-                    Models::DynamicComponents::ContentBlocks::LinkWithIcon.new(
-                      link_text: _1[:linkText],
-                      url: _1[:url],
-                      icon: _1[:icon].dig(:data).nil? ? nil : Models::Images::Image.new(
-                        url: _1[:icon][:data][:attributes][:url],
-                        alt: _1[:icon][:data][:attributes][:alternativeText],
-                        caption: _1[:icon][:data][:attributes][:caption],
-                        default_size: :small,
-                        formats: _1[:icon][:data][:attributes][:formats]
-                      ),
-                      additional_classes: ["govuk-footer__link", "ncce-link", "ncce-link--on-dark"]
-                    )
-                  }
+              link_blocks: strapi_data.map do |link|
+                byebug
+                link[:link].map {
+                  Models::DynamicComponents::ContentBlocks::LinkWithIcon.new(
+                    link_text: _1[:linkText],
+                    url: _1[:url],
+                    icon: _1[:icon].dig(:data).nil? ? nil : Models::Images::Image.new(
+                      url: _1[:icon][:data][:attributes][:url],
+                      alt: _1[:icon][:data][:attributes][:alternativeText],
+                      caption: _1[:icon][:data][:attributes][:caption],
+                      default_size: :small,
+                      formats: _1[:icon][:data][:attributes][:formats]
+                    ),
+                  )
                 }
               end
             }