Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1413a918d0 | |||
| c112576b11 | |||
| b5e4ee67d8 | |||
| 6235b293f0 | |||
| ca4e864596 | |||
| 2cfe9fdc55 | |||
| 63dcc9b266 |
@@ -1,18 +1,26 @@
|
||||
class UsersController < ApplicationController
|
||||
def create
|
||||
user = User.create!(inheritance_code: SecureRandom.uuid, role: 'guest')
|
||||
return head :unprocessable_entity if request.remote_ip.blank?
|
||||
|
||||
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
|
||||
|
||||
UserIp.find_or_create_by!(user:, ip_address:)
|
||||
return head :unprocessable_entity if request.remote_ip.blank?
|
||||
|
||||
attach_ip_address!(user)
|
||||
|
||||
render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
|
||||
end
|
||||
@@ -41,9 +49,18 @@ class UsersController < ApplicationController
|
||||
return head :bad_request if name.blank?
|
||||
|
||||
if user.update(name:)
|
||||
render json: user.slice(:id, :name, :inheritance_code, :role), status: :created
|
||||
render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok
|
||||
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
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
namespace :nico do
|
||||
desc 'ニコニコ DB 逆連携'
|
||||
task export: :environment do
|
||||
require 'open3'
|
||||
|
||||
mysql_user = ENV.fetch('MYSQL_USER')
|
||||
mysql_pass = ENV.fetch('MYSQL_PASS')
|
||||
nizika_nico_path = ENV.fetch('NIZIKA_NICO_PATH')
|
||||
|
||||
videos = Post.where('url LIKE ?', '%nicovideo.jp/watch/%').pluck(:url).filter_map {
|
||||
_1[%r{nicovideo\.jp/watch/([^/?#]+)}, 1]
|
||||
}.uniq
|
||||
|
||||
next if videos.empty?
|
||||
|
||||
_, stderr, status = Open3.capture3(
|
||||
{ 'MYSQL_USER' => mysql_user, 'MYSQL_PASS' => mysql_pass },
|
||||
'python3', '-m', 'tracked_videos.put_bulk_upsert', *videos,
|
||||
chdir: nizika_nico_path)
|
||||
|
||||
raise stderr unless status.success?
|
||||
end
|
||||
end
|
||||
@@ -1,11 +1,10 @@
|
||||
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(:ok)
|
||||
expect(response).to have_http_status(:created)
|
||||
expect(json["code"]).to be_present
|
||||
expect(json["user"]["role"]).to eq("guest")
|
||||
end
|
||||
@@ -38,7 +37,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(:created)
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json["id"]).to eq(user.id)
|
||||
expect(json["name"]).to eq("new-name")
|
||||
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
require 'rails_helper'
|
||||
require 'rake'
|
||||
require 'open3'
|
||||
|
||||
RSpec.describe 'nico:export' do
|
||||
let(:task) { Rake::Task['nico:export'] }
|
||||
let(:success_status) { instance_double(Process::Status, success?: true) }
|
||||
let(:failure_status) { instance_double(Process::Status, success?: false) }
|
||||
|
||||
def create_post(url)
|
||||
Post.create!(url:)
|
||||
end
|
||||
|
||||
before(:all) do
|
||||
Rails.application.load_tasks unless Rake::Task.task_defined?('nico:export')
|
||||
end
|
||||
|
||||
before do
|
||||
task.reenable
|
||||
|
||||
allow(ENV).to receive(:fetch).with('MYSQL_USER').and_return('mysql-user')
|
||||
allow(ENV).to receive(:fetch).with('MYSQL_PASS').and_return('mysql-pass')
|
||||
allow(ENV).to receive(:fetch).with('NIZIKA_NICO_PATH').and_return('/srv/nizika-nico')
|
||||
end
|
||||
|
||||
describe 'export' do
|
||||
it 'exports nicovideo ids to shared nico DB' do
|
||||
create_post('https://www.nicovideo.jp/watch/sm12345?ref=foo')
|
||||
create_post('https://www.nicovideo.jp/watch/so67890#comments')
|
||||
create_post('https://www.nicovideo.jp/watch/nm24680')
|
||||
create_post('https://example.com/watch/sm99999')
|
||||
|
||||
expect(Open3).to receive(:capture3) do |env, *args, **kwargs|
|
||||
expect(env).to eq(
|
||||
{
|
||||
'MYSQL_USER' => 'mysql-user',
|
||||
'MYSQL_PASS' => 'mysql-pass',
|
||||
},
|
||||
)
|
||||
|
||||
expect(args.take(3)).to eq(
|
||||
[
|
||||
'python3',
|
||||
'-m',
|
||||
'tracked_videos.put_bulk_upsert',
|
||||
],
|
||||
)
|
||||
|
||||
expect(args.drop(3)).to contain_exactly(
|
||||
'sm12345',
|
||||
'so67890',
|
||||
'nm24680',
|
||||
)
|
||||
|
||||
expect(kwargs).to eq(chdir: '/srv/nizika-nico')
|
||||
|
||||
['', '', success_status]
|
||||
end
|
||||
|
||||
task.invoke
|
||||
end
|
||||
|
||||
it 'deduplicates video ids' do
|
||||
create_post('https://www.nicovideo.jp/watch/sm12345')
|
||||
create_post('https://www.nicovideo.jp/watch/sm12345?from=1')
|
||||
|
||||
expect(Open3).to receive(:capture3) do |_env, *args, **_kwargs|
|
||||
expect(args.drop(3)).to eq(['sm12345'])
|
||||
|
||||
['', '', success_status]
|
||||
end
|
||||
|
||||
task.invoke
|
||||
end
|
||||
|
||||
it 'does not call python when there are no nicovideo posts' do
|
||||
create_post('https://example.com/watch/sm12345')
|
||||
|
||||
expect(Open3).not_to receive(:capture3)
|
||||
|
||||
task.invoke
|
||||
end
|
||||
|
||||
it 'raises stderr when python command fails' do
|
||||
create_post('https://www.nicovideo.jp/watch/sm12345')
|
||||
|
||||
allow(Open3).to receive(:capture3).and_return(
|
||||
[
|
||||
'',
|
||||
'bulk upsert failed',
|
||||
failure_status,
|
||||
],
|
||||
)
|
||||
|
||||
expect {
|
||||
task.invoke
|
||||
}.to raise_error(RuntimeError, 'bulk upsert failed')
|
||||
end
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user