spree_cm_commissioner 2.1.9.pre.pre2 → 2.2.0

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

@@ -0,0 +1,35 @@
+# ServiceType concern provides enum functionality for service type fields with I18n support.
+#
+# How to use:
+#   class YourModel < ApplicationRecord
+#     include SpreeCmCommissioner::ServiceType
+#
+#     service_type_enum :service_type
+#     service_type_enum :primary_service_type
+#   end
+module SpreeCmCommissioner
+  module ServiceType
+    extend ActiveSupport::Concern
+
+    SERVICE_TYPES = %i[organizer transit intercity_taxi].freeze
+
+    class_methods do
+      def service_type_enum(column_name = :service_type)
+        enum column_name => SERVICE_TYPES.index_with(&:to_s)
+      end
+    end
+
+    # Returns a hash of all service types with their translated names
+    # Example: { organizer: "Organizer", transit: "Transit", intercity_taxi: "Intercity Taxi" }
+    #
+    # Usage: SpreeCmCommissioner::ServiceType.translated_service_types
+    def self.translated_service_types
+      SERVICE_TYPES.index_with do |type|
+        I18n.t("service_types.#{type}",
+               scope: 'spree',
+               default: type.to_s.humanize
+              )
+      end
+    end
+  end
+end

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

@@ -19,10 +19,11 @@
 
 #   store_public_metadata :completed, :boolean, default: true
 #   store_public_metadata :count, :integer, default: 5
+#   store_public_metadata :tags, :array, default: []
 #   store_private_metadata :app_token, :string,  default: "XYZ"
 # end
 #
-# taxon = Spree::Taxon.new(completed: true, app_token: "ABC", count: 10)
+# taxon = Spree::Taxon.new(completed: true, app_token: "ABC", count: 100, tags: ["new"])
 # taxon.completed          # => true, store in public_metadata
 # taxon.completed?         # => true, store in public_metadata
 # taxon.count              # => 10, store in public_metadata
@@ -33,7 +34,7 @@ module SpreeCmCommissioner
   module StoreMetadata
     extend ActiveSupport::Concern
 
-    class_methods do
+    class_methods do # rubocop:disable Metrics/BlockLength
       def store_private_metadata(key, type, default: nil)
         store :private_metadata, accessors: [key], coder: JSON
 
@@ -67,6 +68,8 @@ module SpreeCmCommissioner
             raw_value.to_i
           when :string
             raw_value.to_s
+          when :array
+            Array(raw_value)
           else
             raw_value
           end
@@ -76,7 +79,7 @@ module SpreeCmCommissioner
       end
 
       # Validates only new assignments (raw JSON values) for type safety
-      def define_metadata_validation(column_name, key, type)
+      def define_metadata_validation(column_name, key, type) # rubocop:disable Metrics/CyclomaticComplexity
         case type
         when :boolean
           validates key, inclusion: { in: [true, false] }, allow_nil: true
@@ -90,6 +93,14 @@ module SpreeCmCommissioner
           end
         when :string
           validates key, length: { maximum: 255 }, allow_nil: true
+        when :array
+          validate do
+            metadata = send(column_name) || {}
+            raw_value = metadata[key.to_s]
+            next if raw_value.nil?
+
+            errors.add(key, 'must be an array') unless raw_value.is_a?(Array)
+          end
         end
       end
     end

data/app/models/spree_cm_commissioner/guest.rb

@@ -335,6 +335,7 @@ module SpreeCmCommissioner
     end
 
     def pre_registration_completed?
+      return false unless line_item&.order&.completed?
       return true unless line_item&.product&.dynamic_fields&.pre_registration&.any?
 
       required_fields = line_item.product.dynamic_fields.pre_registration.pluck(:id)
@@ -343,6 +344,7 @@ module SpreeCmCommissioner
     end
 
     def post_registration_completed?
+      return false unless line_item&.order&.completed?
       return true unless line_item&.product&.dynamic_fields&.post_registration&.any?
 
       required_fields = line_item.product.dynamic_fields.post_registration.pluck(:id)
@@ -351,6 +353,7 @@ module SpreeCmCommissioner
     end
 
     def check_in_completed?
+      return false unless line_item&.order&.completed?
       return true unless line_item&.product&.dynamic_fields&.during_check_in&.any?
 
       required_fields = line_item.product.dynamic_fields.during_check_in.pluck(:id)

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -48,7 +48,7 @@ module SpreeCmCommissioner
     end
 
     def adjust_quantity_in_redis(quantity)
-      SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+      SpreeCmCommissioner.redis_pool.with do |redis|
         cached_quantity_available = redis.get(redis_key)
         # ignore if redis doesn't exist
         return if cached_quantity_available.nil? # rubocop:disable Lint/NonLocalExitFromIterator

data/app/models/spree_cm_commissioner/notification.rb

@@ -10,7 +10,7 @@ module SpreeCmCommissioner
 
     scope :user_notifications, lambda {
       where(
-        type: %w[order_complete_notification customer_notification]
+        type: %w[order_complete_notification customer_notification guest_dynamic_field_notification]
       )
     }
 
@@ -20,6 +20,10 @@ module SpreeCmCommissioner
       )
     }
 
+    scope :markable_notifications, lambda {
+      where(read_at: nil).where.not(type: %w[guest_dynamic_field_notification])
+    }
+
     belongs_to :recipient, polymorphic: true
     belongs_to :notificable, polymorphic: true
   end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -4,6 +4,8 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
       base.include SpreeCmCommissioner::OrderSeatable
       base.include SpreeCmCommissioner::OrderStateMachine
+      base.include SpreeCmCommissioner::RouteOrderCountable
+      base.include SpreeCmCommissioner::StoreMetadata
 
       base.scope :subscription, -> { where.not(subscription_id: nil) }
       base.scope :paid, -> { where(payment_state: :paid) }
@@ -28,6 +30,9 @@ module SpreeCmCommissioner
       base.before_create :link_by_phone_number
       base.before_create :associate_customer
       base.before_create :set_tenant_id
+      base.after_commit :increment_route_order_count, on: :create
+
+      base.store_private_metadata :preload_trip_ids, :array, default: []
 
       base.validates :promo_total, base::MONEY_VALIDATION
       base.validate :validate_channel_prefix, if: :channel_changed?

data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb

@@ -12,7 +12,7 @@ module SpreeCmCommissioner
         keys = inventory_items.map { |item| "inventory:#{item.id}" }
         return [] unless keys.any?
 
-        counts = SpreeCmCommissioner.inventory_redis_pool.with { |redis| redis.mget(*keys) }
+        counts = SpreeCmCommissioner.redis_pool.with { |redis| redis.mget(*keys) }
         inventory_items.map.with_index do |inventory_item, i|
           ::SpreeCmCommissioner::CachedInventoryItem.new(
             inventory_key: keys[i],
@@ -30,7 +30,7 @@ module SpreeCmCommissioner
         return count_in_redis.to_i if count_in_redis.present?
         return inventory_item.quantity_available unless inventory_item.active?
 
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.set(key, inventory_item.quantity_available, ex: inventory_item.redis_expired_in)
         end
 

data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb

@@ -51,13 +51,13 @@ module SpreeCmCommissioner
       end
 
       def unstock(keys, quantities)
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.eval(unstock_redis_script, keys: keys, argv: quantities)
         end.positive?
       end
 
       def restock(keys, quantities)
-        SpreeCmCommissioner.inventory_redis_pool.with do |redis|
+        SpreeCmCommissioner.redis_pool.with do |redis|
           redis.eval(restock_redis_script, keys: keys, argv: quantities)
         end.positive?
       end

data/app/models/spree_cm_commissioner/route.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class Route < Base
+    has_many :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute', dependent: :destroy
+    has_many :vendors, through: :vendor_routes
+    has_many :trips, inverse_of: :route
+
+    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place'
+    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place'
+
+    validates :origin_place_id, uniqueness: { scope: :destination_place_id }
+  end
+end

data/app/models/spree_cm_commissioner/trip.rb

@@ -2,6 +2,7 @@ module SpreeCmCommissioner
   class Trip < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::RouteType
+    include SpreeCmCommissioner::RouteTripCountCallbacks
 
     attr_accessor :hours, :minutes, :seconds
 
@@ -20,6 +21,7 @@ module SpreeCmCommissioner
 
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :route, inverse_of: :trips
 
     has_many :trip_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
     has_many :blazer_queries, through: :trip_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
@@ -38,12 +40,17 @@ module SpreeCmCommissioner
 
     # before create, duplicate seat layout from vehicle if present
     before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle.present? && vehicle.seat_layout.present? }
+    before_validation :assign_route_and_vendor_route, if: :changed_route_attributes?
 
     accepts_nested_attributes_for :trip_stops, :product, :seat_layout, allow_destroy: true
 
     self.whitelisted_ransackable_associations = %w[product vehicle]
     self.whitelisted_ransackable_attributes = %w[origin_place_id destination_place_id]
 
+    def changed_route_attributes?
+      origin_place_id_changed? || destination_place_id_changed? || vendor_id_changed?
+    end
+
     def convert_duration_to_seconds
       return if hours.blank? && minutes.blank? && seconds.blank?
 
@@ -74,6 +81,9 @@ module SpreeCmCommissioner
     private
 
     def duplicate_seat_layout_from_vehicle
+      # Duplicate the vehicle's seat layout into this trip. Copies nested
+      # seat sections and blocks while excluding identifying columns and
+      # timestamps to avoid collisions when creating new records.
       original = vehicle.seat_layout
 
       self.seat_layout_attributes =
@@ -92,5 +102,35 @@ module SpreeCmCommissioner
                   end
                 )
     end
+
+    # Check if any of the route context attributes are changing
+    def will_route_context_change?
+      # Returns true if any of the route context attributes will change on save.
+      will_save_change_to_route_id? ||
+        will_save_change_to_origin_place_id? ||
+        will_save_change_to_destination_place_id? ||
+        will_save_change_to_vendor_id?
+    end
+
+    def changed_route_context?
+      saved_change_to_route_id? ||
+        saved_change_to_origin_place_id? ||
+        saved_change_to_destination_place_id? ||
+        saved_change_to_vendor_id?
+    end
+
+    # Find or create the Route for this trip (by origin/destination) and
+    # assign it to the trip. Also populate a default route_name from the
+    # product when the route is new/blank.
+    def assign_route_and_vendor_route
+      route = SpreeCmCommissioner::Route.find_or_create_by!(
+        origin_place_id: origin_place_id,
+        destination_place_id: destination_place_id
+      )
+      route.route_name = product.name if route.route_name.blank?
+      route.save! if route.changed?
+
+      self.route_id = route.id
+    end
   end
 end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -6,8 +6,14 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::UserNotification
       base.include SpreeCmCommissioner::UserIdentity
       base.include SpreeCmCommissioner::UserPreference
+      base.include SpreeCmCommissioner::StoreMetadata
+      base.include SpreeCmCommissioner::ServiceType
 
       base.enum gender: %i[male female other]
+      base.enum registered_by: {
+        self_registered: 0,
+        system_registered: 1
+      }, _prefix: true
 
       base.has_many :subscriptions, through: :customer, class_name: 'SpreeCmCommissioner::Subscription'
       base.has_many :payments, as: :payable, class_name: 'Spree::Payment', dependent: :nullify
@@ -45,6 +51,11 @@ module SpreeCmCommissioner
 
       # Store has_incomplete_guest_info in public_metadata for easy frontend access
       base.store :public_metadata, accessors: [:has_incomplete_guest_info], coder: JSON
+      base.store_public_metadata :primary_service_type, :string
+      base.validates :primary_service_type,
+                     inclusion: { in: SpreeCmCommissioner::ServiceType::SERVICE_TYPES.map(&:to_s) },
+                     allow_nil: true
+      base.store_public_metadata :branch_ids, :array, default: []
 
       base.devise :two_factor_authenticatable
 

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -75,6 +75,7 @@ module SpreeCmCommissioner
       base.has_many :subscriptions, through: :customers, class_name: 'SpreeCmCommissioner::Subscription'
       base.has_many :subscription_orders, through: :subscriptions, class_name: 'Spree::Order', source: :orders
       base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
+      base.has_many :vendor_routes, class_name: 'SpreeCmCommissioner::VendorRoute'
 
       base.has_many :homepage_section_relatables,
                     as: :relatable,

data/app/models/spree_cm_commissioner/vendor_route.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  class VendorRoute < Base
+    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :route, class_name: 'SpreeCmCommissioner::Route', optional: false
+
+    has_many :trips, -> (vr) { where(vendor_id: vr.vendor_id, route_id: vr.route_id) }, class_name: 'SpreeCmCommissioner::Trip'
+    validates :vendor_id, uniqueness: { scope: :route_id }
+  end
+end

data/app/notifications/spree_cm_commissioner/guest_dynamic_field_notification.rb

@@ -0,0 +1,24 @@
+module SpreeCmCommissioner
+  class GuestDynamicFieldNotification < NoticedFcmBase
+    def notificable
+      guest
+    end
+
+    def guest
+      params[:guest]
+    end
+
+    def extra_payload
+      {
+        guest_id: guest.id,
+        line_item_id: guest.line_item_id,
+        order_token: guest.line_item.order.token,
+        notification_type: type
+      }
+    end
+
+    def type
+      'guest_dynamic_field_notification'
+    end
+  end
+end

data/app/overrides/spree/admin/users/_form/user_add_on.html.erb.deface

@@ -0,0 +1,27 @@
+<!-- insert_bottom "[data-hook='admin_user_form_password_fields']" -->
+
+<%
+  service_types = SpreeCmCommissioner::ServiceType.translated_service_types.map { |key, label| [label, key.to_s] }
+%>
+
+<div data-hook="admin_user_form_user_section" class="p-3 mt-4 rounded border form-group bg-light">
+  <strong class="mb-3 d-block"><%= Spree.t(:add_on) %></strong>
+  
+  <%= f.field_container :primary_service_type do %>
+    <%= f.label :primary_service_type, Spree.t(:primary_service_type) %>
+    <%= f.select :primary_service_type, 
+        options_for_select(service_types, f.object.primary_service_type),
+        { include_blank: Spree.t(:select_service_type) },
+        class: 'form-control select2-clear' %>
+    <%= f.error_message_on :primary_service_type %>
+  <% end %>
+
+  <div class="form-group">
+    <label><%= Spree.t(:registration_source) %></label>
+    <div class="form-control" style="background-color: #f8f9fa; cursor: not-allowed;">
+      <%= f.object.persisted? ? Spree.t("registered_by.#{f.object.registered_by}") : Spree.t("registered_by.system_registered") %>
+    </div>
+    <%# Hidden field to submit the default value for new records %>
+    <%= f.hidden_field :registered_by, value: 'system_registered' if f.object.new_record? %>
+  </div>
+</div>

data/app/services/spree_cm_commissioner/transit/base_route_order_metrics_updater.rb

@@ -0,0 +1,62 @@
+module SpreeCmCommissioner
+  module Transit
+    class BaseRouteOrderMetricsUpdater
+      attr_reader :order, :attribute
+
+      SUPPORTED_ATTRIBUTES = %i[order_count fulfilled_order_count].freeze
+
+      def initialize(order:, attribute:)
+        @order = order
+        @attribute = attribute&.to_sym
+      end
+
+      def self.call(order:, attribute:)
+        new(order: order, attribute: attribute).call
+      end
+
+      def call
+        return unless order && attribute && SUPPORTED_ATTRIBUTES.include?(attribute)
+
+        order.line_items.find_each { |li| process_line_item(li) }
+      end
+
+      private
+
+      def process_line_item(line_item)
+        return unless line_item.transit?
+
+        product = line_item.variant&.product
+        return unless product&.transit?
+
+        trip = product&.trip
+        return unless trip
+
+        route = find_or_create_route_for_trip(trip)
+        ensure_trip_route(trip, route)
+        increment_route_by(route, line_item.quantity)
+      end
+
+      def find_or_create_route_for_trip(trip)
+        SpreeCmCommissioner::Route.find_or_create_by(
+          origin_place_id: trip.origin_place_id,
+          destination_place_id: trip.destination_place_id
+        )
+      end
+
+      def ensure_trip_route(trip, route)
+        trip_route_id = trip.respond_to?(:route_id) ? trip.route_id : nil
+
+        return unless trip.respond_to?(:update_column) && trip_route_id != route.id
+
+        trip.update_column(:route_id, route.id) # rubocop:disable Rails/SkipsModelValidations
+      end
+
+      def increment_route_by(route, qty)
+        route.with_lock do
+          current_value = route.public_send(attribute) || 0
+          route.update!(attribute => current_value + qty)
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_service.rb

@@ -0,0 +1,18 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteFulfilledOrderCountIncrementerService
+      prepend ::Spree::ServiceModule::Base
+
+      def call(order:)
+        return failure(nil, 'Order not found') unless order
+
+        SpreeCmCommissioner::Transit::BaseRouteOrderMetricsUpdater
+          .call(order: order, attribute: :fulfilled_order_count)
+
+        success(order: order)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/transit/route_order_count_incrementer_service.rb

@@ -0,0 +1,19 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteOrderCountIncrementerService
+      prepend ::Spree::ServiceModule::Base
+
+      def call(order:)
+        return failure(nil, 'Order not found') unless order
+
+        SpreeCmCommissioner::Transit::BaseRouteOrderMetricsUpdater
+          .new(order: order, attribute: :order_count)
+          .call
+
+        success(order: order)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_service.rb

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  module Transit
+    class RoutePreviousTripCountDecrementerService
+      prepend ::Spree::ServiceModule::Base
+
+      def call(previous_route_id:)
+        previous_route = SpreeCmCommissioner::Route.find_by(id: previous_route_id)
+        return failure(nil, 'Route not found') unless previous_route
+
+        if previous_route.vendors.exists?
+
+          # Build a trip-like object that responds to :route and :vendor so the delegated
+          # service can locate vendor routes correctly.
+          trip_like = Struct.new(:route, :vendor).new(previous_route, previous_route.vendors.first)
+          result = SpreeCmCommissioner::Transit::RouteTripCountDecrementerService.call(trip: trip_like)
+          return result if result.failure?
+        else
+          previous_route.with_lock do
+            new_count = [previous_route.trip_count.to_i - 1, 0].max
+            previous_route.update!(trip_count: new_count)
+          end
+        end
+
+        success(previous_route: previous_route)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/transit/route_trip_count_decrementer_service.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteTripCountDecrementerService
+      prepend ::Spree::ServiceModule::Base
+
+      def call(trip:)
+        return failure(nil, 'Trip not found') unless trip
+
+        vendor = trip.vendor
+        return failure(nil, 'Vendor not found') unless vendor
+
+        ActiveRecord::Base.transaction do
+          route = trip.route
+
+          route.update!(trip_count: [route.trip_count - 1, 0].max)
+
+          vendor_route = locate_vendor_route(vendor: vendor, route: route)
+          vendor_route&.update!(trip_count: [vendor_route.trip_count - 1, 0].max)
+        end
+
+        success(trip: trip)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def locate_vendor_route(vendor:, route:)
+        vendor.vendor_routes.find_by(route_id: route.id)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/transit/route_trip_count_incrementer_service.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module Transit
+    class RouteTripCountIncrementerService
+      prepend ::Spree::ServiceModule::Base
+
+      def call(trip:)
+        return failure(nil, 'Trip not found') unless trip
+
+        vendor = trip.vendor
+        return failure(nil, 'Vendor not found') unless vendor
+
+        ActiveRecord::Base.transaction do
+          route = trip.route
+
+          route.update!(trip_count: route.trip_count + 1)
+
+          vendor_route = find_or_create_vendor_route(vendor: vendor, route: route)
+          vendor_route.update!(trip_count: vendor_route.trip_count + 1)
+        end
+
+        success(trip: trip)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def find_or_create_vendor_route(vendor:, route:)
+        vendor.vendor_routes.find_or_create_by!(route_id: route.id)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/incomplete_guest_checker_service.rb

@@ -0,0 +1,34 @@
+module SpreeCmCommissioner
+  module Users
+    class IncompleteGuestCheckerService
+      attr_reader :user
+
+      def initialize(user)
+        @user = user
+      end
+
+      def call
+        return if user.blank? || incomplete_guest_info?
+
+        user.public_metadata['has_incomplete_guest_info'] = false
+        user.save!
+      end
+
+      private
+
+      def incomplete_guest_info?
+        guests =
+          SpreeCmCommissioner::Guest
+          .joins(line_item: :order)
+          .includes(:guest_dynamic_fields, line_item: { product: :dynamic_fields })
+          .where(spree_orders: { user_id: user.id, state: 'complete' })
+
+        guests.any? do |guest|
+          guest.pre_registration_completed? &&
+            guest.post_registration_fields? &&
+            !guest.post_registration_completed?
+        end
+      end
+    end
+  end
+end

data/app/views/blazer/queries/embed/_content.html.erb

@@ -10,8 +10,6 @@
 
 <% if @success %>
   <div id="results" style="font-family: 'Poppins', sans-serif;"></div>
-    <p class="text-muted">Loading...</p>
-  </div>
 
   <script>
     function showRun(data) {
@@ -82,4 +80,8 @@
     height: 15px;
     fill: <%= theme_colors[:text] %>;
   }
+
+  #results table thead.tableFloatingHeaderOriginal {
+    top: 60px !important;
+  }
 </style>

data/config/initializers/spree_permitted_attributes.rb

@@ -17,6 +17,7 @@ module Spree
       dob gender
       phone_number
       profile
+      primary_service_type
       otp_enabled
       otp_email
       otp_phone_number