spree_cm_commissioner 2.1.9.pre.pre2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab72ce6c6d29366df93dc2df11c7ee0962ee514380213823f16de19dd2b245b6
-  data.tar.gz: 37cb94bd2a38f5001204a5d5c50af10749269112738f6e5d213fd5c302aaab60
+  metadata.gz: 03b6ceb6f610d931285c1edb4bf699bb82098cb042c7a675a7cf4ca97d20c2d1
+  data.tar.gz: 7e4a0b523320e28f397556545a5c912a3efc9418c993a3dcc06c403a6d1b64b0
 SHA512:
-  metadata.gz: fabf0f79539543ce41d8fdca27990d5d0b5ccff8af6ae39539c3aefb9d0b474fb0835b60f475db2d89f103b42626560d9d602936352a8b3f9c22de9743094fba
-  data.tar.gz: efa133c49dff021c1abf6e0a56aca72a1998e3e5d2fd30da27649675f348533d19ccf43d0fe8cb56fdf682f7e01ec40b291efb6897df3e2863f850f464a7453c
+  metadata.gz: 0a01870d81ac4d66b2c931b49552891ca2167257d0ae83956b7748af60d6c17b17bacd6d444a32b87b12d1db722451e3fc3c374eb108f45dc454ab3648f57b7a
+  data.tar.gz: 11efa1fc32c865d667bd37e2753b79d6971b923c4fc0ffa9e463c7b17a0e3ccf5cfb211b84aa97fe4d8554ff4542ec1cc36483c45ca578ef57e5ba7e863c73a8

data/.gitignore

@@ -30,3 +30,6 @@ node_modules
 !.vscode/.settings.json
 .env
 vendor/bundle/
+
+# Cursor
+.cursor

data/.tool-versions

@@ -1 +1 @@
-ruby 3.2.0
+ruby 3.3.5

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.1.9.pre.pre2)
+    spree_cm_commissioner (2.2.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -69,6 +69,7 @@ PATH
       spree_api_v1 (>= 4.5.0)
       spree_auth_devise (>= 4.5.0)
       spree_backend (>= 4.5.0)
+      spree_emails (>= 4.5.0)
       spree_extension
       spree_multi_vendor (>= 2.4.1)
       spree_vpago

data/app/controllers/spree/admin/users_controller_decorator.rb

@@ -9,6 +9,8 @@ module Spree
       def create
         @user = Spree.user_class.new(user_params)
         @user.assigned_roles = Spree::Role.where(id: params.dig(:user, :spree_role_ids)).pluck(:name) if params.dig(:user, :spree_role_ids)
+        @user.confirmed_at = Time.zone.now
+        @user.registered_by = :system_registered
 
         if @user.save
           flash[:success] = flash_message_for(@user, :successfully_created)

data/app/controllers/spree/api/v2/storefront/account/guest_dynamic_fields_controller.rb

@@ -22,7 +22,7 @@ module Spree
 
               ActiveRecord::Base.transaction do
                 fields.each do |field|
-                  process_dynamic_field(field, phase)
+                  process_dynamic_field(field)
                 end
 
                 @guest.save_and_move_to_next_stage
@@ -52,11 +52,9 @@ module Spree
               end
             end
 
-            def process_dynamic_field(field, phase)
+            def process_dynamic_field(field)
               dynamic_field = SpreeCmCommissioner::DynamicField.find(field[:id])
-              guest_field = @guest.guest_dynamic_fields.find_or_initialize_by(dynamic_field_id: dynamic_field.id)
-
-              return if guest_field.new_record? && dynamic_field.data_fill_stage != phase
+              guest_field = @guest.guest_dynamic_fields.build(dynamic_field_id: dynamic_field.id)
 
               if dynamic_field.requires_dynamic_field_options?
                 option = dynamic_field.dynamic_field_options.find_by(value: field[:value])

data/app/controllers/spree/api/v2/storefront/account/mark_guest_info_complete_controller.rb

@@ -7,18 +7,13 @@ module Spree
             before_action :require_spree_current_user
 
             def update
-              update_user_metadata
-              render_success_response
+              SpreeCmCommissioner::Users::IncompleteGuestCheckerService.new(spree_current_user).call
+              render_success
             end
 
             private
 
-            def update_user_metadata
-              spree_current_user.public_metadata['has_incomplete_guest_info'] = false
-              spree_current_user.save!
-            end
-
-            def render_success_response
+            def render_success
               render_serialized_payload(200) do
                 {
                   success: true,

data/app/controllers/spree/api/v2/storefront/guests_controller.rb

@@ -5,8 +5,8 @@ module Spree
         class GuestsController < ::Spree::Api::V2::ResourceController
           include OrderConcern
 
-          # raise 404 when no order
-          before_action :ensure_order
+          # raise 404 when no order, except for show
+          before_action :ensure_order, except: [:show]
 
           # override
           def model_class
@@ -23,6 +23,11 @@ module Spree
             SpreeCmCommissioner::V2::Storefront::GuestSerializer
           end
 
+          def show
+            @guest = SpreeCmCommissioner::Guest.find(params[:id])
+            render_serialized_payload { serialize_resource(@guest) }
+          end
+
           def create
             spree_authorize! :update, spree_current_order, order_token
 
@@ -90,22 +95,15 @@ module Spree
           end
 
           def process_dynamic_fields(dynamic_fields_attributes)
-            dynamic_fields_attributes.each do |attr|
-              if attr[:_destroy] == '1' && attr[:id].present?
-                field = resource.guest_dynamic_fields.find_by(id: attr[:id])
-                field&.destroy!
-              elsif attr[:id].present?
-                field = resource.guest_dynamic_fields.find_by(id: attr[:id])
-                if field
-                  field.assign_attributes(attr.except(:id, :_destroy))
-                  associate_dynamic_field_option(field) if field.dynamic_field.present?
-                  field.save!
-                end
-              else
-                field = resource.guest_dynamic_fields.build(attr.except(:id, :_destroy))
-                associate_dynamic_field_option(field) if field.dynamic_field.present?
-                field.save!
+            dynamic_fields_attributes.each do |raw_attributes|
+              attributes = raw_attributes.to_h.symbolize_keys
+
+              if ActiveModel::Type::Boolean.new.cast(attributes[:_destroy])
+                destroy_guest_dynamic_field(attributes[:id])
+                next
               end
+
+              upsert_guest_dynamic_field(attributes)
             end
           end
 
@@ -113,7 +111,28 @@ module Spree
             return unless field.dynamic_field&.requires_dynamic_field_options?
 
             option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-            field.dynamic_field_option = option if option
+            field.dynamic_field_option = option
+          end
+
+          def destroy_guest_dynamic_field(id)
+            return if id.blank?
+
+            resource.guest_dynamic_fields.find(id).destroy!
+          end
+
+          def upsert_guest_dynamic_field(attributes)
+            field = find_or_initialize_guest_dynamic_field(attributes)
+            field.assign_attributes(attributes.except(:id, :_destroy))
+            associate_dynamic_field_option(field) if field.dynamic_field.present?
+            field.save!
+          end
+
+          def find_or_initialize_guest_dynamic_field(attributes)
+            if attributes[:id].present?
+              resource.guest_dynamic_fields.find(attributes[:id])
+            else
+              resource.guest_dynamic_fields.find_or_initialize_by(dynamic_field_id: attributes[:dynamic_field_id])
+            end
           end
         end
       end

data/app/interactors/spree_cm_commissioner/account_recover.rb

@@ -8,8 +8,8 @@ module SpreeCmCommissioner
     end
 
     def recover_user
-      updated = context.user.update(account_deletion_at: nil, account_restored_at: Time.current)
-      context.fail!(message: user.errors.full_messages.to_sentence) unless updated
+      updated = context.user.update(account_deletion_at: nil, account_restored_at: Time.current, confirmed_at: Time.current)
+      context.fail!(message: context.user.errors.full_messages.to_sentence) unless updated
     end
 
     def validate_user

data/app/interactors/spree_cm_commissioner/guest_dynamic_field_notification_sender.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class GuestDynamicFieldNotificationSender < BaseInteractor
+    def call
+      notification = SpreeCmCommissioner::GuestDynamicFieldNotification.with(
+        guest: context.guest
+      ).deliver_later(context.guest.user)
+
+      context.notification = notification
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/notification_reader.rb

@@ -15,7 +15,9 @@ module SpreeCmCommissioner
     end
 
     def read_all_user_unread_notifications
-      user.notifications.unread_notifications.mark_as_read!
+      # mark all unread notifications accept type 'guest_dynamic_field_notification'
+      # due to it requires user to fill info before mark as read
+      user.notifications.markable_notifications.mark_as_read!
     end
   end
 end

data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb

@@ -35,7 +35,7 @@ module SpreeCmCommissioner
       end
 
       def clear_inventory_cache
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.del(inventory_item.redis_key)
         end
       end

data/app/interactors/spree_cm_commissioner/team_member_adder.rb

@@ -0,0 +1,37 @@
+module SpreeCmCommissioner
+  class TeamMemberAdder < BaseInteractor
+    delegate :user_id, :role_ids, :branch_ids, :vendor, :inviter, :service_type, to: :context
+
+    def call
+      find_user
+      assign_user_to_vendor
+      set_success_message
+    end
+
+    private
+
+    def find_user
+      context.user = Spree::User.find_by(id: user_id)
+
+      return if context.user
+
+      context.fail!(
+        message: I18n.t('views.manage_team.add.user_not_found')
+      )
+    end
+
+    def assign_user_to_vendor
+      SpreeCmCommissioner::UserVendorAssigner.call(
+        user: context.user,
+        role_ids: role_ids,
+        branch_ids: branch_ids,
+        vendor: vendor,
+        service_type: service_type
+      )
+    end
+
+    def set_success_message
+      context.success_message = I18n.t('views.manage_team.add.user_assigned_successfully')
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/team_member_creator.rb

@@ -0,0 +1,58 @@
+module SpreeCmCommissioner
+  class TeamMemberCreator < BaseInteractor
+    delegate :email, :first_name, :last_name, :password, :role_ids, :branch_ids, :vendor, :inviter, :service_type, to: :context
+
+    def call
+      create_user
+      assign_user_to_vendor
+      set_success_message
+    end
+
+    private
+
+    def create_user
+      existing_user = Spree::User.find_by(email: normalized_email)
+      if existing_user.present?
+        context.fail!(
+          message: I18n.t('views.manage_team.create.user_already_exists'),
+          user: existing_user
+        )
+      end
+
+      context.user = Spree::User.new(
+        email: normalized_email,
+        first_name: first_name,
+        last_name: last_name,
+        password: password,
+        password_confirmation: password,
+        registered_by: :system_registered,
+        primary_service_type: service_type
+      )
+
+      return if context.user.save
+
+      context.fail!(
+        message: context.user.errors.full_messages.to_sentence,
+        user: context.user
+      )
+    end
+
+    def assign_user_to_vendor
+      SpreeCmCommissioner::UserVendorAssigner.call(
+        user: context.user,
+        role_ids: role_ids,
+        branch_ids: branch_ids,
+        vendor: vendor,
+        service_type: service_type
+      )
+    end
+
+    def set_success_message
+      context.success_message = I18n.t('views.manage_team.create.success')
+    end
+
+    def normalized_email
+      @normalized_email ||= email&.strip&.downcase
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb

@@ -40,6 +40,10 @@ module SpreeCmCommissioner
         inbound_qty = inbound_line_items.sum(&:quantity)
 
         raise StandardError, 'Outbound & inbound line item quantities do not match' if inbound_line_items.any? && outbound_qty != inbound_qty
+
+        trip_ids = (outbound_legs.map(&:trip_id) + inbound_legs.map(&:trip_id)).uniq
+        order.preload_trip_ids = trip_ids
+
         raise StandardError, order.errors.full_messages.to_sentence unless order.save
 
         order.update_with_updater!

data/app/interactors/spree_cm_commissioner/trip_clone_creator.rb

@@ -1,4 +1,3 @@
-# TODO: fix this to remove variant block related code as we already drop the table.
 module SpreeCmCommissioner
   class TripCloneCreator < BaseInteractor
     delegate :vendor, :params, :original_trip, :places, :current_store, :current_vendor, to: :context
@@ -26,6 +25,7 @@ module SpreeCmCommissioner
       return nil unless original_product
 
       cloned_product = duplicate_product(original_product)
+      cloned_product.short_name = "Copy of #{original_product.short_name}"
       assign_vendor_attributes(cloned_product)
 
       cloned_product.save!
@@ -110,35 +110,16 @@ module SpreeCmCommissioner
     # Clone Variants
     def clone_variants(original_trip, cloned_trip)
       original_trip.product.variants.each do |variant|
-        new_variant = cloned_trip.product.variants.create!(
+        cloned_trip.product.variants.create!(
           price: variant.price,
           option_value_ids: variant.option_value_ids,
           sku: ''
         )
-        clone_variant_blocks(variant, new_variant)
       end
     rescue StandardError => e
       raise StandardError, "Failed to clone variants: #{e.message}"
     end
 
-    # clone variant_block (seat)
-    def clone_variant_blocks(origin_variant, new_variant)
-      block_data = {
-        block_ids: origin_variant.block_ids || []
-      }
-
-      context = SpreeCmCommissioner::VariantBlockUpdater.call(
-        variant: new_variant,
-        current_store: current_store,
-        data: block_data,
-        stock_location: current_vendor.stock_locations.first
-      )
-
-      raise StandardError, "Failed to update variant blocks: #{context.message}" unless context.success?
-    rescue StandardError => e
-      raise StandardError, "Failed to clone variant blocks: #{e.message}"
-    end
-
     # Helpers
     def departure_time_from_stops(trip)
       first_departure = trip.trip_stops.first&.departure_time

data/app/interactors/spree_cm_commissioner/user_password_authenticator.rb

@@ -6,7 +6,7 @@ module SpreeCmCommissioner
       context.user = Spree.user_class.find_user_by_login(login, tenant_id)
       context.fail!(message: I18n.t('authenticator.incorrect_login')) if context.user.nil?
 
-      if spree_confirmable? && active_for_authentication? && !validate_password(user)
+      if spree_confirmable? && active_for_authentication? && !validate_password(context.user)
         context.fail!(message: I18n.t('authenticator.incorrect_password'))
       end
 
@@ -25,7 +25,7 @@ module SpreeCmCommissioner
     end
 
     def active_for_authentication?
-      user.active_for_authentication?
+      context.user.active_for_authentication?
     end
   end
 end

data/app/interactors/spree_cm_commissioner/user_registration_with_fb_token.rb

@@ -24,7 +24,7 @@ module SpreeCmCommissioner
       # Flag as social network registration to skip presence validation for email, login, phone_number, and user_identity_providers
       # Other validations (uniqueness, format) still run if present
       user.registering_via_social_network = true
-
+      user.confirmed_at = Time.zone.now
       if user.save
         context.user = user
       else

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -21,7 +21,7 @@ module SpreeCmCommissioner
         tenant_id: context.tenant_id,
         **name_attributes(name)
       )
-
+      user.confirmed_at = Time.zone.now
       if user.save(validate: false)
         context.user = user
       else

data/app/interactors/spree_cm_commissioner/user_telegram_web_app_authenticator.rb

@@ -25,6 +25,8 @@ module SpreeCmCommissioner
           u.user_identity_providers = [identity]
         end
 
+        user.confirmed_at = Time.zone.now
+
         user.save!
         user
       else

data/app/interactors/spree_cm_commissioner/user_vendor_assigner.rb

@@ -0,0 +1,39 @@
+module SpreeCmCommissioner
+  class UserVendorAssigner < BaseInteractor
+    delegate :user, :role_ids, :branch_ids, :vendor, :service_type, to: :context
+
+    def call
+      assign_roles_to_user
+      assign_branches_to_user if should_assign_branches?
+    end
+
+    private
+
+    def assign_roles_to_user
+      SpreeCmCommissioner::UserRolesAssigner.create(
+        user_id: user.id,
+        role_ids: role_ids,
+        vendor_id: vendor.id
+      )
+    end
+
+    def should_assign_branches?
+      (service_type == 'transit' || service_type == 'intercity_taxi') && branch_ids.present?
+    end
+
+    def assign_branches_to_user
+      cleaned_ids = Array(branch_ids).compact_blank.map(&:to_i)
+
+      return unless cleaned_ids.any?
+
+      valid_branch_ids = SpreeCmCommissioner::VendorPlace
+                         .where(id: cleaned_ids, vendor_id: vendor.id, place_type: :branch)
+                         .pluck(:id)
+
+      return unless valid_branch_ids.any?
+
+      user.branch_ids = valid_branch_ids
+      user.save
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -92,6 +92,8 @@ module SpreeCmCommissioner
         user_identity_providers: [identity]
       )
 
+      context.user.confirmed_at = Time.zone.now
+
       return if context.user.save
 
       context.fail!(message: "User creation failed: #{context.user.errors.full_messages.join(', ')}")

data/app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteFulfilledOrderCountIncrementerJob < ApplicationUniqueJob
+      def perform(order_id:)
+        order = Spree::Order.find(order_id)
+        SpreeCmCommissioner::Transit::RouteFulfilledOrderCountIncrementerService.call(order: order)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteOrderCountIncrementerJob < ApplicationUniqueJob
+      def perform(order_id:)
+        order = Spree::Order.find(order_id)
+        SpreeCmCommissioner::Transit::RouteOrderCountIncrementerService.call(order: order)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb

@@ -0,0 +1,13 @@
+# Perform the previous-route decrement outside the Trip transaction.
+
+module SpreeCmCommissioner
+  module Transit
+    class RoutePreviousTripCountDecrementerJob < ApplicationUniqueJob
+      queue_as :default
+
+      def perform(previous_route_id:)
+        SpreeCmCommissioner::Transit::RoutePreviousTripCountDecrementerService.call(previous_route_id: previous_route_id)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteTripCountDecrementerJob < ApplicationUniqueJob
+      def perform(trip_id:)
+        trip = SpreeCmCommissioner::Trip.find(trip_id)
+        SpreeCmCommissioner::Transit::RouteTripCountDecrementerService.call(trip: trip)
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteTripCountIncrementerJob < ApplicationUniqueJob
+      def perform(trip_id:)
+        trip = SpreeCmCommissioner::Trip.find(trip_id)
+        SpreeCmCommissioner::Transit::RouteTripCountIncrementerService.call(trip: trip)
+      end
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -26,6 +26,8 @@ module SpreeCmCommissioner
       state_machine.after_transition to: :canceled, do: :precalculate_conversion
       state_machine.after_transition to: :canceled, do: :restock_inventory!
 
+      state_machine.after_transition to: :complete, do: :increment_route_fulfilled_order_count
+
       scope :accepted, -> { where(request_state: 'accepted') }
 
       scope :filter_by_request_state, lambda {
@@ -77,6 +79,16 @@ module SpreeCmCommissioner
     def mark_user_as_has_incomplete_guest_info
       user&.public_metadata&.[]=('has_incomplete_guest_info', true)
       user&.save!
+
+      line_items.each do |line_item|
+        line_item.guests.each do |guest|
+          guest.user ||= user
+          guest.save!(validate: false) if guest.changed?
+          guest.save_and_move_to_next_stage
+          # send notification only for guests that still have incomplete dynamic fields
+          SpreeCmCommissioner::GuestDynamicFieldNotificationSender.call(guest: guest) if guest_incomplete?(guest)
+        end
+      end
     end
 
     def has_incomplete_guest_info? # rubocop:disable Naming/PredicateName

data/app/models/concerns/spree_cm_commissioner/route_order_countable.rb

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  module RouteOrderCountable
+    def should_update_count?
+      preload_trip_ids.any?
+    end
+
+    def increment_route_fulfilled_order_count
+      return unless should_update_count?
+
+      SpreeCmCommissioner::Transit::RouteFulfilledOrderCountIncrementerJob.perform_later(order_id: id)
+    end
+
+    def increment_route_order_count
+      return unless should_update_count?
+
+      SpreeCmCommissioner::Transit::RouteOrderCountIncrementerJob.perform_later(order_id: id)
+    end
+
+    # Calling `.trip_ids` directly can cause many slow database queries (N+1 problem)
+    # every time `.should_update_trip_ids?` or `.preload_trip_ids` runs.
+    # To avoid this, we store a precomputed list of trip IDs in `private_metadata`.
+    def preload_trip_ids=(preload_trip_ids = [])
+      self.private_metadata = (private_metadata || {}).merge('preload_trip_ids' => preload_trip_ids)
+    end
+
+    def preload_trip_ids
+      private_metadata&.fetch('preload_trip_ids', []) || []
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/route_trip_count_callbacks.rb

@@ -0,0 +1,48 @@
+module SpreeCmCommissioner
+  module RouteTripCountCallbacks
+    extend ActiveSupport::Concern
+
+    included do
+      after_create :increase_trip_count
+      before_destroy :decrease_trip_count
+
+      # When route context may change, enqueue an async job after commit that
+      # reads the previous values from `previous_changes` to decrement counts
+      # on the old route/vendor. This avoids keeping in-memory state and keeps
+      # the Trip update fast.
+      after_commit :enqueue_decrement_previous_route_trip_counts, on: :update
+
+      after_commit :increment_new_route_trip_counts, on: :update, if: :changed_route_context?
+    end
+
+    private
+
+    def decrease_trip_count
+      SpreeCmCommissioner::Transit::RouteTripCountDecrementerJob.perform_now(trip_id: id)
+    end
+
+    def increase_trip_count
+      SpreeCmCommissioner::Transit::RouteTripCountIncrementerJob.perform_later(trip_id: id)
+    end
+
+    # Read previous_changes to find prior route context and enqueue the job.
+    def enqueue_decrement_previous_route_trip_counts
+      prev_route_id = previous_changes['route_id']&.first
+      prev_origin_id = previous_changes['origin_place_id']&.first
+      prev_destination_id = previous_changes['destination_place_id']&.first
+
+      return unless prev_route_id.present? && prev_origin_id.present? && prev_destination_id.present?
+
+      SpreeCmCommissioner::Transit::RoutePreviousTripCountDecrementerJob.perform_later(
+        previous_route_id: prev_route_id
+      )
+    end
+
+    # Safely increment the trip_count for the trip's (new) route after update.
+    def increment_new_route_trip_counts
+      return if origin_place_id.blank? || destination_place_id.blank? || route_id.blank?
+
+      SpreeCmCommissioner::Transit::RouteTripCountIncrementerJob.perform_later(trip_id: id)
+    end
+  end
+end