bscf-core 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9091179ddd6b5467cb508e9e13113862634c6998a37e2ab21c2c3f8996e0dab
-  data.tar.gz: ca42d422f4010c9d7b33224473d51a851278279d0d3ee187953ff006cd574408
+  metadata.gz: c14a03202265c747f95062f12f60fc41e2e5bebc1caa9946bf985b99d7abab7e
+  data.tar.gz: 116fb2ffdbd99d4bb5f83b1c93d9bf7bf9c24a08c37810a9136daf9d45d49ee8
 SHA512:
-  metadata.gz: 0b4984aaf8346536cd327b7634f155fe9e662617d305a81834757244135401c2828058dbb2efa90a1f1170763e221709dab06f7872e7d5d3205af21cd71fda25
-  data.tar.gz: eee5c0f1a25803c43d22fb150de511e31196118cfb859b25c5593144e464ea70a9308b50b12c47104c6c82504482dc6a932ee56dc886306023a49dbd1e098fc5
+  metadata.gz: fd3edce59b7a9601f74161fc59ae5c7b0b557be5c5091663194fee7fec6ac95bcd61b107dfcb985c36d676e7bf57bb4df52b2858c60e0cd819da30ae709c1432
+  data.tar.gz: fddfacc1d22e9fcec199d9b65c159952b966a878d14068e4630c3d631e284df8e2d3d42dc7c701d4246bdb1b505f6f68caecea8753425e6f060bbd49e13639f7

data/app/controllers/concerns/bscf/core/authenticable.rb

@@ -0,0 +1,39 @@
+module Bscf
+  module Core
+    module Authenticable
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :is_authenticated
+      end
+
+      private
+
+      def is_authenticated
+        render json: { error: "Not authenticated" }, status: :unauthorized unless current_user
+      end
+
+      def current_user
+        return @current_user if defined?(@current_user)
+
+        return unless auth_token
+
+        begin
+          payload = TokenService.new.decode(auth_token)
+          @current_user = User.find_by(id: payload["user"]["id"])
+        rescue JWT::DecodeError => e
+          Rails.logger.warn "Token decode error: #{e.message}"
+          nil
+        rescue ActiveRecord::RecordNotFound => e
+          Rails.logger.warn "User not found: #{e.message}"
+          nil
+        end
+      end
+
+      def auth_token
+        auth_header = request.headers["Authorization"]
+        auth_header&.split(" ")&.last
+      end
+    end
+  end
+end

data/app/models/bscf/core/delivery_order.rb

@@ -37,10 +37,10 @@ module Bscf
         return nil unless pickup_address&.coordinates.present?
 
         # Get all delivery order items with dropoff addresses
-        items_with_dropoffs = delivery_order_items.includes(:dropoff_address)
-                                                  .where.not(dropoff_address: nil)
+        items_with_dropoffs = orders.includes(:drop_off_address)
+                                                  .where.not(drop_off_address: nil)
 
-        dropoff_addresses = items_with_dropoffs.map(&:dropoff_address).compact.uniq
+        dropoff_addresses = items_with_dropoffs.map(&:drop_off_address).compact.uniq
         return nil if dropoff_addresses.empty?
 
         # Check if all dropoff addresses have coordinates
@@ -51,7 +51,7 @@ module Bscf
         route_data = gebeta_service.optimize_route(pickup_address, dropoff_addresses)
 
         # Return nil if route_data is empty or doesn't have waypoints
-        return nil if route_data.blank? || !route_data.key?("waypoints")
+        return nil if route_data.blank? || !route_data.key?("directions")
 
         # Cache the result if needed
         # Rails.cache.write("delivery_order_route_#{id}", route_data, expires_in: 1.hour)

data/config/initializers/bullet.rb

@@ -0,0 +1,8 @@
+if defined?(Bullet)
+  Bullet.enable = true
+  Bullet.alert = true
+  Bullet.bullet_logger = true
+  Bullet.console = true
+  Bullet.rails_logger = true
+  Bullet.add_footer = true
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.4.8"
+    VERSION = "0.4.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Asrat
@@ -284,6 +284,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/bscf/core/application_controller.rb
+- app/controllers/concerns/bscf/core/authenticable.rb
 - app/jobs/bscf/core/application_job.rb
 - app/mailers/bscf/core/application_mailer.rb
 - app/models/bscf/core/address.rb
@@ -317,6 +318,7 @@ files:
 - app/services/bscf/core/token_service.rb
 - app/services/bscf/core/transaction_service.rb
 - config/database.yml
+- config/initializers/bullet.rb
 - config/routes.rb
 - db/migrate/20250326065606_create_bscf_core_users.rb
 - db/migrate/20250326075111_create_bscf_core_roles.rb