pass district as param

app/controllers/heritages_controller.rb

@@ -1,6 +1,8 @@
 class HeritagesController < ApplicationController
-  before_action :load_district, only:   [:index, :create, :update_with_district]
+  before_action :load_district, only:   [:index, :create]
   before_action :load_heritage, except: [:index, :create, :trigger]
+
+  before_action :load_district_by_param, only: [:update, :trigger]
   skip_before_action :authenticate, only: [:trigger]
 
   def index
@@ -22,13 +24,6 @@ def create
   end
 
   def update
-    @heritage = BuildHeritage.new(permitted_params).execute
-    @heritage.save_and_deploy!(without_before_deploy: false,
-                               description: "Update to #{@heritage.image_path}")
-    render json: @heritage
-  end
-
-  def update_with_district
     @heritage = BuildHeritage.new(permitted_params, district: @district).execute
     @heritage.save_and_deploy!(without_before_deploy: false,
                                description: "Update to #{@heritage.image_path}")
@@ -158,6 +153,10 @@ def load_district
     @district = District.find_by!(name: params[:district_id])
   end
 
+  def load_district_by_param
+    @district = District.find_by(name: params[:district])
+  end
+
   private
 
   def service

config/routes.rb

@@ -25,8 +25,6 @@
         post   :env_vars, on: :member, to: "heritages#set_env_vars"
         delete :env_vars, on: :member, to: "heritages#delete_env_vars"
 
-        post  :update_with_district, on: :member, to: "heritages#update_with_district"
-
         post "/trigger/:token", to: "heritages#trigger"
         resources :oneoffs, only: [:show, :create]
 

spec/requests/update_heritage_spec.rb

@@ -141,6 +141,37 @@
       end
     end
 
+
+    it "updates a heritage by specifying district name" do
+      params = {
+        district: district.name,
+        image_tag: "v3",
+        before_deploy: nil,
+        services: [
+          {
+            name: "web",
+            command: "true"
+          },
+          {
+            name: "worker",
+            command: "rake jobs:work"
+          }
+        ]
+      }
+
+      expect(Heritage.last.services.find_by(name: 'web').cpu).to eq 128
+
+      expect(DeployRunnerJob).to receive(:perform_later)
+      api_request :patch, "/v1/heritages/nginx", params
+      expect(response).to be_successful
+      heritage = JSON.load(response.body)["heritage"]
+      token = JSON.load(response.body)["heritage"]["token"]
+      web_service = heritage["services"].find { |s| s["name"] == "web" }
+
+      expect(web_service["cpu"]).to be_nil
+      expect(Heritage.last.services.find_by(name: 'web').cpu).to be_nil
+    end
+
     describe "POST /heritages/:heritage/trigger/:token", type: :request do
       let(:district) { create :district }
 
@@ -211,7 +242,6 @@
         expect(web_service["cpu"]).to be_nil
         expect(Heritage.last.services.find_by(name: 'web').cpu).to be_nil
       end
-
     end
 
     describe "with wrong heritage token", type: :request do