pwb 1.2.0 → 1.3.0

data/app/controllers/pwb/api/v1/clients_controller.rb

@@ -0,0 +1,35 @@
+module Pwb
+  class Api::V1::ClientsController < JSONAPI::ResourceController
+    # Skipping action below allows me to browse to endpoint
+    # without having set mime type
+    skip_before_action :ensure_valid_accept_media_type
+    # later version changes above method name
+    # https://github.com/cerebris/jsonapi-resources/pull/806/files
+    # https://github.com/cerebris/jsonapi-resources/pull/801
+
+    # def index
+    #   # can't figure out why default jsonapi index action returns nothing..
+    #   sections = Section.all
+    #   # JSONAPI::ResourceSerializer.new(Api::V1::SectionResource).serialize_to_hash(Api::V1::SectionResource.new(sections, nil))
+    #   render json: sections
+    # end
+
+    def bulk_update
+      sectionsJSON = JSON.parse params[:items]
+      sections = []
+      sectionsJSON.each do |sectionJSON|
+        section = Section.find sectionJSON["id"]
+        section.update(sectionJSON.slice("show_in_top_nav", "show_in_footer", "sort_order"))
+        sections.push section
+      end
+
+      render json: sections.as_json
+    end
+
+    private
+
+    def sections_params
+      params.permit(:items, items: [])
+    end
+  end
+end

data/app/controllers/pwb/api/v1/contacts_controller.rb

@@ -0,0 +1,41 @@
+module Pwb
+  class Api::V1::ContactsController < ApplicationApiController
+
+    respond_to :json
+
+    def create
+      Pwb::Contact.create create_contact_params
+    end
+
+    def update
+      contact = Pwb::Contact.find_by_id params[:id]
+      contact.update update_contact_params
+      return render json: contact.as_json
+    end
+    
+    def show
+      contact = Pwb::Contact.find_by_id params[:id]
+      return render json: contact.as_json
+    end
+
+    def index
+      contacts = Pwb::Contact.all
+      return render json: contacts.as_json
+    end
+
+    private
+
+    def create_contact_params
+      params.require(:details).permit(
+        :first_name, :last_name
+      )
+    end
+
+    def update_contact_params
+      params.require(:details).permit(
+        :first_name, :last_name
+      )
+    end
+
+  end
+end

data/app/controllers/pwb/api/v1/links_controller.rb

@@ -0,0 +1,47 @@
+module Pwb
+  class Api::V1::LinksController < ApplicationApiController
+
+    def index
+      # Globalize.fallbacks = {:ru => [:en]}
+      # top_nav_links, footer_links = nil
+      locale = params[:locale] || :en
+      I18n.with_locale(locale) do
+        top_nav_links = Link.ordered_top_nav
+        footer_links = Link.ordered_footer
+        render json: {
+          footer_links: footer_links.as_json,
+          top_nav_links: top_nav_links.as_json
+        }
+      end
+    end
+
+    def bulk_update
+      link_groups_JSON = JSON.parse params[:linkGroups]
+      # above gets me around difficulty of passing an array
+      # as a param to rails (I've stringified json on clientside)
+      # without above I'd have to get keys and loop through like so
+      # link_groups = params[:linkGroups]
+      # footer_links_keys = link_groups[:footer_links].keys
+      # footer_links_keys.each do |footer_links_key|
+      #   linkJSON = link_groups[:footer_links][footer_links_key]
+
+      link_groups_JSON["top_nav_links"].each do |linkJSON|
+        link = Link.find_by_slug linkJSON["slug"]
+        link.update(linkJSON)
+      end
+      link_groups_JSON["footer_links"].each do |linkJSON|
+        link = Link.find_by_slug linkJSON["slug"]
+        link.update(linkJSON)
+      end
+      render json: {
+        success: true
+      }
+    end
+
+    private
+
+    def links_params
+      params.permit(:items, items: [])
+    end
+  end
+end

data/app/controllers/pwb/api/v1/page_controller.rb

@@ -0,0 +1,117 @@
+require_dependency "pwb/application_controller"
+
+module Pwb
+  class Api::V1::PageController < ApplicationApiController
+    # protect_from_forgery with: :null_session
+    def get
+      # admin_setup = Pwb::CmsPageContainer.where(name: params[:page_name]).first || {}
+      # render json: admin_setup.as_json_for_admin["attributes"]
+      page = Pwb::Page.find_by_slug(params[:page_name])
+      if page
+        render json: page.as_json_for_admin
+      else
+        render json: {}
+      end
+    end
+
+
+
+    def set_photo 
+      page = Page.find_by_slug params[:page_slug]
+
+      unless params["block_label"]
+        return render_json_error 'Please provide block_label'
+      end
+      block_label = params["block_label"]
+      unless params["page_part_key"]
+        return render_json_error 'Please provide label'
+      end
+      page_part_key = params["page_part_key"]
+
+      photo = page.create_fragment_photo page_part_key, block_label, params[:file]
+      photo.reload
+      render json: {
+        image_url: photo.optimized_image_url
+      }
+    end
+
+    def update
+      page = Page.find_by_slug params[:page][:slug]
+      page.update(page_params)
+      page.save!
+      render json: page.as_json_for_admin
+    end
+
+    def update_page_part_visibility
+      page = Page.find_by_slug params[:page_slug]
+
+      if params["cmd"] == "setAsHidden"
+        page.set_fragment_visibility params[:page_part_key], false        
+      end
+      if params["cmd"] == "setAsVisible"
+        page.set_fragment_visibility params[:page_part_key], true        
+      end
+
+      # page.details["visiblePageParts"] = params[:visible_page_parts]
+      # page.save!
+      render json: page
+    end
+
+    def save_page_fragment
+      page = Page.find_by_slug params[:page_slug]
+      fragment_details = params[:fragment_details]
+      unless fragment_details["locale"]
+        return render_json_error 'Please provide locale'
+      end
+      locale = fragment_details["locale"]
+      unless fragment_details["page_part_key"]
+        return render_json_error 'Please provide page_part_key'
+      end
+      page_part_key = fragment_details["page_part_key"]
+
+      # updated_details = page.set_fragment_details page_part_key, locale, fragment_details
+      # fragment_html = render_to_string :partial => "pwb/fragments/#{page_part_key}",  :locals => { page_part: params[:fragment_details][:blocks]}
+
+      # save the block contents (in associated page_part model)
+      updated_details = page.set_page_part_block_contents page_part_key, locale, fragment_details
+      # retrieve the contents saved above and use to rebuild html for that page_part
+      # (and save it in associated page_content model)
+      fragment_html = page.rebuild_page_content page_part_key, locale
+
+      # # Check if an image url has been set
+      # fragment_details.each do |fragment_detail|
+      #   update_all_images = true
+      # end
+
+      # page.save!
+      # rescue StandardError => error
+      #   return render_json_error error.message
+      # end
+
+      return render json: {
+        blocks: updated_details,
+        html: fragment_html
+      }
+    end
+
+    private
+
+    def page_fragment_params
+      params.require(:fragment_details).permit(:label, :locale, blocks: [:content, :identifier, :is_image])
+    end
+
+
+    def page_params
+      page_fields = ["sort_order_top_nav","visible"]
+      locales = I18n.available_locales
+      locales.each do |locale|
+        page_fields.push("link_title_#{locale}")
+        page_fields.push("page_title_#{locale}")
+        page_fields.push("raw_html_#{locale}")
+      end
+      params.require(:page).permit(
+        page_fields
+      )
+    end
+  end
+end

data/app/controllers/pwb/api/v1/page_fragments_controller.rb

@@ -0,0 +1,74 @@
+module Pwb
+  # grew out of Api::V1::CmsPagesController which had used
+  # comfy mex sofa
+  class Api::V1::PageFragmentsController < ApplicationApiController
+    def show
+      page = Page.find_by_slug "home"
+      render json: page.details["fragments"]      
+    end
+
+    def update
+      page = Page.find_by_slug "home"
+
+      services_fragment = {
+        "about_us_services": {
+          "en": cms_page_update_params[:attributes]
+        }
+      }
+      page.details["fragments"] = services_fragment.as_json
+
+      # page.update(page_params)
+      page.save!
+      render json: page.details["fragments"]      
+
+
+      # updated_caches = []
+      # refresh_all_locales = false
+      # cms_page_update_params[:attributes][:blocks].each do |block_params|
+      #   block = Comfy::Cms::Block.find block_params[:id]
+      #   if block_params[:is_image]
+      #     # for images I want to update all language variants of the block
+      #     cross_locale_blocks = Comfy::Cms::Block.where(identifier: block_params[:identifier])
+      #     cross_locale_blocks.each do |cross_locale_block|
+      #       cross_locale_block.update block_params.slice :content
+      #     end
+      #     refresh_all_locales = true
+      #   else
+      #     block.update block_params.slice :content
+      #   end
+      #   # blocks.push block
+      # end
+
+      # if refresh_all_locales
+      #   pages = Comfy::Cms::Page.where(label: cms_page_update_params[:attributes][:label])
+      #   pages.each do |page|
+      #     page.clear_content_cache
+      #     updated_caches.push({
+      #                           page_id: page.id,
+      #                           page_content_cache: page.content_cache
+      #     })
+      #   end
+      # else
+      #   page = Comfy::Cms::Page.find cms_page_update_params[:id]
+      #   page.clear_content_cache
+      #   # need to call content_cache again for refresh
+      #   page.content_cache
+      # end
+
+      # # below ensures valid json_api response is sent:
+      # page = Comfy::Cms::Page.find cms_page_update_params[:id]
+      # serialized_page = JSONAPI::ResourceSerializer.new(Pwb::Api::V1::CmsPageResource).serialize_to_hash(Pwb::Api::V1::CmsPageResource.new(page, nil))
+      # updated_caches.push {}
+      # serialized_page[:data]["attributes"]["updated-caches"] = updated_caches
+      # # [{id: 22, cc: "dddd"}]
+      # render json: serialized_page
+
+      # render json: page
+    end
+
+
+    def cms_page_update_params
+      params.require(:data).permit(:id, attributes: [:label, blocks: [:content, :id, :identifier, :info, :is_image]])
+    end
+  end
+end

data/app/controllers/pwb/api/v1/properties_controller.rb

@@ -5,7 +5,6 @@ module Pwb
     skip_before_action :ensure_valid_accept_media_type
 
     # def set_default_currency
-    #   binding.pry
     #   @model
     # end
 
@@ -17,21 +16,44 @@ module Pwb
       new_props = []
       existing_props = []
       errors = []
-
       propertiesJSON.each do |propertyJSON|
         if Pwb::Prop.where(reference: propertyJSON["reference"]).exists?
-          existing_props.push propertyJSON
+          existing_props.push Pwb::Prop.find_by_reference propertyJSON["reference"]
+          # propertyJSON
         else
           begin
-            new_prop = Pwb::Prop.create propertyJSON.except "extras", "property_photos"
-            if propertyJSON["extras"]
-              new_prop.set_extras=propertyJSON["extras"]
+            new_prop = Pwb::Prop.create(propertyJSON.except( "features", "property_photos", "locale_code"))
+            # new_prop = Pwb::Prop.create(propertyJSON.except("features", "property_photos", "image_urls", "last_retrieved_at"))
+            
+            # create will use website defaults for currency and area_unit
+            # need to override that
+            if propertyJSON["currency"]
+              new_prop.currency = propertyJSON["currency"]
+              new_prop.save!
+            end
+            if propertyJSON["area_unit"]
+              new_prop.area_unit = propertyJSON["area_unit"]
+              new_prop.save!
+            end
+
+            # TODO - go over supported locales and save title and description 
+            # into them
+
+            if propertyJSON["features"]
+              new_prop.set_extras=propertyJSON["features"]
             end
             if propertyJSON["property_photos"]
-              propertyJSON["property_photos"].each do |property_photo|
+              # uploading images can slow things down so worth setting a limit
+              max_photos_to_process = 1
+              # TODO - retrieve above as a param
+              propertyJSON["property_photos"].each_with_index do |property_photo, index|
+                if index > max_photos_to_process
+                  return
+                end
                 photo = PropPhoto.create
                 photo.sort_order = property_photo["sort_order"] || nil
-                photo.remote_image_url = property_photo["image"]["url"] || property_photo["url"]
+                photo.remote_image_url = property_photo["url"]
+                # photo.remote_image_url = property_photo["image"]["url"] || property_photo["url"]
                 photo.save!
                 new_prop.prop_photos.push photo
               end
@@ -39,7 +61,6 @@ module Pwb
 
             new_props.push new_prop
           rescue => err
-            # binding.pry
             errors.push err.message
             # logger.error err.message
           end

data/app/controllers/pwb/api/v1/sections_controller.rb

@@ -1,35 +1,36 @@
+# oct 2017 - no longer in use - to_delete
 module Pwb
   class Api::V1::SectionsController < JSONAPI::ResourceController
-    # Skipping action below allows me to browse to endpoint
-    # without having set mime type
-    skip_before_action :ensure_valid_accept_media_type
-    # later version changes above method name
-    # https://github.com/cerebris/jsonapi-resources/pull/806/files
-    # https://github.com/cerebris/jsonapi-resources/pull/801
+    # # Skipping action below allows me to browse to endpoint
+    # # without having set mime type
+    # skip_before_action :ensure_valid_accept_media_type
+    # # later version changes above method name
+    # # https://github.com/cerebris/jsonapi-resources/pull/806/files
+    # # https://github.com/cerebris/jsonapi-resources/pull/801
 
-    def index
-      # can't figure out why default jsonapi index action returns nothing..
-      sections = Section.all
-      # JSONAPI::ResourceSerializer.new(Api::V1::SectionResource).serialize_to_hash(Api::V1::SectionResource.new(sections, nil))
-      render json: sections
-    end
+    # def index
+    #   # can't figure out why default jsonapi index action returns nothing..
+    #   sections = Section.all
+    #   # JSONAPI::ResourceSerializer.new(Api::V1::SectionResource).serialize_to_hash(Api::V1::SectionResource.new(sections, nil))
+    #   render json: sections
+    # end
 
-    def bulk_update
-      sectionsJSON = JSON.parse params[:items]
-      sections = []
-      sectionsJSON.each do |sectionJSON|
-        section = Section.find sectionJSON["id"]
-        section.update(sectionJSON.slice("show_in_top_nav", "show_in_footer", "sort_order"))
-        sections.push section
-      end
+    # def bulk_update
+    #   sectionsJSON = JSON.parse params[:items]
+    #   sections = []
+    #   sectionsJSON.each do |sectionJSON|
+    #     section = Section.find sectionJSON["id"]
+    #     section.update(sectionJSON.slice("show_in_top_nav", "show_in_footer", "sort_order"))
+    #     sections.push section
+    #   end
 
-      render json: sections.as_json
-    end
+    #   render json: sections.as_json
+    # end
 
-    private
+    # private
 
-    def sections_params
-      params.permit(:items, items: [])
-    end
+    # def sections_params
+    #   params.permit(:items, items: [])
+    # end
   end
 end