stay_commerce 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0d6e7e7fd52f6bc5e4fc1cc93e67e3c25f0189e68819f5ccfd6960000f19c3
-  data.tar.gz: 30020c4ff02d737546258c180fd61ae13993381cca5889864573761c9713c3ad
+  metadata.gz: ea9bf5bd2ce5586107d49503bcbbab44973eb929e6cf58fbe762892444a437ec
+  data.tar.gz: f32e5da8fb4d2b3840efc4115ca06ebcde81cbf9bc95b8c8cb505a845a9a384a
 SHA512:
-  metadata.gz: 00070b66f223b1df2595071ce2afe1852f36c090794240a91a898bbd6edb5349149715398da5e2f80762ac032f2e9699ea1e4c89ee85a86f514402e10aa80ff0
-  data.tar.gz: c6b7951b2199d3e61d31ae9dde5482c48b915b9cfa1e8d2362ae4a48b934c77c82e7413f7f8aaf00249fa9c5dadb6f2caf7a869da5d04dba3d428b3c2ec9b2b8
+  metadata.gz: 7f48289085a2aa3f9156d871ae5d6e76631a2c1dd25f90ca735bf84f51fe9f21cdfdd4d71cc959b23a85f18de45bef2a27130db01268967cd4c826fec3bbd4dc
+  data.tar.gz: 9eee63d5b3ed3c65c4a672e3ad97c2c7a43828de56b4b6a855497f803ad4445768bdfd75a7521d9b7728b10374b3fa55f4b96b5edf1d31cefce5808ca0e38b5f

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

@@ -6,7 +6,7 @@ module Stay
       extend ActiveSupport::Concern
 
       included do
-        Stripe.api_key = Rails.configuration.stripe[:secret_key]
+       Stripe.api_key = ENV["STRIPE_SECRECT_KEY"]
       end
 
       def user

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

@@ -43,40 +43,36 @@ class Stay::Api::V1::BookingsController < Stay::BaseApiController
   end
 
   def host_booking
-    begin
-      page = params[:page].to_i > 0 ? params[:page].to_i : 1
-      per_page = params[:per_page].to_i > 0 ? params[:per_page].to_i : 10
-
-      cumulative_per_page = page * per_page
-      @request =  Stay::Booking.joins(:property).where(stay_properties: { user_id: current_devise_api_user&.id }).confirmed
-      @bookings = @request.order(created_at: :desc).limit(cumulative_per_page)
-
-      total_count = @request.count
-      total_pages = (total_count.to_f / per_page).ceil
-
-      if @bookings.empty?
-        return render json: { error: "No bookings found", bookings: [], success: false }, status: :ok
-      end
-
-      render json: {
-        data: "Bookings Found",
-        bookings: ActiveModelSerializers::SerializableResource.new(@bookings, each_serializer: BookingSerializer),
-        success: true,
-        meta: {
-          total_pages: total_pages,
-          current_page: page,
-          next_page: page < total_pages ? page + 1 : nil,
-          prev_page: page > 1 ? page - 1 : nil,
-          total_count: total_count
-        }
-      }, status: :ok
-    rescue ActiveRecord::RecordNotFound => e
-      render json: { success: false, error: "Bookings not found", message: e.message }, status: :not_found
-    rescue ArgumentError => e
-      render json: { success: false, error: "Invalid pagination parameters", message: e.message }, status: :bad_request
-    rescue StandardError => e
-      render json: { success: false, error: "Internal server error", message: e.message }, status: :internal_server_error
-    end
+          begin
+            page = params[:page].to_i > 0 ? params[:page].to_i : 1
+
+            @bookings =  Stay::Booking.current_host_booking(current_devise_api_user).confirmed
+            @bookings = @bookings.joins(:property).where("stay_properties.title ILIKE ?", "%#{params[:q]}%") if params[:q].present?
+            @bookings = @bookings.order(updated_at: :desc).page(page).per(10)
+
+            if @bookings.empty?
+              return render json: { error: "No bookings found", bookings: [], success: false }, status: :ok
+            end
+
+            render json: {
+              data: "Bookings Found",
+              bookings: ActiveModelSerializers::SerializableResource.new(@bookings, each_serializer: BookingListingSerializer),
+              success: true,
+              meta: {
+                total_pages: @bookings.total_pages,
+                current_page: @bookings.current_page,
+                next_page: @bookings.next_page,
+                prev_page: @bookings.prev_page,
+                total_count: @bookings.total_count
+              }
+            }, status: :ok
+          rescue ActiveRecord::RecordNotFound => e
+            render json: { success: false, error: "Bookings not found", message: e.message }, status: :not_found
+          rescue ArgumentError => e
+            render json: { success: false, error: "Invalid pagination parameters", message: e.message }, status: :bad_request
+          rescue StandardError => e
+            render json: { success: false, error: "Internal server error", message: e.message }, status: :internal_server_error
+          end
   end
 
   def host_request
@@ -97,7 +93,7 @@ class Stay::Api::V1::BookingsController < Stay::BaseApiController
 
       render json: {
         data: "Bookings Found",
-        bookings: ActiveModelSerializers::SerializableResource.new(@bookings, each_serializer: BookingSerializer),
+        bookings: ActiveModelSerializers::SerializableResource.new(@bookings, each_serializer: BookingListingSerializer),
         success: true,
         meta: {
           total_pages: total_pages,

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

@@ -21,7 +21,7 @@ class Stay::Api::V1::ProfilesController < Stay::BaseApiController
     end
 
     def profile_params
-      params.require(:profile).permit(:first_name, :last_name, :phone, :date_of_birth, :gender, :profile_image )
+      params.require(:profile).permit(:first_name, :last_name, :phone, :date_of_birth, :gender, :profile_image, :about_me )
     end
     
 end

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

@@ -200,7 +200,7 @@ class Stay::Api::V1::PropertiesController < Stay::BaseApiController
                                         property_house_rules_attributes: [ :id, :house_rule_id, :value, :_destroy ],
                                         property_amenities_attributes: [ :id, :amenity_id, :_destroy ],
                                         property_features_attributes: [ :id, :name, :feature_id, :_destroy ],
-                                        rooms_attributes: [ :id, :max_guests, :price_per_month, :status, :booking_start, :booking_end, :description, :size, :bed_type_id, :room_type_id,  :_destroy, room_images: [],
+                                        rooms_attributes: [ :id, :name, :max_guests, :price_per_month, :status, :booking_start, :booking_end, :description, :size, :bed_type_id, :room_type_id,  :_destroy, room_images: [],
                                           room_features_attributes: [ :id, :feature_id, :_destroy ],
                                           room_amenities_attributes: [ :id, :amenity_id, :_destroy ]
                                         ],

data/app/models/stay/booking.rb

@@ -19,6 +19,9 @@ module Stay
     scope :incomplete, -> { where(completed_at: nil).where(payment_state: [ "failed", nil ]).where.not(status: :canceled) }
     scope :not_canceled, -> { where.not(status: "canceled") }
     scope :confirmed, -> { where(status: "confirmed").where(payment_state: "paid") }
+    scope :current_host_booking, ->(host)  {
+          joins(:property).where(stay_properties: { user: host })
+        }
 
     after_commit :booking_completed_at
     before_create :link_by_email, :generate_number

data/app/models/stay/user.rb

@@ -5,6 +5,9 @@ module Stay
     devise :database_authenticatable, :registerable,
            :recoverable, :rememberable, :validatable, :api
 
+
+    Stripe.api_key = ENV["STRIPES_SECRECT_KEY"]
+
     has_many :role_users, class_name: "Stay::RoleUser", dependent: :destroy
     has_many :stay_roles, through: :role_users, class_name: "Stay::Role", source: :role
     has_many :bookings
@@ -35,8 +38,7 @@ module Stay
 
     # callbacks
     after_create :welcome_email
-    # after_create :assign_default_role
-    # after_create :admin_host_email
+    after_create :create_stripe_account
 
     attr_accessor :updating_password
 
@@ -106,5 +108,23 @@ module Stay
     def assign_default_role
       Stay::RoleUser.create(user: self, role: Stay::Role.where(name: Stay::Role::USER).first_or_create) unless stay_roles.exists?
     end
+
+    def create_stripe_account
+      user = self
+      customer =  Stripe::Customer.create({
+          email: user.email,
+          name: "#{user&.first_name} #{user&.last_name}",
+          address: {
+            city: user&.addresses&.last&.city,
+            state: user&.addresses&.last&.state&.name,
+            country: user&.addresses&.last&.country&.name,
+            line1: user&.addresses&.last&.address1,
+            line2: user&.addresses&.last&.address2,
+            postal_code: user&.addresses&.last&.zipcode
+          },
+        })
+        user.update(stripe_customer_id: customer.id)
+      
+    end
   end
 end

data/app/serializers/booking_listing_serializer.rb

@@ -0,0 +1,64 @@
+class BookingListingSerializer < ActiveModel::Serializer
+  attributes :id, :number, :total, :total_amount, :check_in_date, :check_out_date, :item_total, :is_shared_property, :booked_room, :room_images,
+  :number_of_guests, :payment_state, :status, :request_by, :invoice_no, :calculate_cleaning_fee, :calculate_city_fee, :extra_guest_amount, :property
+
+
+  def total
+    object.total_amount
+  end
+
+  def property
+    property =  object.property
+
+    {
+      id: property.id,
+      title: property.title,
+      price_per_month: property.price_per_month,
+      city: property.city,
+      state: property.state,
+      slug: property.slug,
+      rooms_count:property.rooms.count,
+    }
+  end
+
+  def room_images
+    object.rooms.last.room_images.map(&:url).compact
+  end
+
+  def is_shared_property
+    object.property&.shared_property
+  end
+
+  def booked_room
+    object.line_items.any? ?  object.line_items.last.room&.name : nil
+  end
+
+  def calculate_cleaning_fee
+    nil #  object.property.cleaning_fee
+  end
+
+  def calculate_city_fee
+   nil # object.property.city_fee
+  end
+
+  def extra_guest_amount
+    object.extra_guest_amount
+  end
+
+  def check_in_date
+    object.check_in_date.strftime("%B %d, %Y")
+  end
+
+  def check_out_date
+    object.check_out_date.strftime("%B %d, %Y")
+  end
+
+  def request_by
+    object.user&.full_name || nil
+  end
+
+  def invoice_no
+    object.invoice ? object.invoice.id : nil
+  end
+
+end

data/app/serializers/booking_serializer.rb

@@ -1,6 +1,6 @@
 class BookingSerializer < ActiveModel::Serializer
   attributes  :id, :number, :calculate_totals, :tax_total, :total, :total_amount, :item_total, :room_count, :check_in_date, :check_out_date,
-              :number_of_guests, :completed_at, :payment_state, :calculate_city_fee, :calculate_cleaning_fee, :status, :invoice_total, :extra_guest_amount, :last_five_messages
+              :number_of_guests, :completed_at, :payment_state, :calculate_city_fee, :calculate_cleaning_fee, :status, :invoice_total, :extra_guest_amount, :last_five_messages , :property_user
   belongs_to :property, serializer: PropertyListingSerializer
   belongs_to :user,  serializer: UserListingSerializer
   has_many :line_items, serializer: LineItemSerializer
@@ -40,6 +40,10 @@ class BookingSerializer < ActiveModel::Serializer
     object.extra_guest_amount
   end
 
+  def property_user
+    object.property.user.present? ? UserListingSerializer.new(object.property.user) : nil
+  end
+
   def invoice_total
     object.invoice&.total
   end

data/app/serializers/property_listing_serializer.rb

@@ -1,7 +1,7 @@
 class PropertyListingSerializer < ActiveModel::Serializer
   attributes :id, :title, :price_per_month, :place_images, :total_rooms,
               :availability_end, :availability_start, :extra_guest, :latitude,
-              :longitude, :address, :city, :state, :country, :active, :property_state, :slug
+              :longitude, :address, :city, :state, :country, :active, :property_state, :slug ,:description
 
   belongs_to :property_category, Serializer: :PropertyCategorySerializer
   belongs_to :property_type, Serializer: :PropertyTypeSerializer

data/lib/stay/version.rb

@@ -1,3 +1,3 @@
 module Stay
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stay_commerce
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - w3villa-vikaspal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -620,6 +620,7 @@ files:
 - app/serializers/amenity_category_serializer.rb
 - app/serializers/amenity_serializer.rb
 - app/serializers/bed_type_serializer.rb
+- app/serializers/booking_listing_serializer.rb
 - app/serializers/booking_query_serializer.rb
 - app/serializers/booking_serializer.rb
 - app/serializers/cancellation_policy_serializer.rb