justimmo_client 0.6.3 → 0.6.4

data/lib/justimmo_client/api/v1/models/realty_price.rb

@@ -1,50 +1,55 @@
 # frozen_string_literal: true
 
-require "monetize"
-
 module JustimmoClient::V1
   class RealtyPrice < JustimmoBase
     # @!group Attributes
 
     # @!macro [attach] attribute
     #   @return [$2]
-    attribute :currency,               Money::Currency
+    attribute :currency,               Symbol, default: :EUR
     attribute :provision,              Boolean
     attribute :including_vat,          Boolean
     attribute :on_demand,              Boolean
     attribute :real_estate_taxes,      Float
     attribute :land_registry,          Float
-    attribute :commission,             Integer
-    attribute :purcase,                Money
-    attribute :purcase_net,            Money
+    attribute :commission,             String
     attribute :rent_vat,               Integer
-    attribute :rent,                   Money
-    attribute :rent_net,               Money
-    attribute :rent_cold,              Money
-    attribute :rent_including_heating, Money
-    attribute :rent_per_sqm,           Money
-    attribute :deposit,                Money
     attribute :operating_cost_vat,     Integer
-    attribute :operating_cost,         Money
-    attribute :operating_cost_net,     Money
-    attribute :operating_cost_per_sqm, Money
+    attribute :purcase,                RealtyCost
+    attribute :purcase_net,            RealtyCost
+    attribute :rent,                   RealtyCost
+    attribute :rent_net,               RealtyCost
+    attribute :rent_cold,              RealtyCost
+    attribute :rent_cold_net,          RealtyCost
+    attribute :rent_including_heating, RealtyCost
+    attribute :rent_per_sqm,           RealtyCost
+    attribute :operating_cost,         RealtyCost
+    attribute :operating_cost_net,     RealtyCost
+    attribute :operating_cost_per_sqm, RealtyCost
+    attribute :deposit,                RealtyCost
 
     # @!group Instance Method Summary
 
-    %w[purcase purcase_net
-       operating_cost operating_cost_net operating_cost_per_sqm
-       rent rent_net rent_cold rent_including_heating rent_per_sqm deposit
+    %i[
+      purcase purcase_net deposit
+      rent rent_net rent_cold rent_cold_net rent_including_heating rent_per_sqm
+      operating_cost operating_cost_net operating_cost_per_sqm
     ].each do |meth|
-      define_method("#{meth}=") do |amount|
-        log.debug("Using currency #{currency&.name} for #{meth}")
-        instance_variable_set("@#{meth}", Monetize.parse(amount))
+      define_method("#{meth}=") do |args|
+        options =
+          case args
+          when Hash   then args.deep_symbolize_keys
+          when String then { amount: args, currency: @currency }
+          else return
+          end
+        instance_variable_set("@#{meth}", RealtyCost.new(options))
       end
     end
 
     def on_demand?
-      return on_demand unless on_demand.nil?
-      return purcase.zero? unless purcase.nil?
-      return rent.zero? unless rent.nil?
+      return on_demand if on_demand
+      return purcase.zero? if purcase
+      return rent.zero? if rent
       true
     end
 
@@ -56,30 +61,9 @@ module JustimmoClient::V1
       !purcase.nil?
     end
 
-    def currency=(cur)
-      @currency = Money::Currency.new(cur) unless cur.nil?
-      Money.default_currency = @currency || :eur
-      log.debug("Set currency to #{currency.name}")
-    end
-
-    # FIXME: this needs some proper analysis of the input string
-    def commission=(text)
-      @commission = text.to_i
-    end
-
-    def commission
-      return nil unless @commission
-
-      if purcase?
-        (get / 100 * @commission) * 1.20
-      else
-        (get * @commission) * 1.20
-      end
-    end
-
-    def rent_vat
-      return nil unless rent? && rent_net && @rent_vat
-      rent_net / 100 * @rent_vat
+    # TODO: add more additional costs
+    def additional
+      [operating_cost].map(&:to_f).sum
     end
 
     def get
@@ -91,15 +75,7 @@ module JustimmoClient::V1
     end
 
     def to_s
-      on_demand? ? "on demand" : get.format
-    end
-
-    def as_json
-      @attributes.to_s
-    end
-
-    def inspect
-      "#<#{self.class} #{self}>"
+      on_demand? ? translate("price.on_demand") : get.to_s
     end
   end
 end

data/lib/justimmo_client/api/v1/models/realty_usage.rb

@@ -24,11 +24,7 @@ module JustimmoClient::V1
     # @!group Instance Method Summary
 
     def to_a
-      tmp = []
-      tmp << :living if living?
-      tmp << :business if business?
-      tmp << :investment if investment?
-      tmp
+      attributes.select { |_k, v| v }.keys
     end
 
     def map(&block)

data/lib/justimmo_client/api/v1/representers/json/attachment_representer.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module JustimmoClient::V1
+  module JSON
+    class AttachmentRepresenter < JustimmoRepresenter
+      property :category
+      property :origin
+      property :title
+      property :url
+
+      collection_representer class: Attachment
+    end
+  end
+end

data/lib/justimmo_client/api/v1/representers/json/employee_representer.rb

@@ -18,13 +18,9 @@ module JustimmoClient::V1
       property :location
       property :website
 
-      property :picture, class: Image do
-        %i[small medium big pfad_medium].each do |size|
-          property size,
-            setter: ->(represented:, fragment:, **) { represented.add_url(fragment, default: :user_big) },
-            getter: ->(represented:, **) { represented[size] }
-        end
-      end
+      collection :attachments,
+        decorator: AttachmentRepresenter,
+        class: Attachment
 
       collection_representer class: Employee
     end

data/lib/justimmo_client/api/v1/representers/json/realty_representer.rb

@@ -3,18 +3,8 @@
 module JustimmoClient::V1
   module JSON
     class RealtyRepresenter < JustimmoRepresenter
-      property :usage, class: RealtyUsage do
-        property :living
-        property :business
-        property :investment
-      end
-      property :marketing, class: RealtyMarketing do
-        property :buy
-        property :rent
-      end
       property :type_id
       property :sub_type_id
-
       property :id
       property :number
       property :created_at
@@ -23,43 +13,108 @@ module JustimmoClient::V1
       property :title
       property :teaser
       property :description
-      property :floor
-      property :area,
-               decorator: RealtyAreaRepresenter,
-               class: RealtyArea
-      property :geo,
-        decorator: GeoLocationRepresenter,
-        class: GeoLocation
-      property :room_count,
-        decorator: RealtyRoomCountRepresenter,
-        class: RealtyRoomCount
-
       property :openimmo_id
       property :available
       property :construction_year
-      property :contact,
-               decorator: ContactRepresenter,
-               class: Employee
       property :description_furniture
       property :furniture
-      property :price,
-        decorator: RealtyPriceRepresenter,
-        class: RealtyPrice
-      collection :images, class: Image do
-        property :category
-        property :origin
-        property :title
-        %i[pfad small medium big2 medium2 s220x155 fullhd].each do |size|
-          property size,
-            setter: ->(represented:, fragment:, **) { represented.add_url(fragment, default: :big) },
-            getter: ->(represented:, **) { represented[size] }
-        end
-      end
       property :documents
       property :images360
       property :videos
       property :links
 
+      property :usage, class: RealtyUsage do
+        property :living
+        property :business
+        property :investment
+      end
+
+      property :marketing, class: RealtyMarketing do
+        property :buy
+        property :rent
+      end
+
+      property :area, class: RealtyArea do
+        property :balcony_terrace
+        property :balcony
+        property :office
+        property :garage
+        property :garden
+        property :total
+        property :surface
+        property :property
+        property :basement
+        property :storage
+        property :loggia
+        property :floor
+        property :parking
+        property :terrace
+        property :buildable
+        property :sales
+        property :living
+      end
+
+      property :geo, class: GeoLocation do
+        property :zip_code
+        property :location
+        property :federal_state
+        property :floor
+        property :country
+        property :latitude
+        property :longitude
+      end
+
+      property :room_count, class: RealtyRoomCount do
+        property :store
+        property :bathroom
+        property :balcony_terrace
+        property :balcony
+        property :garden
+        property :garage
+        property :loggia
+        property :basement
+        property :toilet
+        property :parking_space
+        property :total
+      end
+
+      property :contact, decorator: EmployeeRepresenter, class: Employee do
+        property :email_feedback
+        property :email
+        property :last_name
+        property :company
+        property :salutation
+        property :phone
+        property :mobile
+      end
+
+      property :price, class: RealtyPrice do
+        property :purcase
+        property :purcase_net
+        property :rent
+        property :rent_net
+        property :rent_cold
+        property :rent_including_heating
+        property :deposit
+        property :rent_per_sqm
+        property :operating_cost
+        property :operating_cost_net
+        property :operating_cost_per_sqm
+        property :currency
+        property :commission
+        property :rent_vat
+        property :provision
+        property :including_vat
+        property :on_demand
+        property :real_estate_taxes
+        property :land_registry
+        property :operating_cost_vat
+      end
+
+      collection :attachments,
+        decorator: AttachmentRepresenter,
+        class: Attachment
+
       collection_representer class: Realty
     end
   end

data/lib/justimmo_client/api/v1/representers/xml/attachment_representer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module JustimmoClient::V1
+  module XML
+    class AttachmentRepresenter < JustimmoRepresenter
+      property :category,
+        as: :gruppe,
+        attribute: true,
+        parse_filter: ->(fragment, _opt) do
+          case fragment
+          when "TITELBILD" then :title_image
+          when "BILD" then :image
+          else nil
+          end
+        end
+
+      property :origin,
+        as: :location,
+        attribute: true,
+        parse_filter: ->(fragment, _opt) { fragment.downcase }
+
+      property :title, as: :anhangtitel
+
+      nested :daten do
+        property :url, as: :pfad
+      end
+
+      collection_representer class: Attachment
+    end
+  end
+end

data/lib/justimmo_client/api/v1/representers/xml/employee_representer.rb

@@ -18,29 +18,18 @@ module JustimmoClient::V1
       property :location,     as: :ort
       property :website,      as: :url
 
-      property :picture,
-        as: :bild,
-        class: Image do
-          %i[small medium big pfad_medium].each do |size|
-            property size, setter: ->(represented:, fragment:, **) { represented.add_url(fragment, default: :user_big) }
-          end
-        end
+      collection :attachments,
+        as: :anhang,
+        wrap: :anhaenge,
+        decorator: AttachmentRepresenter,
+        class: Attachment
 
-      # NOTE: Just contains the picture again
-      #       Comment it out for now in case we still need it later.
-      #
-      # nested :user_defined_anyfield do
-      #   property :attachment,
-      #     as: :anhang,
-      #     class: Image do
-      #       property :category, as: :gruppe, attribute: true
-      #       property :origin, as: :location, attribute: true
-      #       property :title, as: :anhangtitel
-      #       nested :daten do
-      #         property :path, as: :pfad, setter: ->(represented:, fragment:, **) { represented.add_url(fragment, default: :user_big) }
-      #       end
-      #     end
-      # end
+      nested :bild do
+        property :pfad,
+          setter: ->(fragment:, represented:, **) do
+            represented.attachments << Attachment.new(url: fragment)
+          end
+      end
     end
   end
 end

data/lib/justimmo_client/api/v1/representers/xml/justimmo_representer.rb

@@ -6,6 +6,7 @@ module JustimmoClient::V1
   module XML
     class JustimmoRepresenter < Representable::Decorator
       include Representable::XML
+      extend JustimmoClient::Logging
 
       defaults render_nil: true
     end

data/lib/justimmo_client/api/v1/representers/xml/realty_price_representer.rb

@@ -7,8 +7,10 @@ module JustimmoClient::V1
         property :currency, as: :iso_waehrung, attribute: true
       end
 
-      property :purcase,     as: :kaufpreis
+      property :purcase, as: :kaufpreis
       property :purcase_net, as: :kaufpreisnetto
+      # property :purcase_per_sqm, as: :kaufpreis_pro_qm
+
       nested :kaufpreis do
         property :on_demand, as: :auf_anfrage, attribute: true
       end
@@ -21,6 +23,7 @@ module JustimmoClient::V1
 
       property :deposit,                as: :kaution
       property :rent_cold,              as: :kaltmiete
+      property :rent_cold_net,          as: :nettokaltmiete
       property :rent_including_heating, as: :warmmiete
       property :rent_per_sqm,           as: :mietpreis_pro_qm
       property :operating_cost_per_sqm, as: :betriebskosten_pro_qm

data/lib/justimmo_client/api/v1/representers/xml/realty_representer.rb

@@ -2,7 +2,153 @@
 
 module JustimmoClient::V1
   module XML
-    class RealtyRepresenter < JustimmoRepresenter
+    REALTY_ROOMS = {
+      store:           :anzahl_abstellraum,
+      bathroom:        :anzahl_badezimmer,
+      balcony_terrace: :anzahl_balkon_terrassen,
+      balcony:         :anzahl_balkone,
+      garden:          :anzahl_garten,
+      garage:          :anzahl_garagen,
+      loggia:          :anzahl_loggias,
+      basement:        :anzahl_keller,
+      toilet:          :anzahl_sep_wc,
+      parking_space:   :anzahl_stellplaetze,
+      total:           :anzahl_zimmer
+    }.freeze
+
+    REALTY_AREAS = {
+      balcony_terrace:  :balkon_terrasse_flaeche,
+      balcony:          :balkons_flaeche,
+      office:           :bueroflaeche,
+      garage:           :garagen_flaeche,
+      garden:           :gartenflaeche,
+      total:            :gesamtflaeche,
+      surface:          :grundflaeche,
+      property:         :grundstuecksflaeche,
+      basement:         :kellerflaeche,
+      storage:          :lagerflaeche,
+      loggia:           :loggias_flaeche,
+      floor:            :nutzflaeche,
+      parking:          :stellplatz_flaeche,
+      terrace:          :terrassen_flaeche,
+      buildable:        :verbaubare_flaeche,
+      sales:            :verkaufsflaeche,
+      living:           :wohnflaeche
+    }.freeze
+
+    FILTERS = {
+      sanitize_newline: ->(frag, _opt) { frag.gsub("\r\n", "\n") },
+      str_to_a: ->(frag, _opt) { frag.split(",").map(&:strip) }
+    }.freeze
+
+    private_constant :REALTY_ROOMS
+    private_constant :REALTY_AREAS
+    private_constant :FILTERS
+
+    class RealtyListRepresenter < JustimmoRepresenter
+      property :title,  as: :titel
+      property :teaser, as: :dreizeiler
+      property :description,
+        as: :objektbeschreibung,
+        parse_filter: FILTERS[:sanitize_newline]
+
+      property :status_id
+      property :created_at, as: :erstellt_am
+      property :updated_at, as: :aktualisiert_am
+
+      property :id
+      property :number, as: :objektnummer
+
+      # nesting
+
+      { first_image: :erstes_bild,
+        second_image: :zweites_bild
+      }.each do |key, api|
+        property api, setter: ->(represented:, fragment:, **) do
+          represented.attachments << Attachment.new(url: fragment)
+        end
+      end
+
+      { location:  :ort,
+        zip_code:  :plz,
+        proximity: :naehe,
+        floor:     :etage
+      }.each do |key, value|
+        property value, setter: ->(represented:, fragment:, **) do
+          represented.geo ||= GeoLocation.new
+          represented.geo.send("#{key}=", fragment)
+        end
+      end
+
+      { purcase:   :kaufpreis,
+        rent_cold: :gesamtmiete
+      }.each do |key, value|
+        property value, setter: ->(represented:, fragment:, **) do
+          represented.price ||= RealtyPrice.new
+          represented.price.send("#{key}=", fragment)
+        end
+      end
+
+      REALTY_AREAS.each do |key, value|
+        property key,
+          as: value,
+          setter: ->(fragment:, represented:, **) do
+            represented.area ||= RealtyArea.new
+            represented.area[key] = fragment
+          end
+      end
+
+      REALTY_ROOMS.each do |key, value|
+        property key,
+          as: value,
+          setter: ->(fragment:, represented:, **) do
+            represented.room_count ||= RealtyRoomCount.new
+            represented.room_count[key] = fragment
+          end
+      end
+    end
+
+    class RealtyRepresenter < RealtyListRepresenter
+      property :geo,
+        decorator: GeoLocationRepresenter,
+        class: GeoLocation
+
+      property :contact, as: :kontaktperson, class: Employee do
+        property :email_feedback
+        property :email, as: :email_direkt
+        property :last_name, as: :name
+        property :company, as: :firma
+        property :salutation, as: :anrede
+        property :phone, as: :tel_zentrale
+        property :mobile, as: :tel_handy
+      end
+
+      property :price,
+        as: :preise,
+        decorator: RealtyPriceRepresenter,
+        class: RealtyPrice
+
+      property :area, as: :flaechen, class: RealtyArea do
+        REALTY_AREAS.each { |k, v| property k, as: v }
+      end
+
+      property :room_count, as: :flaechen, class: RealtyRoomCount do
+        REALTY_ROOMS.each { |k, v| property k, as: v }
+      end
+
+      property :documents, as: :dokumente
+      property :videos
+      property :images360, as: :bilder360
+      property :links
+
+      collection :attachments,
+        as: :anhang,
+        wrap: :anhaenge,
+        decorator: AttachmentRepresenter,
+        class: Attachment
+
+      # Unnesting
+
       nested :category, as: :objektkategorie do
         property :usage, as: :nutzungsart, class: RealtyUsage do
           property :living,     as: :WOHNEN,  attribute: true
@@ -27,6 +173,51 @@ module JustimmoClient::V1
             options[:doc].css("user_defined_simplefield[feldname=sub_objektart_id]").text
           end
       end
+
+      nested :ausstattung do
+      end
+
+      nested :zustand_angaben do
+        property :construction_year, as: :baujahr
+      end
+
+      nested :freitexte do
+        property :title, as: :objekttitel
+
+        property :description,
+          as: :objektbeschreibung,
+          parse_filter: FILTERS[:sanitize_newline]
+
+        property :description_furniture,
+          as: :ausstatt_beschr,
+          parse_filter: FILTERS[:str_to_a]
+
+        nested :user_defined_anyfield do
+          property :furniture, as: :justimmo_moeblierung
+        end
+      end
+
+      nested :verwaltung_objekt do
+        property :available, as: :verfuegbar_ab
+
+        property :status_id
+
+        property :created_at,
+          as: :user_defined_simplefield,
+          parse_filter: ->(_fragment, options) { options[:doc].css("user_defined_simplefield[feldname=erstellt_am]").text }
+
+        property :updated_at,
+          as: :user_defined_simplefield,
+          parse_filter: ->(_fragment, options) { options[:doc].css("user_defined_simplefield[feldname=aktualisiert_am]").text }
+      end
+
+      nested :verwaltung_techn do
+        property :id,          as: :objektnr_intern
+        property :number,      as: :objektnr_extern
+        property :openimmo_id, as: :openimmo_obid
+      end
+
+      collection_representer class: Realty
     end
   end
 end