feat(products): move catalog REST endpoints to /api/v2

## Context

The product catalog is the new billing surface and should live under a
dedicated API version rather than alongside the legacy v1 endpoints.

## Description

Move the products, product items and filters controllers and request specs
under Api::V2 and a v2 routes namespace. Serializers stay under V1 because
the activity log infrastructure resolves them by the V1:: prefix; the v2
controllers reuse them.

Author: rsempe

…i/v1/product_items/filters_controller.rb …i/v2/product_items/filters_controller.rbapp/controllers/api/v1/product_items/filters_controller.rb renamed to app/controllers/api/v2/product_items/filters_controller.rb app/controllers/api/v1/product_items/filters_controller.rb renamed to app/controllers/api/v2/product_items/filters_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Api
-  module V1
+  module V2
     module ProductItems
       class FiltersController < Api::BaseController
         before_action :find_product_item

…llers/api/v1/product_items_controller.rb …llers/api/v2/product_items_controller.rbapp/controllers/api/v1/product_items_controller.rb renamed to app/controllers/api/v2/product_items_controller.rb app/controllers/api/v1/product_items_controller.rb renamed to app/controllers/api/v2/product_items_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Api
-  module V1
+  module V2
     class ProductItemsController < Api::BaseController
       def create
         result = ::ProductItems::CreateService.call(

…ontrollers/api/v1/products_controller.rb …ontrollers/api/v2/products_controller.rbapp/controllers/api/v1/products_controller.rb renamed to app/controllers/api/v2/products_controller.rb app/controllers/api/v1/products_controller.rb renamed to app/controllers/api/v2/products_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Api
-  module V1
+  module V2
     class ProductsController < Api::BaseController
       def create
         result = ::Products::CreateService.call(

config/routes.rb

@@ -179,10 +179,6 @@
           end
         end
       end
-      resources :product_items, only: %i[index show create update destroy] do
-        resources :filters, only: %i[index show create update destroy], controller: "product_items/filters"
-      end
-      resources :products, param: :code, code: /.*/, only: %i[index show create update destroy]
       resources :taxes, param: :code, code: /.*/
       resources :wallet_transactions, only: %i[create show] do
         post :payment_url, on: :member
@@ -210,6 +206,13 @@
         get :json_public_key, on: :collection
       end
     end
+
+    namespace :v2 do
+      resources :product_items, only: %i[index show create update destroy] do
+        resources :filters, only: %i[index show create update destroy], controller: "product_items/filters"
+      end
+      resources :products, param: :code, code: /.*/, only: %i[index show create update destroy]
+    end
   end
   resources :webhooks, only: [] do
     post "stripe/:organization_id", to: "webhooks#stripe", on: :collection, as: :stripe

…product_items/filters_controller_spec.rb …product_items/filters_controller_spec.rbspec/requests/api/v1/product_items/filters_controller_spec.rb renamed to spec/requests/api/v2/product_items/filters_controller_spec.rb spec/requests/api/v1/product_items/filters_controller_spec.rb renamed to spec/requests/api/v2/product_items/filters_controller_spec.rb

@@ -2,14 +2,14 @@
 
 require "rails_helper"
 
-RSpec.describe Api::V1::ProductItems::FiltersController do
+RSpec.describe Api::V2::ProductItems::FiltersController do
   let(:organization) { create(:organization) }
   let(:billable_metric) { create(:billable_metric, organization:) }
   let(:product_item) { create(:product_item, organization:, billable_metric:) }
   let(:region_filter) { create(:billable_metric_filter, organization:, billable_metric:, key: "region", values: %w[us eu]) }
 
-  describe "POST /api/v1/product_items/:product_item_id/filters" do
-    subject { post_with_token(organization, "/api/v1/product_items/#{product_item.id}/filters", {filter: create_params}) }
+  describe "POST /api/v2/product_items/:product_item_id/filters" do
+    subject { post_with_token(organization, "/api/v2/product_items/#{product_item.id}/filters", {filter: create_params}) }
 
     let(:create_params) do
       {
@@ -42,7 +42,7 @@
     end
 
     context "when the product item does not exist" do
-      subject { post_with_token(organization, "/api/v1/product_items/#{SecureRandom.uuid}/filters", {filter: create_params}) }
+      subject { post_with_token(organization, "/api/v2/product_items/#{SecureRandom.uuid}/filters", {filter: create_params}) }
 
       it "returns a not found error" do
         subject
@@ -52,11 +52,11 @@
     end
   end
 
-  describe "PUT /api/v1/product_items/:product_item_id/filters/:id" do
+  describe "PUT /api/v2/product_items/:product_item_id/filters/:id" do
     subject do
       put_with_token(
         organization,
-        "/api/v1/product_items/#{product_item.id}/filters/#{filter.id}",
+        "/api/v2/product_items/#{product_item.id}/filters/#{filter.id}",
         {filter: update_params}
       )
     end
@@ -92,7 +92,7 @@
     end
 
     context "when the filter does not exist" do
-      subject { put_with_token(organization, "/api/v1/product_items/#{product_item.id}/filters/#{SecureRandom.uuid}", {filter: update_params}) }
+      subject { put_with_token(organization, "/api/v2/product_items/#{product_item.id}/filters/#{SecureRandom.uuid}", {filter: update_params}) }
 
       it "returns a not found error" do
         subject
@@ -102,8 +102,8 @@
     end
   end
 
-  describe "GET /api/v1/product_items/:product_item_id/filters/:id" do
-    subject { get_with_token(organization, "/api/v1/product_items/#{product_item.id}/filters/#{filter.id}") }
+  describe "GET /api/v2/product_items/:product_item_id/filters/:id" do
+    subject { get_with_token(organization, "/api/v2/product_items/#{product_item.id}/filters/#{filter.id}") }
 
     let(:filter) { create(:product_item_filter, :with_values, organization:, product_item:) }
 
@@ -118,8 +118,8 @@
     end
   end
 
-  describe "GET /api/v1/product_items/:product_item_id/filters" do
-    subject { get_with_token(organization, "/api/v1/product_items/#{product_item.id}/filters") }
+  describe "GET /api/v2/product_items/:product_item_id/filters" do
+    subject { get_with_token(organization, "/api/v2/product_items/#{product_item.id}/filters") }
 
     before do
       create(:product_item_filter, organization:, product_item:)
@@ -137,7 +137,7 @@
     end
 
     context "with a search term" do
-      subject { get_with_token(organization, "/api/v1/product_items/#{product_item.id}/filters?search_term=findme") }
+      subject { get_with_token(organization, "/api/v2/product_items/#{product_item.id}/filters?search_term=findme") }
 
       let!(:matching) { create(:product_item_filter, organization:, product_item:, name: "findme filter") }
 
@@ -150,8 +150,8 @@
     end
   end
 
-  describe "DELETE /api/v1/product_items/:product_item_id/filters/:id" do
-    subject { delete_with_token(organization, "/api/v1/product_items/#{product_item.id}/filters/#{filter.id}") }
+  describe "DELETE /api/v2/product_items/:product_item_id/filters/:id" do
+    subject { delete_with_token(organization, "/api/v2/product_items/#{product_item.id}/filters/#{filter.id}") }
 
     let(:filter) { create(:product_item_filter, :with_values, organization:, product_item:) }
 

…/api/v1/product_items_controller_spec.rb …/api/v2/product_items_controller_spec.rbspec/requests/api/v1/product_items_controller_spec.rb renamed to spec/requests/api/v2/product_items_controller_spec.rb spec/requests/api/v1/product_items_controller_spec.rb renamed to spec/requests/api/v2/product_items_controller_spec.rb

@@ -2,11 +2,11 @@
 
 require "rails_helper"
 
-RSpec.describe Api::V1::ProductItemsController do
+RSpec.describe Api::V2::ProductItemsController do
   let(:organization) { create(:organization) }
 
-  describe "POST /api/v1/product_items" do
-    subject { post_with_token(organization, "/api/v1/product_items", {product_item: create_params}) }
+  describe "POST /api/v2/product_items" do
+    subject { post_with_token(organization, "/api/v2/product_items", {product_item: create_params}) }
 
     let(:product) { create(:product, organization:) }
     let(:billable_metric) { create(:billable_metric, organization:) }
@@ -59,8 +59,8 @@
     end
   end
 
-  describe "PUT /api/v1/product_items/:id" do
-    subject { put_with_token(organization, "/api/v1/product_items/#{product_item.id}", {product_item: update_params}) }
+  describe "PUT /api/v2/product_items/:id" do
+    subject { put_with_token(organization, "/api/v2/product_items/#{product_item.id}", {product_item: update_params}) }
 
     let(:product_item) { create(:product_item, organization:, name: "Before") }
     let(:update_params) { {name: "After"} }
@@ -88,7 +88,7 @@
     end
 
     context "when the product item does not exist" do
-      subject { put_with_token(organization, "/api/v1/product_items/#{SecureRandom.uuid}", {product_item: update_params}) }
+      subject { put_with_token(organization, "/api/v2/product_items/#{SecureRandom.uuid}", {product_item: update_params}) }
 
       it "returns a not found error" do
         subject
@@ -98,8 +98,8 @@
     end
   end
 
-  describe "GET /api/v1/product_items/:id" do
-    subject { get_with_token(organization, "/api/v1/product_items/#{product_item.id}") }
+  describe "GET /api/v2/product_items/:id" do
+    subject { get_with_token(organization, "/api/v2/product_items/#{product_item.id}") }
 
     let(:product_item) { create(:product_item, organization:) }
 
@@ -124,8 +124,8 @@
     end
   end
 
-  describe "GET /api/v1/product_items" do
-    subject { get_with_token(organization, "/api/v1/product_items#{query_params}") }
+  describe "GET /api/v2/product_items" do
+    subject { get_with_token(organization, "/api/v2/product_items#{query_params}") }
 
     let(:query_params) { "" }
     let(:product) { create(:product, organization:) }
@@ -174,8 +174,8 @@
     end
   end
 
-  describe "DELETE /api/v1/product_items/:id" do
-    subject { delete_with_token(organization, "/api/v1/product_items/#{product_item.id}") }
+  describe "DELETE /api/v2/product_items/:id" do
+    subject { delete_with_token(organization, "/api/v2/product_items/#{product_item.id}") }
 
     let(:product_item) { create(:product_item, organization:) }
 
@@ -190,7 +190,7 @@
     end
 
     context "when the product item does not exist" do
-      subject { delete_with_token(organization, "/api/v1/product_items/#{SecureRandom.uuid}") }
+      subject { delete_with_token(organization, "/api/v2/product_items/#{SecureRandom.uuid}") }
 
       it "returns a not found error" do
         subject

…uests/api/v1/products_controller_spec.rb …uests/api/v2/products_controller_spec.rbspec/requests/api/v1/products_controller_spec.rb renamed to spec/requests/api/v2/products_controller_spec.rb spec/requests/api/v1/products_controller_spec.rb renamed to spec/requests/api/v2/products_controller_spec.rb

@@ -2,11 +2,11 @@
 
 require "rails_helper"
 
-RSpec.describe Api::V1::ProductsController do
+RSpec.describe Api::V2::ProductsController do
   let(:organization) { create(:organization) }
 
-  describe "POST /api/v1/products" do
-    subject { post_with_token(organization, "/api/v1/products", {product: create_params}) }
+  describe "POST /api/v2/products" do
+    subject { post_with_token(organization, "/api/v2/products", {product: create_params}) }
 
     let(:create_params) do
       {
@@ -41,8 +41,8 @@
     end
   end
 
-  describe "PUT /api/v1/products/:code" do
-    subject { put_with_token(organization, "/api/v1/products/#{product.code}", {product: update_params}) }
+  describe "PUT /api/v2/products/:code" do
+    subject { put_with_token(organization, "/api/v2/products/#{product.code}", {product: update_params}) }
 
     let(:product) { create(:product, organization:, name: "Before") }
     let(:update_params) { {name: "After"} }
@@ -70,7 +70,7 @@
     end
 
     context "when the product does not exist" do
-      subject { put_with_token(organization, "/api/v1/products/unknown", {product: update_params}) }
+      subject { put_with_token(organization, "/api/v2/products/unknown", {product: update_params}) }
 
       it "returns a not found error" do
         subject
@@ -80,8 +80,8 @@
     end
   end
 
-  describe "GET /api/v1/products/:code" do
-    subject { get_with_token(organization, "/api/v1/products/#{product.code}") }
+  describe "GET /api/v2/products/:code" do
+    subject { get_with_token(organization, "/api/v2/products/#{product.code}") }
 
     let(:product) { create(:product, organization:) }
 
@@ -99,7 +99,7 @@
     end
 
     context "when the product does not exist" do
-      subject { get_with_token(organization, "/api/v1/products/unknown") }
+      subject { get_with_token(organization, "/api/v2/products/unknown") }
 
       it "returns a not found error" do
         subject
@@ -119,8 +119,8 @@
     end
   end
 
-  describe "GET /api/v1/products" do
-    subject { get_with_token(organization, "/api/v1/products?page=1&per_page=1") }
+  describe "GET /api/v2/products" do
+    subject { get_with_token(organization, "/api/v2/products?page=1&per_page=1") }
 
     before { create(:product, organization:) }
 
@@ -146,7 +146,7 @@
     end
 
     context "with a search term" do
-      subject { get_with_token(organization, "/api/v1/products?search_term=#{search_term}") }
+      subject { get_with_token(organization, "/api/v2/products?search_term=#{search_term}") }
 
       let(:search_term) { "matching" }
       let(:matching) { create(:product, organization:, name: "matching product") }
@@ -166,8 +166,8 @@
     end
   end
 
-  describe "DELETE /api/v1/products/:code" do
-    subject { delete_with_token(organization, "/api/v1/products/#{product.code}") }
+  describe "DELETE /api/v2/products/:code" do
+    subject { delete_with_token(organization, "/api/v2/products/#{product.code}") }
 
     let(:product) { create(:product, organization:) }
 
@@ -182,7 +182,7 @@
     end
 
     context "when the product does not exist" do
-      subject { delete_with_token(organization, "/api/v1/products/unknown") }
+      subject { delete_with_token(organization, "/api/v2/products/unknown") }
 
       it "returns a not found error" do
         subject