#309

backend/app/controllers/users_controller.rb

@@ -1,26 +1,18 @@
 class UsersController < ApplicationController
   def create
-    return head :unprocessable_entity if request.remote_ip.blank?
+    user = User.create!(inheritance_code: SecureRandom.uuid, role: 'guest')
-
-    user = nil
-
-    User.transaction do
-      user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
-      attach_ip_address!(user)
-    end
-
     render json: { code: user.inheritance_code,
-                   user: user.slice(:id, :name, :inheritance_code, :role) },
+                   user: user.slice(:id, :name, :inheritance_code, :role) }
-           status: :created
   end
 
   def verify
+    ip_bin = IPAddr.new(request.remote_ip).hton
+    ip_address = IpAddress.find_or_create_by!(ip_address: ip_bin)
+
     user = User.find_by(inheritance_code: params[:code])
     return render json: { valid: false } unless user
 
-    return head :unprocessable_entity if request.remote_ip.blank?
+    UserIp.find_or_create_by!(user:, ip_address:)
-
-    attach_ip_address!(user)
 
     render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
   end
@@ -49,18 +41,9 @@ class UsersController < ApplicationController
     return head :bad_request if name.blank?
 
     if user.update(name:)
-      render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok
+      render json: user.slice(:id, :name, :inheritance_code, :role), status: :created
     else
       render json: user.errors, status: :unprocessable_entity
     end
   end
-
-  private
-
-  def attach_ip_address! user
-    ip_bin = IPAddr.new(request.remote_ip).hton
-    ip_address = IpAddress.create_or_find_by!(ip_address: ip_bin)
-
-    UserIp.create_or_find_by!(user:, ip_address:)
-  end
 end

backend/config/schedule.rb

@@ -1,19 +1,12 @@
 env :PATH, '/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/bin:/usr/bin:/bin'
 
-set :path, '/var/www/btrc-hub/backend'
-set :environment, 'production'
 set :output, standard: '/var/log/btrc_hub_nico_sync.log',
              error:    '/var/log/btrc_hub_nico_sync_err.log'
 
-job_type :rake,
+every 1.day, at: '3:00 pm' do
-         'cd :path && set -a && . /etc/btrc-hub/backend.env && set +a && ' \
-         ':environment_variable=:environment bundle exec rake :task --silent :output'
-
-every 1.day, at: '11:00 am' do
   rake 'nico:sync', environment: 'production'
 end
 
 every 1.day, at: '0:00 am' do
   rake 'post_similarity:calc', environment: 'production'
-  rake 'tag_similarity:calc', environment: 'production'
 end

backend/spec/requests/users_spec.rb

@@ -1,10 +1,11 @@
 require "rails_helper"
 
+
 RSpec.describe "Users", type: :request do
   describe "POST /users" do
     it "creates guest user and returns code" do
       post "/users"
-      expect(response).to have_http_status(:created)
+      expect(response).to have_http_status(:ok)
       expect(json["code"]).to be_present
       expect(json["user"]["role"]).to eq("guest")
     end
@@ -37,7 +38,7 @@ RSpec.describe "Users", type: :request do
       sign_in_as(user)
       put "/users/#{user.id}", params: { name: "new-name" }
 
-      expect(response).to have_http_status(:ok)
+      expect(response).to have_http_status(:created)
       expect(json["id"]).to eq(user.id)
       expect(json["name"]).to eq("new-name")