workarea-api 4.4.7 → 4.5.5

data/admin/app/controllers/workarea/api/admin/fulfillments_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Fulfillments'
               schema do
@@ -54,9 +59,9 @@ module Workarea
         def index
           @fulfillments = Fulfillment
                             .all
+                            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
                             .order_by(sort_field => sort_direction)
                             .page(params[:page])
-
           respond_with fulfillments: @fulfillments
         end
 

data/admin/app/controllers/workarea/api/admin/inventory_skus_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Inventory SKUs'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @inventory_skus = Inventory::Sku
                               .all
+                              .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                              .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                               .order_by(sort_field => sort_direction)
                               .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/navigation_menus_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Navigation Menus'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @navigation_menus = Navigation::Menu
                     .all
+                    .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                    .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                     .order_by(sort_field => sort_direction)
                     .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/navigation_taxons_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Navigation taxons'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @navigation_taxons = Navigation::Taxon
                     .all
+                    .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                    .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                     .order_by(sort_field => sort_direction)
                     .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/orders_controller.rb

@@ -47,6 +47,18 @@ module Workarea
               key :type, :string
               key :format, 'date-time'
             end
+            parameter do
+              key :name, :email
+              key :in, :query
+              key :description, 'Email address associated to the orders'
+              key :required, false
+              key :type, :integer
+            end
+
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
 
             response 200 do
               key :description, 'Orders'
@@ -66,6 +78,10 @@ module Workarea
         def index
           criteria = Order.all
 
+          if params[:email].present?
+            criteria = criteria.where(email: params[:email])
+          end
+
           if params[:placed_at_greater_than].present?
             # TODO Workarea v4, rename to placed_at_starts_at
             criteria = criteria.where(:placed_at.gte => params[:placed_at_greater_than])
@@ -73,11 +89,13 @@ module Workarea
 
           if params[:placed_at_less_than].present?
             # TODO Workarea v4, rename to placed_at_ends_at
-            criteria = criteria.where(:placed_at.lt => params[:placed_at_less_than])
+            criteria = criteria.where(:placed_at.lte => params[:placed_at_less_than])
           end
 
           @orders =
             criteria
+            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
             .order_by(sort_field => sort_direction)
             .page(params[:page].presence || 1)
 

data/admin/app/controllers/workarea/api/admin/pages_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Pages'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @pages = Content::Page
                       .all
+                      .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                      .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                       .order_by(sort_field => sort_direction)
                       .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/payment_profiles_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Payment profiles'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @payment_profiles = Payment::Profile
                                 .all
+                                .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                                .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                                 .order_by(sort_field => sort_direction)
                                 .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/payment_transactions_controller.rb

@@ -34,6 +34,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Payment transactions'
               schema do
@@ -52,6 +57,8 @@ module Workarea
         def index
           @transactions = Payment::Transaction
                             .all
+                            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                             .order_by(sort_field => sort_direction)
                             .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/payments_controller.rb

@@ -34,6 +34,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Payments'
               schema do
@@ -52,6 +57,8 @@ module Workarea
         def index
           @payments = Payment
                         .all
+                        .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                        .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                         .order_by(sort_field => sort_direction)
                         .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/pricing_skus_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Pricing SKUs'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @pricing_skus = Pricing::Sku
                             .all
+                            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                             .order_by(sort_field => sort_direction)
                             .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/products_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Products'
               schema do
@@ -95,10 +100,12 @@ module Workarea
         end
 
         def index
-          @products = Catalog::Product
-                        .all
-                        .order_by(sort_field => sort_direction)
-                        .page(params[:page])
+          @products =
+            Catalog::Product.all
+            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
+            .order_by(sort_field => sort_direction)
+            .page(params[:page])
 
           respond_with products: @products
         end

data/admin/app/controllers/workarea/api/admin/promo_code_lists_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Promo code lists'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @promo_code_lists = Pricing::Discount::CodeList
                                 .all
+                                .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                                .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                                 .order_by(sort_field => sort_direction)
                                 .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/recommendation_settings_controller.rb

@@ -114,7 +114,7 @@ module Workarea
         private
 
         def find_recommendation_settings
-          @recommendation_settings = Recommendation::Settings.find(params[:product_id])
+          @recommendation_settings = Recommendation::Settings.find_or_initialize_by(id: params[:product_id])
         end
       end
     end

data/admin/app/controllers/workarea/api/admin/redirects_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Redirects'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @redirects = Navigation::Redirect
                         .all
+                        .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                        .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                         .order_by(sort_field => sort_direction)
                         .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/releases_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Releases'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @releases = Release
                         .all
+                        .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                        .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                         .order_by(sort_field => sort_direction)
                         .page(params[:page])
           respond_with releases: @releases

data/admin/app/controllers/workarea/api/admin/shipping_services_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Shipping services'
               schema do
@@ -97,6 +102,8 @@ module Workarea
         def index
           @shipping_services = Shipping::Service
                                 .all
+                                .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                                .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                                 .order_by(sort_field => sort_direction)
                                 .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/shippings_controller.rb

@@ -34,6 +34,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'Shippings'
               schema do
@@ -52,6 +57,8 @@ module Workarea
         def index
           @shippings = Shipping
                           .all
+                          .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                          .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                           .order_by(sort_field => sort_direction)
                           .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/swagger_controller.rb

@@ -25,6 +25,39 @@ module Workarea
             key :consumes, ['application/json']
             key :produces, ['application/json']
 
+            # define update_at params for re-use later
+            parameter :updated_at_starts_at do
+              key :name, :updated_at_starts_at
+              key :in, :query
+              key :description, 'Starting datetime for filtering on last updated'
+              key :type, :string
+              key :format, 'date-time'
+            end
+
+            parameter :updated_at_ends_at do
+              key :name, :updated_at_ends_at
+              key :in, :query
+              key :description, 'Ending datetime for filtering on last updated'
+              key :type, :string
+              key :format, 'date-time'
+            end
+
+            parameter :created_at_starts_at do
+              key :name, :created_at_starts_at
+              key :in, :query
+              key :description, 'Starting datetime for filtering on creation date'
+              key :type, :string
+              key :format, 'date-time'
+            end
+
+            parameter :created_at_ends_at do
+              key :name, :created_at_ends_at
+              key :in, :query
+              key :description, 'Ending datetime for filtering on creation date'
+              key :type, :string
+              key :format, 'date-time'
+            end
+
             security_definition :BasicAuth do
               key :type, :basic
             end

data/admin/app/controllers/workarea/api/admin/tax_categories_controller.rb

@@ -72,6 +72,8 @@ module Workarea
         def index
           @tax_categories = Tax::Category
                                 .all
+                                .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+                                .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
                                 .order_by(sort_field => sort_direction)
                                 .page(params[:page])
 

data/admin/app/controllers/workarea/api/admin/users_controller.rb

@@ -36,6 +36,11 @@ module Workarea
               key :default, 'desc'
             end
 
+            parameter :updated_at_starts_at
+            parameter :updated_at_ends_at
+            parameter :created_at_starts_at
+            parameter :created_at_ends_at
+
             response 200 do
               key :description, 'User'
               schema do
@@ -94,12 +99,19 @@ module Workarea
           end
         end
 
-
         def index
-          @users = User
-                      .all
-                      .order_by(sort_field => sort_direction)
-                      .page(params[:page])
+          criteria = User.all
+
+          if params[:email].present?
+            criteria = criteria.where(email: params[:email])
+          end
+
+          @users =
+            criteria
+            .by_updated_at(starts_at: params[:updated_at_starts_at], ends_at: params[:updated_at_ends_at])
+            .by_created_at(starts_at: params[:created_at_starts_at], ends_at: params[:created_at_ends_at])
+            .order_by(sort_field => sort_direction)
+            .page(params[:page].presence || 1)
 
           respond_with users: @users.to_a.map { |u| api_attributes_for(u) }
         end
@@ -113,17 +125,17 @@ module Workarea
           )
         end
 
-        swagger_path '/users/{id}' do
+        swagger_path '/users/{id_or_email}' do
           operation :get do
-            key :summary, 'Show User by ID'
-            key :description, 'Returns a user by ID'
+            key :summary, 'Show User by ID or Email'
+            key :description, 'Returns a user by ID or email address'
             key :operationId, 'showUser'
             key :produces, ['application/json']
 
             parameter do
-              key :name, :id
+              key :name, :id_or_email
               key :in, :path
-              key :description, 'user ID'
+              key :description, 'user ID or URL escaped email address'
               key :required, true
               key :type, :string
             end
@@ -145,9 +157,9 @@ module Workarea
             key :operationId, 'updateUser'
 
             parameter do
-              key :name, :id
+              key :name, :id_or_email
               key :in, :path
-              key :description, 'ID of user to update'
+              key :description, 'ID or email address of user to update'
               key :required, true
               key :type, :string
             end
@@ -203,9 +215,9 @@ module Workarea
             key :operationId, 'removeUser'
 
             parameter do
-              key :name, :id
+              key :name, :id_or_email
               key :in, :path
-              key :description, 'ID of user to remove'
+              key :description, 'ID or email address of user to remove'
               key :required, true
               key :type, :string
             end
@@ -285,6 +297,8 @@ module Workarea
 
         def find_user
           @user = User.find(params[:id])
+        rescue Mongoid::Errors::DocumentNotFound
+          @user = User.find_by(email:  URI.unescape(params[:id]))
         end
 
         def api_attributes_for(user)