order reservation null issue checked

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -69,7 +69,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			order_reservation = params
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
 
-			if flag
+			if !order_reservation_id.nil? && flag
 				shop = Shop.find_by_id(1)
 				if !shop.nil?
 					shop_code = shop.shop_code
@@ -90,6 +90,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			        from = ""
 			    end
 				ActionCable.server.broadcast "order_reservation_channel",data: order_reservation,shop_code: shop_code,from:from,audio:audio
+			elsif order_reservation_id.nil? && !flag
+				result = { :status => false, :message => "Some error occurred!" }
 			else
 				result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" }
 			end

app/models/order_reservation.rb

@@ -53,6 +53,8 @@ class OrderReservation < ApplicationRecord
 		Rails.logger.debug order_reserve.to_s
 		check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference])
 		if check_order_reservation.empty?
+			OrderReservation.transaction do 
+				begin
 					order_reservation = OrderReservation.new
 					order_reservation.order_reservation_type = order_reserve[:order_type]
 					order_reservation.customer_id = order_reserve[:cus_info]
@@ -91,7 +93,14 @@ class OrderReservation < ApplicationRecord
 					if order_reserve[:delivery_info]
 						Delivery.addDeliveryInfo(order_reserve[:delivery_info],order_reservation.id)
 					end
+					
 					return order_reservation.id, true
+				rescue ActiveRecord::StatementInvalid
+					raise ActiveRecord::Rollback
+
+					return nil, false
+				end 
+			end
 		else
 			return check_order_reservation[0].id, false
 		end