stay_commerce 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5861ce1241022b986eecc6189dbb408fc598a09d8918711c0c9610f917d24a6
-  data.tar.gz: 061efeee0f6282c67ac3dcaf4e578f25032dcee4a173b46ccccf1073b09e7116
+  metadata.gz: 7666bce8280d873c254de1000f27e045c0de5fd8a3dec3bcae2ffbc3b5b0e321
+  data.tar.gz: 0e217c0d0723fda01c66d307b3296b581a9e786ed333d279033668cbcda6889e
 SHA512:
-  metadata.gz: 745c862563d5b73069e9e17b9f4a98a6c67bc3f3034dcf5c166ee425a79fd16fc95806d80752f212b92fa8d368bff27224b5ed8a37792f4f542fae3c94e2c1db
-  data.tar.gz: c508c74362a75aa3a0d2dbc5f5f01e6172dc3df0928fc10ebf8112a2565a80d2ba01ec8b1aa660890e5cb0f42ada171dc12b7e8072796cc9bff7671dddbb3215
+  metadata.gz: cdd0be0c0dc98f8b3227f5f7636db735df93a329ce0e7ba604aa2c9a82c3dda5a36d36ab016e04ead29e3517030971357fd65f76861538cc10ffccaf7c108007
+  data.tar.gz: ba03f68fdcb000c05c39904ccd94afea3732eeb8cb2f26667b31324259b31e8166ba4ed3088d4592a94dce0b1b723f9040226d59285b501e38356f7e2cd829f5

data/app/assets/javascripts/stay/admin/property.js

@@ -25,13 +25,13 @@ $(document).ready(function() {
   const roomTypeField = document.getElementById('room_type_field');
   const propertyCategoryData = document.getElementById('property-category-data');
 
-  // const roomTypesByCategory = JSON.parse(propertyCategoryData.getAttribute('data-room-types'));
+  const roomTypesByCategory = JSON.parse(propertyCategoryData.getAttribute('data-room-types'));
 
-  // window.updateRoomType = function(selectedCategoryId) {
-  //   if (roomTypesByCategory[selectedCategoryId]) {
-  //     roomTypeField.value = roomTypesByCategory[selectedCategoryId];
-  //   } else {
-  //     roomTypeField.value = '';
-  //   }
-  // };
+  window.updateRoomType = function(selectedCategoryId) {
+    if (roomTypesByCategory[selectedCategoryId]) {
+      roomTypeField.value = roomTypesByCategory[selectedCategoryId];
+    } else {
+      roomTypeField.value = '';
+    }
+  };
 });

data/app/controllers/concerns/stay/image_resizer_concern.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+module Stay
+  module ImageResizerConcern
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :resize_image, only: %i[update create]
+    end
+
+    private
+
+    def resize_image
+      image_params = resize_param_name
+      return unless image_params
+    
+      Array(image_params).each do |image_param|
+        next unless image_param.respond_to?(:tempfile)
+    
+        content_type = Marcel::MimeType.for(image_param.tempfile)
+    
+        next unless content_type&.start_with?("image")
+    
+        begin
+          ImageProcessing::MiniMagick
+            .source(image_param.tempfile)
+            .quality(85)
+            .call(destination: image_param.tempfile.path)
+        rescue StandardError => e
+          Rails.logger.error "Image processing failed: #{e.message}"
+          next
+        end
+      end
+    end
+
+    def resize_param_name
+      case controller_name
+      when "properties"
+        params[:property][:place_images] || params[:property][:cover_image]
+      else
+        params[:attachment]
+      end
+    end
+  end
+end

data/app/controllers/devise/api/tokens_controller.rb

@@ -27,12 +27,10 @@ module Devise
           token = service.success
 
           call_devise_trackable!(token.resource_owner)
-
           token_response = Devise::Api::Responses::TokenResponse.new(request, token: token, action: __method__)
           Devise.api.config.after_successful_sign_up.call(token.resource_owner, token, request)
           assign_role(token.resource_owner) if token.resource_owner
           data = ActiveModelSerializers::SerializableResource.new(token.resource_owner, serializer: UserSerializer).as_json
-          UserMailer.welcome_email(token.resource_owner).deliver_later if token.resource_owner
           return render json: { access_token: token_response&.token.access_token, success: true }, status: token_response.status
         end
 
@@ -157,8 +155,6 @@ module Devise
       def assign_role(user)
         role  = Stay::Role.find_by(name: params[:type])
         user.role_users.create(role_id: role&.id) if role.present?
-        token = Random.hex(16)
-        user.update(confirmation_token: token)
       end
 
       def sign_in_params

data/app/controllers/stay/admin/properties_controller.rb

@@ -1,6 +1,7 @@
 module Stay
   module Admin
     class PropertiesController < Stay::Admin::BaseController
+      include Stay::ImageResizerConcern
       before_action :set_property, only: %i[show edit update destroy approve reject]
 
       def index

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

@@ -1,4 +1,5 @@
 class Stay::Api::V1::PropertiesController < Stay::BaseApiController
+    include Stay::ImageResizerConcern
     before_action :authenticate_devise_api_token!
     before_action :set_property, only: [ :show, :update, :destroy ]
     before_action :check_create_access, only: [ :create, :update ]

data/app/models/stay/property.rb

@@ -2,6 +2,7 @@ module Stay
   class Property < ApplicationRecord
     ACTIVE_STATUS = "active".freeze
     APPROVED = "approved".freeze
+    PROPERTY = "property".freeze
     include Rails.application.routes.url_helpers
     include CurrencyHelper
     include Stay::ControllerHelpers::Currency
@@ -29,15 +30,15 @@ module Stay
     has_many :prices, through: :rooms
     has_many :line_items, through: :variants_including_master
     has_many :bookings
-    belongs_to :property_category, class_name: "Stay::PropertyCategory", optional: true
+    belongs_to :property_category, class_name: "Stay::PropertyCategory"
     belongs_to :property_type, class_name: "Stay::PropertyType"
     has_many :property_amenities, class_name: "Stay::PropertyAmenity", dependent: :destroy
-    has_many :amenities, through: :property_amenities, class_name: "Stay::Amenity"
+    has_many :property_type_amenities, -> { where(amenity_type: PROPERTY) }, through: :property_amenities, source: :amenity, class_name: "Stay::Amenity"
     has_many :additional_rules, class_name: "Stay::AdditionalRule", dependent: :destroy
     has_many :property_house_rules, class_name: "Stay::PropertyHouseRule", dependent: :destroy
     has_many :house_rules, through: :property_house_rules, class_name: "Stay::HouseRule"
     has_many :property_features, class_name: "Stay::PropertyFeature", dependent: :destroy
-    has_many :features, through: :property_features, class_name: "Stay::Feature"
+    has_many :property_type_features,-> { where(feature_type: PROPERTY) },through: :property_features,source: :feature, class_name: "Stay::Feature"
     has_many :property_taxes, class_name: "Stay::PropertyTax", dependent: :destroy
     has_many :taxes, through: :property_taxes, class_name: "Stay::Tax"
     has_many :store_properties, class_name: "Stay::StoreProperty", dependent: :destroy

data/app/models/stay/property_category.rb

@@ -1,6 +1,7 @@
 module Stay
   class PropertyCategory < ApplicationRecord
     has_many :properties, class_name: "Stay::Property", dependent: :nullify
-    validates :name,  presence: true, uniqueness: { case_sensitive: false }, format: { without: /\s/, message: "must contain no spaces" }
+    validates :name,  presence: true, uniqueness: { case_sensitive: false },
+    format: { without: /_/, message: "must not contain underscores" }
   end
 end

data/app/models/stay/property_type.rb

@@ -1,9 +1,9 @@
 module Stay
   class PropertyType < ApplicationRecord
-    validates :name,  presence: true, uniqueness: { case_sensitive: false }, format: { without: /\s/, error: "must contain no spaces" }
+    validates :name,  presence: true, uniqueness: { case_sensitive: false }, 
+    format: { without: /_/, message: "must not contain underscores" }
 
-
-    has_many :properties
+    has_many :properties, class_name: "Stay::Property", dependent: :nullify
     def self.ransackable_attributes(auth_object = nil)
       %w[id name created_at updated_at]
     end

data/app/serializers/property_category_serializer.rb

@@ -1,7 +1,3 @@
 class PropertyCategorySerializer < ActiveModel::Serializer
-  attributes :id, :name, :property_count
-
-  def property_count
-    object.properties.approved.active.count
-  end
+  attributes :id, :name
 end

data/app/serializers/property_serializer.rb

@@ -12,11 +12,11 @@ class PropertySerializer < ActiveModel::Serializer
   belongs_to :user
 
   def amenities
-    ActiveModelSerializers::SerializableResource.new(object.amenities.property.uniq, each_serializer: AmenitySerializer)
+    ActiveModelSerializers::SerializableResource.new(object.property_type_amenities, each_serializer: AmenitySerializer)
   end
 
   def features
-    ActiveModelSerializers::SerializableResource.new(object.features.property.uniq, each_serializer: PropertyFeatureSerializer)
+    ActiveModelSerializers::SerializableResource.new(object.property_type_features, each_serializer: PropertyFeatureSerializer)
   end
 
   def is_shared_property

data/app/serializers/property_type_serializer.rb

@@ -1,7 +1,3 @@
 class PropertyTypeSerializer < ActiveModel::Serializer
-  attributes :id, :name, :property_count
-
-  def property_count
-    object.properties.approved.active.count
-  end
+  attributes :id, :name
 end

data/app/serializers/user_serializer.rb

@@ -1,7 +1,8 @@
 class UserSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
+  
   attributes :id, :email, :first_name, :full_name, :last_name,  :phone, :gender, :is_user, :is_host, :date_of_birth,
-               :image, :whatsapp_notification, :sms_notification, :image_file_name,
+               :image, :image_file_name, :about_me, :country, :country_code
 
   def full_name
     object.full_name
@@ -23,14 +24,6 @@ class UserSerializer < ActiveModel::Serializer
     object.profile_image.url || nil
   end
 
-  def whatsapp_notification
-    object&.preferences.present? ? object&.preferences["whatsapp_notification"]: false
-  end
-
-  def sms_notification
-    object&.preferences.present? ? object&.preferences["sms_notification"]: false
-  end
-
   def image_file_name
     object.profile_image&.filename&.to_s || nil
   end

data/db/migrate/20250407101335_add_field_to_stay_users.rb

@@ -0,0 +1,7 @@
+class AddFieldToStayUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :stay_users, :country, :string
+    add_column :stay_users, :about_me, :text
+    add_column :stay_users, :country_code, :string
+  end
+end

data/lib/stay/version.rb

@@ -1,3 +1,4 @@
 module Stay
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stay_commerce
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - w3villa-vikaspal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -479,6 +479,7 @@ files:
 - app/assets/stylesheets/stay/webpixels.css
 - app/channels/chat_channel.rb
 - app/controllers/concerns/stay/booking_validations.rb
+- app/controllers/concerns/stay/image_resizer_concern.rb
 - app/controllers/concerns/stay/stripe_concern.rb
 - app/controllers/devise/api/tokens_controller.rb
 - app/controllers/stay/admin/addresses_controller.rb
@@ -935,6 +936,7 @@ files:
 - db/migrate/20241205092943_create_friendly_id_slugs.rb
 - db/migrate/20241217044817_add_deleted_atto_stay_property.rb
 - db/migrate/20241230064432_modify_property_category_on_properties.rb
+- db/migrate/20250407101335_add_field_to_stay_users.rb
 - db/seeds.rb
 - lib/stay.rb
 - lib/stay/controller_helpers/currency.rb