cats_core 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7f1333a43773f878d178ee7f3daad6af88994875ac5fc4584e4b8ebf3fb0c87
-  data.tar.gz: c37663a1516cbc7847360a10efa6dfbf64d2f743b59beebc0916d0ec4b0766fd
+  metadata.gz: 849c78b04184a39a42337994d2cf68e4be874dff4e0420e34a890ce0584658cd
+  data.tar.gz: 85b1a1ff55a91d353329eaebb38e5ff19bb2590bfa8ab2942dd5feb31a7b11c6
 SHA512:
-  metadata.gz: 6b15f41ff65b916ae635fb575c95a24d6f7982fd79b517581f47f7cf09e50b9f90953df6b8d41e5776857807ee7cf480d9d7169365c57f5f4260ae73ea11620e
-  data.tar.gz: 428f6deffeafecd95811843973aaae91567543b408955d556c35049f0cf94bc1b2addcd0a2e417728e7fd8cb5190ac8cdb930568570ae3ffa5f761189bf58732
+  metadata.gz: 18cb896b37d1c7449e8955e7209bcf663e02b0e43d42fe0c7137f9f8a0e4be5ed1f664d8bc2b2f4e777e15b6f8b6c8efb57114cdb283cdffbc8f51dff6c75d7a
+  data.tar.gz: e477156c701bee3b6dfb5c337fb344bcb1e86d16978e0208e8a9616a7721af364ff63862045f85db2ac825dd8fc876b0198ec87f857a4844064cdf7336a8a315

data/app/controllers/cats/core/users_controller.rb

@@ -1,15 +1,20 @@
 module Cats
   module Core
     class UsersController < ApplicationController
-      before_action :set_user, only: %i[stores warehouses]
+      before_action :set_user, only: %i[stores warehouse hub]
 
       def stores
         data = ActiveModelSerializers::SerializableResource.new(@user.stores)
         render json: { success: true, data: data }
       end
 
-      def warehouses
-        data = ActiveModelSerializers::SerializableResource.new(@user.warehouses)
+      def warehouse
+        data = ActiveModelSerializers::SerializableResource.new(@user.warehouse)
+        render json: { success: true, data: data }
+      end
+
+      def hub
+        data = ActiveModelSerializers::SerializableResource.new(@user.hub)
         render json: { success: true, data: data }
       end
 

data/app/models/cats/core/user.rb

@@ -13,10 +13,10 @@ module Cats
       validates :email, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
       validate :validate_phone_number
 
-      def warehouses
-        return unless details.key?('warehouses')
+      def warehouse
+        return unless details.key?('warehouse')
 
-        Cats::Core::Location.where(id: details['warehouses'], location_type: Cats::Core::Location::WAREHOUSE)
+        Cats::Core::Location.find_by(id: details['warehouse'], location_type: Cats::Core::Location::WAREHOUSE)
       end
 
       def stores
@@ -25,6 +25,12 @@ module Cats
         Cats::Core::Store.where(id: details['stores'])
       end
 
+      def hub
+        return unless details.key?('hub')
+
+        Cats::Core::Location.find_by(id: details['hub'], location_type: Cats::Core::Location::HUB)
+      end
+
       def validate_phone_number
         return unless phone_number.present?
 

data/config/routes.rb

@@ -20,7 +20,8 @@ Cats::Core::Engine.routes.draw do
   resources :users do
     member do
       get 'stores', controller: :users, action: :stores
-      get 'warehouses', controller: :users, action: :warehouses
+      get 'warehouse', controller: :users, action: :warehouse
+      get 'hub', controller: :users, action: :hub
     end
   end
 

data/db/migrate/20210715114910_create_cats_core_users.rb

@@ -6,7 +6,7 @@ class CreateCatsCoreUsers < ActiveRecord::Migration[6.1]
       t.string :email, unique: true
       t.boolean :active, null: false, default: true
       t.string :password_digest
-      t.jsonb :details
+      t.jsonb :details, null: false, default: {}
       t.string :phone_number
       t.references :application_module,
                    null: false,

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.13'.freeze
+    VERSION = '1.1.14'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - Henock L.