Skip to content

V
ventura-ghr
Commit 821d7250 by Bui Minh Duc
Options

add pullrequest controller

parent 4f7c94b1
Showing with 819 additions and 131 deletions
app/assets/javascripts/pulls.coffee 0 → 100644
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/stylesheets/pulls.scss 0 → 100644
// Place all the styles related to the pulls controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/controllers/pulls_controller.rb 0 → 100644
class PullsController < ApplicationController
def show
@pull = Issue.find_by(id: params[:id])
@issue = @pull.issue
@repo = @issue.repository
@comments = @pull.comments
@rv_comments = @pull.review_comments
@options = [
{id: 0, type: "None"},
{id: 1, type: "Small"},
{id: 2, type: "Medium"},
{id: 3, type: "Large"}]
end
def update
@rv_comment = ReviewComment.find_by(id: params[:rv_comment][:id])
@rv_comment.score = params[:rv_comment][:score]
@rv_comment.save
render json: {comment: @rv_comment.id, score: @rv_comment.score}
end
end
app/controllers/repositories_controller.rb
class RepositoriesController < ApplicationController class RepositoriesController < ApplicationController
require 'ostruct'
def index def index
@repos = Repository.all @repos = Repository.all
...@@ -11,7 +12,9 @@ class RepositoriesController < ApplicationController ...@@ -11,7 +12,9 @@ class RepositoriesController < ApplicationController
1 => "Closed", 1 => "Closed",
2 => "Both" 2 => "Both"
} }
@current_type = params["issue"]["type"]
@current_type = params["type"]
@repo = Repository.find_by(id: params[:id]) @repo = Repository.find_by(id: params[:id])
@issues = nil @issues = nil
if @current_type.nil? || @current_type == "0" if @current_type.nil? || @current_type == "0"
......
app/helpers/pulls_helper.rb 0 → 100644
module PullsHelper
end
app/jobs/repository_job.rb
...@@ -9,30 +9,9 @@ class RepositoryJob < ApplicationJob ...@@ -9,30 +9,9 @@ class RepositoryJob < ApplicationJob
start_time = Time.now start_time = Time.now
logger.info "Begin task update " + args.first logger.info "Begin task update " + args.first
list_db_repo = Repository.where(name: args.first) list_db_repo = Repository.where(name: args.first)
list_db_user = User.all loader.insert_issues($client, list_db_repo)
list_db_label = Label.all loader.insert_comments($client, list_db_repo)
list_db_issue = loader.insert_issues($client, list_db_user, list_db_label, list_db_repo) loader.insert_review_comments($client, list_db_repo)
list_db_comment = loader.insert_comments($client, list_db_repo)
list_db_rv_comment = loader.insert_review_comments($client, list_db_repo)
logger.info "begin transaction"
start_time_transaction = Time.now
ActiveRecord::Base.transaction do
list_db_issue.each do |db_issue|
db_issue.save
# byebug
end
list_db_comment.each do |db_comment|
db_comment.save
end
list_db_rv_comment.each do |db_rv_comment|
db_rv_comment.save
end
end
logger.info "Finished transaction in #{Time.now - start_time_transaction}s"
logger.info "Finished task update in #{Time.now - start_time}s" logger.info "Finished task update in #{Time.now - start_time}s"
end end
end end
app/views/issues/index.html.erb
<div class="container"> <div class="container">
<h2><%= @repo_name %></h2> <ol class="breadcrumb">
<li><h3><%= @repo_name %></h3></li>
</ol>
<div> <div>
<table data-toolbar="#toolbar" <table data-toolbar="#toolbar"
data-toggle="table" data-toggle="table"
......
app/views/issues/show.html.erb
<div class="container"> <div class="container">
<h2><%= @issue.repository.name + "/" + @issue.title %></h2> <ol class="breadcrumb">
<li><%= link_to @issue.repository.name, @issue.repository %></li>
<li><%= @issue.title %></li>
</ol>
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="panel panel-default">
<div class="panel-body">
<%= $markdown.render(@issue.body).html_safe %>
</div>
</div>
<!-- <h2>List Comments in Issue</h2> -->
<% @comments.each do |comment| %>
<%= form_for :comment, method: :patch, html: { class: "form-inline" } do |f| %>
<div class="panel panel-default">
<%= f.hidden_field "id", value: comment.id %>
<div class="panel-heading"><h4><%= link_to comment.user.login %></h4></div>
<div class="panel-body"><%= $markdown.render(comment.body).html_safe %></div>
<div class="panel-footer">
<div class="form-group">
<% @comment = OpenStruct.new({ score: comment.score }) %>
<%= f.select("score", @options.collect { |x| [ x[:type], x[:id] ] }, {}, { class: 'form-control' }) %>
<%= f.submit "Save", class: "btn btn-default" %>
</div>
</div>
</div>
<% end %>
<% end %>
<!-- <h2>List Review Comments in Pull Request</h2> -->
<% @rv_comments.each do |rv_comment| %>
<%= form_for :rv_comment, method: :patch, html: { class: "form-inline" } do |f| %>
<div class="panel panel-default">
<%= f.hidden_field "id", value: rv_comment.id %>
<div class="panel-heading"><h4><%= link_to rv_comment.user.login %></h4></div>
<div class="panel-body"><%= $markdown.render(rv_comment.body).html_safe %></div>
<div class="panel-footer">
<div class="form-group">
<% @rv_comment = OpenStruct.new({ score: rv_comment.score }) %>
<%= f.select("score", @options.collect { |x| [ x[:type], x[:id] ] }, {}, { class: 'form-control' }) %>
<%= f.submit "Save", class: "btn btn-default" %>
</div>
</div>
</div>
<% end %>
<% end %>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
...@@ -73,28 +35,58 @@ ...@@ -73,28 +35,58 @@
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
<div class="panel panel-default">
<div class="panel-body">
<%= $markdown.render(@issue.body).html_safe %>
</div> </div>
<div class="col-md-4"> </div>
<!-- <h2>List Comments in Issue</h2> -->
<% @comments.each do |comment| %>
<%= form_for :comment, method: :patch, html: { class: "form-inline" } do |f| %>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <%= f.hidden_field "id", value: comment.id %>
<h4>Assignee</h4> <div class="panel-heading"><h4><%= link_to comment.user.login, comment.user.html_url %></h4></div>
<div class="panel-body"><%= $markdown.render(comment.body).html_safe %></div>
<!-- <div class="panel-footer">
<div class="form-group">
<% @comment = OpenStruct.new({ score: comment.score }) %>
<%= f.select("score", @options.collect { |x| [ x[:type], x[:id] ] }, {}, { class: 'form-control' }) %>
<%= f.submit "Save", class: "btn btn-default" %>
</div> </div>
<ul class="list-group"> </div> -->
<% @issue.users.each do |user| %>
<li class="list-group-item"><%= user.login %></li>
<% end %>
</ul>
</div> </div>
<% end %>
<% end %>
<!-- <h2>List Review Comments in Pull Request</h2> -->
<% @rv_comments.each do |rv_comment| %>
<%= form_for :rv_comment, method: :patch, html: { class: "form-inline" } do |f| %>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <%= f.hidden_field "id", value: rv_comment.id %>
<h4>Label</h4> <div class="panel-heading"><h4><%= link_to rv_comment.user.login %></h4></div>
<div class="panel-body">
<div class="panel panel-default">
<div class="panel-body">
<p><%= simple_format(rv_comment.diff_hunk) %></p>
</div>
</div>
<div class="col-md-8">
<%= $markdown.render(rv_comment.body).html_safe %>
</div>
<div class="col-md-4">
<div class="form-group" style="float: right;">
<% @rv_comment = OpenStruct.new({ score: rv_comment.score }) %>
<%= f.select("score", @options.collect { |x| [ x[:type], x[:id] ] }, {}, { class: 'form-control' }) %>
<%= f.submit "Save", class: "btn btn-default" %>
</div>
</div>
</div>
</div> </div>
<ul class="list-group">
<% @issue.labels.each do |label| %>
<li class="list-group-item"><%= label.name %></li>
<% end %> <% end %>
</ul> <% end %>
</div> </div>
<div class="col-md-4">
<table class="table table-bordered"> <table class="table table-bordered">
<tbody> <tbody>
<tr> <tr>
...@@ -128,11 +120,31 @@ ...@@ -128,11 +120,31 @@
<ul class="list-group"> <ul class="list-group">
<% unless @pulls.nil? %> <% unless @pulls.nil? %>
<% @pulls.each do |pull| %> <% @pulls.each do |pull| %>
<li class="list-group-item"><%= link_to pull.title, issue_path(pull) %></li> <li class="list-group-item"><%= link_to pull.title, pull_path(pull.id) %></li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
</div> </div>
<div class="panel panel-default">
<div class="panel-heading">
<h4>Assignee</h4>
</div>
<ul class="list-group">
<% @issue.users.each do |user| %>
<li class="list-group-item"><%= user.login %></li>
<% end %>
</ul>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4>Label</h4>
</div>
<ul class="list-group">
<% @issue.labels.each do |label| %>
<li class="list-group-item"><%= label.name %></li>
<% end %>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
......
app/views/pulls/show.html.erb 0 → 100644
<div class="container">
<ol class="breadcrumb">
<li><%= link_to @repo.name, @repo %></li>
<li><%= link_to @issue.title, @issue %></li>
<li><%= @pull.title %></li>
</ol>
<div class="row">
<div class="col-md-8">
<div class="panel panel-default">
<div class="panel-body">
<%= $markdown.render(@pull.body).html_safe %>
</div>
</div>
<% @comments.each do |comment| %>
<div class="panel panel-default">
<div class="panel-heading"><h4><%= link_to comment.user.login, comment.user.html_url %></h4></div>
<div class="panel-body"><%= $markdown.render(comment.body).html_safe %></div>
</div>
<% end %>
<% @rv_comments.each do |rv_comment| %>
<%= form_for :rv_comment, method: :patch, html: { class: "form-inline" } do |f| %>
<div class="panel panel-default">
<%= f.hidden_field "id", value: rv_comment.id %>
<div class="panel-heading"><h4><%= link_to rv_comment.user.login %></h4></div>
<div class="panel-body">
<div class="panel panel-default">
<div class="panel-body">
<p><%= simple_format(rv_comment.diff_hunk) %></p>
</div>
</div>
<div class="col-md-8">
<%= $markdown.render(rv_comment.body).html_safe %>
</div>
<div class="col-md-4">
<div class="form-group" style="float: right;">
<% @rv_comment = OpenStruct.new({ score: rv_comment.score }) %>
<%= f.select("score", @options.collect { |x| [ x[:type], x[:id] ] }, {}, { class: 'form-control' }) %>
<%= f.submit "Save", class: "btn btn-default" %>
</div>
</div>
</div>
</div>
<% end %>
<% end %>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<h4>Assignee</h4>
</div>
<ul class="list-group">
<% @pull.users.each do |user| %>
<li class="list-group-item"><%= user.login %></li>
<% end %>
</ul>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4>Label</h4>
</div>
<ul class="list-group">
<% @pull.labels.each do |label| %>
<li class="list-group-item"><%= label.name %></li>
<% end %>
</ul>
</div>
</div>
</div>
</div>
<script type="text/javascript">
$("form").submit(function() {
var submitVar = $(this).serialize();
$.ajax({
type: "POST",
url: $(this).attr("action"),
data: submitVar,
dataType: "JSON"
}).success(function(json) {
console.log(json);
$.notify({
title: "Success!",
message: "Comment score changed successfully.",
},{
type: "success",
delay: 100,
timer: 1000,
});
});
return false;
});
</script>
</div>
app/views/repositories/show.html.erb
<div class="container"> <div class="container">
<h2><%= @repo.name %></h2> <ol class="breadcrumb">
<li><%= @repo.name %></li>
</ol>
<div id="toolbar"> <div id="toolbar">
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
<label>Type</label> <label>Type</label>
<div class="form-group"> <div class="form-group">
<%= select("issue", "type", @type.collect{ |x| [x[1], x[0]] }, {}, { class: "form-control" }) %> <%= select_tag "type", options_from_collection_for_select(@type, "first", "second", @current_type), { class: "form-control" } %>
<input type="submit" class="btn btn-default"> <input type="submit" class="btn btn-default">
</div> </div>
</div> </div>
...@@ -16,6 +18,7 @@ ...@@ -16,6 +18,7 @@
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<table data-toolbar="#toolbar" <table data-toolbar="#toolbar"
id="main_table"
data-toggle="table" data-toggle="table"
data-search="true" data-search="true"
data-show-export="true" data-show-export="true"
...@@ -28,17 +31,24 @@ ...@@ -28,17 +31,24 @@
data-page-list="[10, 25, 50, 100, ALL]"> data-page-list="[10, 25, 50, 100, ALL]">
<thead> <thead>
<tr> <tr>
<th>List of issues</th> <th class="col-md-9">List of issues</th>
<th class="col-md-3">Created at</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @issues.each do |issue| %> <% @issues.each do |issue| %>
<tr> <tr>
<td><%= link_to issue.title, issue %></td> <td><%= link_to issue.title, issue %></td>
<td><%= issue.created_at %></td>
</tr>
<% issue.pull_requests.each do |pull| %>
<tr>
<td>______<%= link_to pull.title, pull_path(pull.id) %></td>
<td><%= pull.created_at %></td>
</tr> </tr>
<% end %> <% end %>
<% end %>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
github.log
...@@ -175,3 +175,577 @@ I, [2017-01-05T15:19:52.765411 #12922] INFO -- : Insert comments ...@@ -175,3 +175,577 @@ I, [2017-01-05T15:19:52.765411 #12922] INFO -- : Insert comments
I, [2017-01-05T15:26:14.109653 #12922] INFO -- : Insert review comments I, [2017-01-05T15:26:14.109653 #12922] INFO -- : Insert review comments
I, [2017-01-05T15:34:30.943277 #12922] INFO -- : Finished task import comments in 878.177847578s I, [2017-01-05T15:34:30.943277 #12922] INFO -- : Finished task import comments in 878.177847578s
I, [2017-01-05T16:00:03.679176 #17006] INFO -- : Begin task update [] I, [2017-01-05T16:00:03.679176 #17006] INFO -- : Begin task update []
I, [2017-01-05T17:00:03.447076 #19125] INFO -- : Begin task update []
I, [2017-01-05T18:00:03.288981 #19864] INFO -- : Begin task update []
I, [2017-01-05T19:00:03.083524 #20610] INFO -- : Begin task update []
I, [2017-01-05T20:00:02.918203 #21406] INFO -- : Begin task update []
I, [2017-01-05T21:00:03.707913 #22139] INFO -- : Begin task update []
I, [2017-01-05T22:00:03.446417 #22866] INFO -- : Begin task update []
I, [2017-01-05T23:00:03.263146 #23579] INFO -- : Begin task update []
I, [2017-01-06T00:00:03.027838 #24307] INFO -- : Begin task update []
I, [2017-01-06T01:00:02.788495 #25031] INFO -- : Begin task update []
I, [2017-01-06T02:00:03.561227 #25761] INFO -- : Begin task update []
I, [2017-01-06T03:00:03.403745 #26458] INFO -- : Begin task update []
I, [2017-01-06T04:00:03.220551 #27163] INFO -- : Begin task update []
I, [2017-01-06T05:00:03.035384 #27860] INFO -- : Begin task update []
I, [2017-01-06T06:00:02.775677 #28598] INFO -- : Begin task update []
I, [2017-01-06T07:00:03.641603 #29993] INFO -- : Begin task update []
I, [2017-01-06T08:00:03.622131 #31276] INFO -- : Begin task update []
I, [2017-01-06T09:00:03.608434 #2418] INFO -- : Begin task update ["socialtools", "kuruma-ex"]
I, [2017-01-06T10:00:03.554797 #7283] INFO -- : Begin task update ["socialtools", "kuruma-ex"]
I, [2017-01-06T10:33:51.680736 #17781] INFO -- : Begin task update socialtools
I, [2017-01-06T10:33:51.680956 #17781] INFO -- : Insert issues
I, [2017-01-06T10:34:03.832733 #17781] INFO -- : Insert comments
I, [2017-01-06T10:35:00.151337 #17781] INFO -- : Begin task update socialtools
I, [2017-01-06T10:35:00.151703 #17781] INFO -- : Insert issues
I, [2017-01-06T10:35:12.596399 #17781] INFO -- : Insert comments
I, [2017-01-06T10:35:18.236536 #17781] INFO -- : Insert review comments
I, [2017-01-06T10:35:20.658590 #17781] INFO -- : Finished task update in 20.507233012s
I, [2017-01-06T10:42:00.360216 #17781] INFO -- : Begin task update socialtools
I, [2017-01-06T10:42:00.360453 #17781] INFO -- : Insert issues
I, [2017-01-06T10:42:11.474937 #17781] INFO -- : Insert comments
I, [2017-01-06T10:42:16.367928 #17781] INFO -- : Insert review comments
I, [2017-01-06T10:42:18.588753 #17781] INFO -- : Please write more details
I, [2017-01-06T10:42:18.638879 #17781] INFO -- : I think we need to change something.
I, [2017-01-06T10:42:18.697259 #17781] INFO -- : This is sample comment
I, [2017-01-06T10:42:18.755675 #17781] INFO -- : Does it run well?
I, [2017-01-06T10:42:18.759274 #17781] INFO -- : Big bug
I, [2017-01-06T10:42:18.814153 #17781] INFO -- : Finished task update in 18.453931184s
I, [2017-01-06T10:44:20.436548 #17781] INFO -- : Begin task update socialtools
I, [2017-01-06T10:44:20.436791 #17781] INFO -- : Insert issues
I, [2017-01-06T10:44:31.640277 #17781] INFO -- : Insert comments
I, [2017-01-06T10:44:36.495426 #17781] INFO -- : Insert review comments
I, [2017-01-06T10:44:38.692569 #17781] INFO -- : Please write more details
I, [2017-01-06T10:44:38.766753 #17781] INFO -- : I think we need to change something.
I, [2017-01-06T10:44:38.816857 #17781] INFO -- : This is sample comment
I, [2017-01-06T10:51:28.818571 #17781] INFO -- : Does it run well?
I, [2017-01-06T10:51:28.821405 #17781] INFO -- : Big bug
I, [2017-01-06T10:51:28.878007 #17781] INFO -- : Finished task update in 428.441453877s
I, [2017-01-06T10:51:56.013565 #17781] INFO -- : Begin task update socialtools
I, [2017-01-06T10:51:56.013950 #17781] INFO -- : Insert issues
I, [2017-01-06T10:52:07.110912 #17781] INFO -- : Insert comments
I, [2017-01-06T10:52:12.063677 #17781] INFO -- : Insert review comments
I, [2017-01-06T10:52:14.284292 #17781] INFO -- : Please write more details
I, [2017-01-06T10:53:11.580606 #9635] INFO -- : Begin task update socialtools
I, [2017-01-06T10:53:11.580821 #9635] INFO -- : Insert issues
I, [2017-01-06T10:53:22.968321 #9635] INFO -- : Insert comments
I, [2017-01-06T10:53:27.856562 #9635] INFO -- : Insert review comments
I, [2017-01-06T10:53:30.056852 #9635] INFO -- : Please write more details
I, [2017-01-06T10:55:39.071740 #9828] INFO -- : Begin task update socialtools
I, [2017-01-06T10:55:39.072010 #9828] INFO -- : Insert issues
I, [2017-01-06T10:55:50.220165 #9828] INFO -- : Insert comments
I, [2017-01-06T10:55:55.136260 #9828] INFO -- : Insert review comments
I, [2017-01-06T10:55:57.414070 #9828] INFO -- : Please write more details
I, [2017-01-06T10:55:57.500642 #9828] INFO -- : I think we need to change something.
I, [2017-01-06T10:55:57.625639 #9828] INFO -- : This is sample comment
I, [2017-01-06T10:55:57.734190 #9828] INFO -- : Does it run well?
I, [2017-01-06T10:55:57.792674 #9828] INFO -- : Big bug
I, [2017-01-06T10:55:57.851161 #9828] INFO -- : Finished task update in 18.779417037s
I, [2017-01-06T11:00:03.513121 #10289] INFO -- : Begin task update ["socialtools", "kuruma-ex"]
I, [2017-01-06T11:00:03.516514 #10289] INFO -- : Insert issues
I, [2017-01-06T11:00:58.318095 #10289] INFO -- : Insert comments
I, [2017-01-06T11:01:07.318864 #10289] INFO -- : Insert review comments
I, [2017-01-06T11:01:09.524916 #10289] INFO -- : Please write more details
I, [2017-01-06T11:01:09.544109 #10289] INFO -- : I think we need to change something.
I, [2017-01-06T11:01:09.547950 #10289] INFO -- : This is sample comment
I, [2017-01-06T11:01:09.551589 #10289] INFO -- : Does it run well?
I, [2017-01-06T11:01:09.555156 #10289] INFO -- : Big bug
I, [2017-01-06T11:01:11.921126 #10289] INFO -- : まだ staging に入れず試して居ないですが、
`before_filter :smartphone?` より前に書かないと実行されないんだと思います。
I, [2017-01-06T11:01:11.927366 #10289] INFO -- : SalesNowのじゃないほうがいいと思います。
I, [2017-01-06T11:01:11.928913 #10289] INFO -- : めんどくさかったらいいですが、action_mailerって使えないですかね。
あ、Iso2022jpMailerか。
I, [2017-01-06T11:01:11.930200 #10289] INFO -- : めんどくさかったらいいですが、２重管理なので、enviromentで設定されてるやつ（DEFAULT_MAIL_SERVER）読み込んだほういいかもしれません。
それともう１つMAIL0301_SERVERっていうメールサーバーがあるので、本番送信テストして迷惑メール扱いになったりしたらMAIL0301_SERVERにした方がいいかもしれません。
I, [2017-01-06T11:01:11.931385 #10289] INFO -- : `require 'action_mailer'` でサクッと行けなかったのと、影響範囲が多くなり過ぎるので、smtp直にしました。
I, [2017-01-06T11:01:11.936516 #10289] INFO -- : > enviromentで設定されてるやつ（DEFAULT_MAIL_SERVER）読み込んだほういいかもしれません。
別件で急ぎの調査が入ってるので、後ほどやってみます。
> MAIL0301_SERVER
ガースーさんとか管理者宛なので、ひとまずは不要かなと思います。
I, [2017-01-06T11:01:11.957341 #10289] INFO -- : やはり enviroment に書かれているので厄介ですね。
.env ファイルに下記の様に切り出して、`load File.join(File.expand_path('../../', __FILE__), '.env')` で、
読みこめばいけますが、表側にも影響するので、そこまでやりますか？
```
#メールサーバー設定
MAIL0301_SERVER = '10.1.173.110'
DEFAULT_MAIL_SERVER = 'localhost'
```
I, [2017-01-06T11:01:11.962660 #10289] INFO -- : やめましょう！
このままで！
I, [2017-01-06T11:01:11.964041 #10289] INFO -- : 別良いんだけど、微妙にindentがあってないような。
I, [2017-01-06T11:01:11.969338 #10289] INFO -- : Plz see https://github.com/ZIGExN/kuruma-ex/blob/master/app/views/usedcar/inquiry.html.erb#L278
I, [2017-01-06T11:01:11.974948 #10289] INFO -- : @vinh-nguyen kuruma.dev とかで動作しなくなるので request.host にしてほしい。
I, [2017-01-06T11:01:11.980068 #10289] INFO -- : @take-ookubo done!
I, [2017-01-06T11:01:11.984950 #10289] INFO -- : @vinh-nguyen 古い UserCarInquiry が不要になるって事ですかね？
I, [2017-01-06T11:01:11.990391 #10289] INFO -- : @take-ookubo UserCarInquiryContentもってないUserCarInquiryですか。削除するか、そのままに置いてるかどちの方いいですかね。
I, [2017-01-06T11:01:11.995373 #10289] INFO -- : @vinh-nguyen `@cashback_entries` ではない？
I, [2017-01-06T11:01:12.000917 #10289] INFO -- : @take-ookubo https://github.com/ZIGExN/kuruma-ex/blob/master/app/models/user_inquiry_mailer.rb#L41 には`contents`です。
I, [2017-01-06T11:01:12.006499 #10289] INFO -- : 了解です。
I, [2017-01-06T11:01:12.012023 #10289] INFO -- : @komietty 体裁崩れるから、タブと空白はちゃんと使い分けてね。
I, [2017-01-06T11:01:12.017373 #10289] INFO -- : いまは表示させたくないので、false にしておく。
I, [2017-01-06T11:01:12.023337 #10289] INFO -- : SP 詳細ページにバナー追加
I, [2017-01-06T11:01:12.030375 #10289] INFO -- : SP 一覧ページにバナー追加
I, [2017-01-06T11:01:12.035456 #10289] INFO -- : @vinh-nguyen ここのif 文 を
「もしディーラー系販売店ならtrue」になるようにして欲しいです。
I, [2017-01-06T11:01:12.041581 #10289] INFO -- : 古いGAタグ
```
<img alt="Ga" src="http://ga.kakaku-club.info/ga.php?utmac=MO-2260154-50&amp;utmr=-&amp;utmp=%2Fusedcar&amp;utmhn=kuruma-ex.jp&amp;guid=ON">
```
が吐き出されているのを削除
I, [2017-01-06T11:01:12.046871 #10289] INFO -- : インデント整理
I, [2017-01-06T11:01:12.051744 #10289] INFO -- : 不明な
ranking-ex.com
を削除
I, [2017-01-06T11:01:12.058325 #10289] INFO -- : falseの不要なコードを削除
インデント整理
I, [2017-01-06T11:01:12.063952 #10289] INFO -- : 不要のため削除
I, [2017-01-06T11:01:12.069273 #10289] INFO -- : ここは残す。
I, [2017-01-06T11:01:12.075013 #10289] INFO -- : @vinh-nguyen 書き方の問題なのでリリースはしますが、 `return(render())`とすれば、 `else` は要らなくない？
I, [2017-01-06T11:01:12.081283 #10289] INFO -- : @vinh-nguyen compact もした方が良いね。
I, [2017-01-06T11:01:13.483251 #10289] INFO -- : 上に同じく
I, [2017-01-06T11:01:13.489471 #10289] INFO -- : @vinh-nguyen なぜに `recommend_ids.present?` を使わない？
I, [2017-01-06T11:01:13.495614 #10289] INFO -- : @vinh-nguyen ここも何故に、`params[:smartphone_flag].to_s == 'true' ? true : false` ではなく、case を使うのか、、、
I, [2017-01-06T11:01:13.501530 #10289] INFO -- : @vinh-nguyen UserCarInquiry.regist 後に、similar_cars 取得、メール送信とか失敗した時の復旧書いとかないとまずい。
I, [2017-01-06T11:01:13.507413 #10289] INFO -- : @take-ookubo `null` の時 `to_s`を使ったらエラー発生します。
I, [2017-01-06T11:01:13.513509 #10289] INFO -- : @take-ookubo 既存のコードをコピペしましたからです。修正します。
I, [2017-01-06T11:01:13.519733 #10289] INFO -- : @vinh-nguyen エラーにならない。
I, [2017-01-06T11:01:13.526712 #10289] INFO -- : @take-ookubo 復旧とはどうすればいいでしょうか。現在APIからのエラー発生すると中古車検索側に問い合わせ完了ページそのまま移動しています。
I, [2017-01-06T11:01:13.532692 #10289] INFO -- : @vinh-nguyen 現行はこの辺りでエラーになっても exception notify が飛ぶので、ユーザもエンジニアも、エラーがあった事が認知ができます。
ajax の場合、chukyosya-ex 側のユーザが何かエラーがあった事を認知できますか？
ajax エラーがあった場合に、何を返すように仕様想定していますか？
I, [2017-01-06T11:01:13.538323 #10289] INFO -- : @take-ookubo まだ石毛さんに聞いているところですが、現在、POST失敗のとき、chukyosya-ex側に問い合わせ失敗のメッセージを表示しています。https://github.com/ZIGExN/chukosya-ex/pull/7/files#diff-5acdc76aac03d698dca2a45dd9588a34R51
I, [2017-01-06T11:01:13.545032 #10289] INFO -- : @take-ookubo https://github.com/ZIGExN/chukosya-ex/pull/7/commits/d4854882d1a12f3ff86d850c8ed74c3bb22210a4 に対応しました。
I, [2017-01-06T11:01:13.551962 #10289] INFO -- : @vinh-nguyen 個人宛ではなくメーリス宛にしてください。
I, [2017-01-06T11:01:13.559915 #10289] INFO -- : @take-ookubo どんなメーリスに送っていいですか。
I, [2017-01-06T11:01:13.566776 #10289] INFO -- : @vietthventura `p-kuruma-ex+#{ここに用途名}@zigexn.co.jp` が良いです。
I, [2017-01-06T11:01:13.572960 #10289] INFO -- : @vinh-nguyen 用途から `p-kuruma-ex+inquiry_mail@zigexn.co.jp` 辺りが良いかな？
I, [2017-01-06T11:01:13.579262 #10289] INFO -- : @ykogure おそらくここです。
I, [2017-01-06T11:01:13.584721 #10289] INFO -- : @vinh-nguyen それと、テスト時のここのURLをslackに貼って下さい
I, [2017-01-06T11:01:13.592246 #10289] INFO -- : @vinh-nguyen 長いw 適度に改行を。
I, [2017-01-06T11:01:13.598176 #10289] INFO -- : @take-ookubo 修正しました。
I, [2017-01-06T11:01:13.604623 #10289] INFO -- : @vinh-nguyen "応募期間" -> "申請期間"に変更してください。
I, [2017-01-06T11:01:13.706809 #10289] INFO -- : すいません、それとフラッシュキャンペーンの方もお願いします。
I, [2017-01-06T11:01:13.823563 #10289] INFO -- : @HaiTrang @ntphat
すみません、前後を把握していないので誤った御指摘かも知れませんが、
params[:maker]がArrayの場合はskipするのではなく、
選択したmakerの全て、もしくは一部を条件にして検索する、等の対応が正しい事はありませんか？
I, [2017-01-06T11:01:13.923770 #10289] INFO -- : @s1z エラーはSPで発生しています。PCは大丈夫です。下記はPCでのソースです
https://github.com/ZIGExN/kuruma-ex/blob/9dfb0e9d12db26cd13bc267c31eafc93c16c3c1b/app/controllers/usedcar_controller.rb#L202
I, [2017-01-06T11:01:13.990459 #10289] INFO -- : @ntphat please choose the data type of `ref_code` Array or String exclusively. Although it is possible in Ruby, we should avoid multiple data type for a variable.
I, [2017-01-06T11:01:14.048922 #10289] INFO -- : @ntphat can we use this gem? https://github.com/ActsAsParanoid/acts_as_paranoid/tree/rails_2-2-2
I, [2017-01-06T11:01:14.108345 #10289] INFO -- : @ntphat can we use `find_or_initialize_by_global_key`?
I, [2017-01-06T11:01:14.166765 #10289] INFO -- : @vinh-nguyen rails 2, no support that method.
I, [2017-01-06T11:01:14.225202 #10289] INFO -- : @ntphat do we need to set limit?
I, [2017-01-06T11:01:14.283651 #10289] INFO -- : @vinh-nguyen it's defined in spec.
I, [2017-01-06T11:01:14.350546 #10289] INFO -- : DONE
I, [2017-01-06T11:01:15.534018 #10289] INFO -- : DONE
I, [2017-01-06T11:01:15.634312 #10289] INFO -- : [x] ADMIN reuse old system, NOT APPLY
I, [2017-01-06T11:01:15.692734 #10289] INFO -- : [x] BIKE is stopped, NOT APPLY
I, [2017-01-06T11:01:15.867994 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:15.926450 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:16.034861 #10289] INFO -- : store favorite to database
I, [2017-01-06T11:01:16.093297 #10289] INFO -- : [x] MOBILE is stopped. NOT APPLY
I, [2017-01-06T11:01:16.151731 #10289] INFO -- : @ntphat why do you need to execute this?
I, [2017-01-06T11:01:16.210185 #10289] INFO -- : @ntphat what is the purpose of this line?
I, [2017-01-06T11:01:16.268599 #10289] INFO -- : @ntphat can you shorten this code? for example:
```ruby
[:price_min, :price_max, :year_min].all?{|k| recommend_conditions[k].present?}
```
I, [2017-01-06T11:01:16.327018 #10289] INFO -- : @ntphat can we move this to `CommonUtils::Search` module, for example: `CommonUtils::Search.find_price_by_value()`, `CommonUtils::Search.find_odd_by_value()`
I, [2017-01-06T11:01:16.385552 #10289] INFO -- : @ntphat please don't duplicate code.
I, [2017-01-06T11:01:16.444351 #10289] INFO -- : @ntphat same as this comment: https://github.com/ZIGExN/kuruma-ex/pull/360/files#r90389954
I, [2017-01-06T11:01:16.502580 #10289] INFO -- : @ntphat can we use render with collection option instead?
I, [2017-01-06T11:01:16.561215 #10289] INFO -- : @ntphat I think we should move to a separated class, instead of put the recommend logic in `searcher.rb`
I, [2017-01-06T11:01:16.619436 #10289] INFO -- : @ntphat do we need `to_i`?
I, [2017-01-06T11:01:16.677994 #10289] INFO -- : @ntphat use `map`
I, [2017-01-06T11:01:16.861497 #10289] INFO -- : @HaiTrang @ntphat コメントアウトの理由も追記しておいてください
I, [2017-01-06T11:01:16.919797 #10289] INFO -- : @HaiTrang @ntphat
ここはなぜmailが出て来ているのでしょうか？
I, [2017-01-06T11:01:16.978327 #10289] INFO -- : @s1z 当ユーザーを外すためです
I, [2017-01-06T11:01:17.036839 #10289] INFO -- : @HaiTrang なるほど。ありがとうございます。
I, [2017-01-06T11:01:17.145426 #10289] INFO -- : @vietthventura Change logic sort for search default
I, [2017-01-06T11:01:17.211993 #10289] INFO -- : @vietthventura New Table: save favorite to DB
I, [2017-01-06T11:01:17.270414 #10289] INFO -- : @vietthventura Save favorite to DB
I, [2017-01-06T11:01:17.328833 #10289] INFO -- : @vietthventura Mobile not use
I, [2017-01-06T11:01:17.437272 #10289] INFO -- : @vietthventura Save favorite to DB
I, [2017-01-06T11:01:17.495704 #10289] INFO -- : @vietthventura it will change only one solr query sort
I, [2017-01-06T11:01:17.562511 #10289] INFO -- : [x] ADMIN reuse old system
I, [2017-01-06T11:01:17.704273 #10289] INFO -- : store favorites to database
I, [2017-01-06T11:01:17.837865 #10289] INFO -- : @vietthventura will check
I, [2017-01-06T11:01:19.127817 #10289] INFO -- : @vietthventura add new fields in solr's schema ``inquiry_count``, ``favorite_count``
I, [2017-01-06T11:01:19.214841 #10289] INFO -- : @vietthventura add new fields in solr's schema ``inquiry_count``, ``favorite_count``
I, [2017-01-06T11:01:19.332999 #10289] INFO -- : @vietthventura will check
- Note: check email smartphone and pc
I, [2017-01-06T11:01:19.398902 #10289] INFO -- : [x] BIKE stopped
I, [2017-01-06T11:01:19.457379 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:19.515812 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:19.574250 #10289] INFO -- : [x] MOBILE stopped
I, [2017-01-06T11:01:19.682771 #10289] INFO -- : @vietthventura will check
I, [2017-01-06T11:01:19.816218 #10289] INFO -- : @sondnm will check flashcapaign
I, [2017-01-06T11:01:19.934007 #10289] INFO -- : @toidbzigexnvn will check
I, [2017-01-06T11:01:19.992544 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:20.050875 #10289] INFO -- : reuse old system
I, [2017-01-06T11:01:20.150926 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:20.209432 #10289] INFO -- : @sondnm will check
I, [2017-01-06T11:01:20.267790 #10289] INFO -- : @vietthventura will check
I, [2017-01-06T11:01:20.326286 #10289] INFO -- : @vietthventura will check
I, [2017-01-06T11:01:20.442515 #10289] INFO -- : [x] ADMIN
I, [2017-01-06T11:01:20.518355 #10289] INFO -- : [x] ADMIN
I, [2017-01-06T11:01:20.577028 #10289] INFO -- : applied
I, [2017-01-06T11:01:20.677091 #10289] INFO -- : applied
I, [2017-01-06T11:01:20.802300 #10289] INFO -- : applied
I, [2017-01-06T11:01:20.952456 #10289] INFO -- : DONT CARE
I, [2017-01-06T11:01:21.010906 #10289] INFO -- : DONT CARE
I, [2017-01-06T11:01:21.069322 #10289] INFO -- : DONT CARE
I, [2017-01-06T11:01:21.177851 #10289] INFO -- : @vinh-nguyen solr へのクエリが失敗する事が結構あるので、 `rescue` して。
I, [2017-01-06T11:01:21.236264 #10289] INFO -- : @vinh-nguyen 除外するなら 252行目より前の方が良くない？
I, [2017-01-06T11:01:21.294608 #10289] INFO -- : @take-ookubo 対応しました。
I, [2017-01-06T11:01:21.353144 #10289] INFO -- : @take-ookubo 対応しました。
I, [2017-01-06T11:01:21.462006 #10289] INFO -- : this file applied
I, [2017-01-06T11:01:21.528810 #10289] INFO -- : MAX_REUPLOAD_IMAGES_EACH_TIME not use
OUTPUT_IMAGE_PATH for flashcampaign
I, [2017-01-06T11:01:22.774457 #10289] INFO -- : applied
I, [2017-01-06T11:01:22.956173 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.070866 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.129172 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.187567 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.246136 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.364658 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.438059 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.521533 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.588419 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.646843 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.723056 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.838814 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.905687 #10289] INFO -- : applied
I, [2017-01-06T11:01:23.972349 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.122650 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.181174 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.289488 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.408589 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.506448 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.564818 #10289] INFO -- : applied
I, [2017-01-06T11:01:24.623321 #10289] INFO -- : Finished task update in 81.281789771s
I, [2017-01-09T08:00:17.487532 #3711] INFO -- : Begin task update ["socialtools", "kuruma-ex"]
I, [2017-01-09T08:00:17.538709 #3711] INFO -- : Insert issues
I, [2017-01-09T09:00:03.680406 #7549] INFO -- : Begin task update ["socialtools", "kuruma-ex"]
I, [2017-01-09T09:00:03.683641 #7549] INFO -- : Insert issues
I, [2017-01-09T10:00:12.263890 #4004] INFO -- : Begin task update ["socialtools", "kuruma-ex"]
I, [2017-01-09T10:00:12.356343 #4004] INFO -- : Insert issues
I, [2017-01-09T10:01:02.452165 #4004] INFO -- : Insert comments
I, [2017-01-09T10:01:11.645282 #4004] INFO -- : Insert review comments
I, [2017-01-09T10:01:13.939477 #4004] INFO -- : Please write more details
I, [2017-01-09T10:01:13.982087 #4004] INFO -- : I think we need to change something.
I, [2017-01-09T10:01:13.986577 #4004] INFO -- : This is sample comment
I, [2017-01-09T10:01:14.047595 #4004] INFO -- : Does it run well?
I, [2017-01-09T10:01:14.050737 #4004] INFO -- : Big bug
I, [2017-01-09T10:01:16.672312 #4004] INFO -- : まだ staging に入れず試して居ないですが、
`before_filter :smartphone?` より前に書かないと実行されないんだと思います。
I, [2017-01-09T10:01:16.683357 #4004] INFO -- : SalesNowのじゃないほうがいいと思います。
I, [2017-01-09T10:01:16.686122 #4004] INFO -- : めんどくさかったらいいですが、action_mailerって使えないですかね。
あ、Iso2022jpMailerか。
I, [2017-01-09T10:01:16.688549 #4004] INFO -- : めんどくさかったらいいですが、２重管理なので、enviromentで設定されてるやつ（DEFAULT_MAIL_SERVER）読み込んだほういいかもしれません。
それともう１つMAIL0301_SERVERっていうメールサーバーがあるので、本番送信テストして迷惑メール扱いになったりしたらMAIL0301_SERVERにした方がいいかもしれません。
I, [2017-01-09T10:01:16.690812 #4004] INFO -- : `require 'action_mailer'` でサクッと行けなかったのと、影響範囲が多くなり過ぎるので、smtp直にしました。
I, [2017-01-09T10:01:16.699535 #4004] INFO -- : > enviromentで設定されてるやつ（DEFAULT_MAIL_SERVER）読み込んだほういいかもしれません。
別件で急ぎの調査が入ってるので、後ほどやってみます。
> MAIL0301_SERVER
ガースーさんとか管理者宛なので、ひとまずは不要かなと思います。
I, [2017-01-09T10:01:16.707544 #4004] INFO -- : やはり enviroment に書かれているので厄介ですね。
.env ファイルに下記の様に切り出して、`load File.join(File.expand_path('../../', __FILE__), '.env')` で、
読みこめばいけますが、表側にも影響するので、そこまでやりますか？
```
#メールサーバー設定
MAIL0301_SERVER = '10.1.173.110'
DEFAULT_MAIL_SERVER = 'localhost'
```
I, [2017-01-09T10:01:16.721580 #4004] INFO -- : やめましょう！
このままで！
I, [2017-01-09T10:01:16.724106 #4004] INFO -- : 別良いんだけど、微妙にindentがあってないような。
I, [2017-01-09T10:01:16.731224 #4004] INFO -- : Plz see https://github.com/ZIGExN/kuruma-ex/blob/master/app/views/usedcar/inquiry.html.erb#L278
I, [2017-01-09T10:01:16.736511 #4004] INFO -- : @vinh-nguyen kuruma.dev とかで動作しなくなるので request.host にしてほしい。
I, [2017-01-09T10:01:16.741546 #4004] INFO -- : @take-ookubo done!
I, [2017-01-09T10:01:16.745831 #4004] INFO -- : @vinh-nguyen 古い UserCarInquiry が不要になるって事ですかね？
I, [2017-01-09T10:01:16.751074 #4004] INFO -- : @take-ookubo UserCarInquiryContentもってないUserCarInquiryですか。削除するか、そのままに置いてるかどちの方いいですかね。
I, [2017-01-09T10:01:16.755173 #4004] INFO -- : @vinh-nguyen `@cashback_entries` ではない？
I, [2017-01-09T10:01:16.759225 #4004] INFO -- : @take-ookubo https://github.com/ZIGExN/kuruma-ex/blob/master/app/models/user_inquiry_mailer.rb#L41 には`contents`です。
I, [2017-01-09T10:01:16.763323 #4004] INFO -- : 了解です。
I, [2017-01-09T10:01:16.767444 #4004] INFO -- : @komietty 体裁崩れるから、タブと空白はちゃんと使い分けてね。
I, [2017-01-09T10:01:16.771584 #4004] INFO -- : いまは表示させたくないので、false にしておく。
I, [2017-01-09T10:01:16.791404 #4004] INFO -- : SP 詳細ページにバナー追加
I, [2017-01-09T10:01:16.796552 #4004] INFO -- : SP 一覧ページにバナー追加
I, [2017-01-09T10:01:16.801676 #4004] INFO -- : @vinh-nguyen ここのif 文 を
「もしディーラー系販売店ならtrue」になるようにして欲しいです。
I, [2017-01-09T10:01:16.806339 #4004] INFO -- : 古いGAタグ
```
<img alt="Ga" src="http://ga.kakaku-club.info/ga.php?utmac=MO-2260154-50&amp;utmr=-&amp;utmp=%2Fusedcar&amp;utmhn=kuruma-ex.jp&amp;guid=ON">
```
が吐き出されているのを削除
I, [2017-01-09T10:01:16.811311 #4004] INFO -- : インデント整理
I, [2017-01-09T10:01:16.816234 #4004] INFO -- : 不明な
ranking-ex.com
を削除
I, [2017-01-09T10:01:16.821144 #4004] INFO -- : falseの不要なコードを削除
インデント整理
I, [2017-01-09T10:01:16.826259 #4004] INFO -- : 不要のため削除
I, [2017-01-09T10:01:16.831360 #4004] INFO -- : ここは残す。
I, [2017-01-09T10:01:16.836291 #4004] INFO -- : @vinh-nguyen 書き方の問題なのでリリースはしますが、 `return(render())`とすれば、 `else` は要らなくない？
I, [2017-01-09T10:01:16.841305 #4004] INFO -- : @vinh-nguyen compact もした方が良いね。
I, [2017-01-09T10:01:18.264998 #4004] INFO -- : 上に同じく
I, [2017-01-09T10:01:18.270675 #4004] INFO -- : @vinh-nguyen なぜに `recommend_ids.present?` を使わない？
I, [2017-01-09T10:01:18.275790 #4004] INFO -- : @vinh-nguyen ここも何故に、`params[:smartphone_flag].to_s == 'true' ? true : false` ではなく、case を使うのか、、、
I, [2017-01-09T10:01:18.281255 #4004] INFO -- : @vinh-nguyen UserCarInquiry.regist 後に、similar_cars 取得、メール送信とか失敗した時の復旧書いとかないとまずい。
I, [2017-01-09T10:01:18.286336 #4004] INFO -- : @take-ookubo `null` の時 `to_s`を使ったらエラー発生します。
I, [2017-01-09T10:01:18.292326 #4004] INFO -- : @take-ookubo 既存のコードをコピペしましたからです。修正します。
I, [2017-01-09T10:01:18.298181 #4004] INFO -- : @vinh-nguyen エラーにならない。
I, [2017-01-09T10:01:18.304531 #4004] INFO -- : @take-ookubo 復旧とはどうすればいいでしょうか。現在APIからのエラー発生すると中古車検索側に問い合わせ完了ページそのまま移動しています。
I, [2017-01-09T10:01:18.310424 #4004] INFO -- : @vinh-nguyen 現行はこの辺りでエラーになっても exception notify が飛ぶので、ユーザもエンジニアも、エラーがあった事が認知ができます。
ajax の場合、chukyosya-ex 側のユーザが何かエラーがあった事を認知できますか？
ajax エラーがあった場合に、何を返すように仕様想定していますか？
I, [2017-01-09T10:01:18.316349 #4004] INFO -- : @take-ookubo まだ石毛さんに聞いているところですが、現在、POST失敗のとき、chukyosya-ex側に問い合わせ失敗のメッセージを表示しています。https://github.com/ZIGExN/chukosya-ex/pull/7/files#diff-5acdc76aac03d698dca2a45dd9588a34R51
I, [2017-01-09T10:01:18.322561 #4004] INFO -- : @take-ookubo https://github.com/ZIGExN/chukosya-ex/pull/7/commits/d4854882d1a12f3ff86d850c8ed74c3bb22210a4 に対応しました。
I, [2017-01-09T10:01:18.328144 #4004] INFO -- : @vinh-nguyen 個人宛ではなくメーリス宛にしてください。
I, [2017-01-09T10:01:18.334316 #4004] INFO -- : @take-ookubo どんなメーリスに送っていいですか。
I, [2017-01-09T10:01:18.340408 #4004] INFO -- : @vietthventura `p-kuruma-ex+#{ここに用途名}@zigexn.co.jp` が良いです。
I, [2017-01-09T10:01:18.346498 #4004] INFO -- : @vinh-nguyen 用途から `p-kuruma-ex+inquiry_mail@zigexn.co.jp` 辺りが良いかな？
I, [2017-01-09T10:01:18.352677 #4004] INFO -- : @ykogure おそらくここです。
I, [2017-01-09T10:01:18.358757 #4004] INFO -- : @vinh-nguyen それと、テスト時のここのURLをslackに貼って下さい
I, [2017-01-09T10:01:18.368095 #4004] INFO -- : @vinh-nguyen 長いw 適度に改行を。
I, [2017-01-09T10:01:18.375709 #4004] INFO -- : @take-ookubo 修正しました。
I, [2017-01-09T10:01:18.382659 #4004] INFO -- : @vinh-nguyen "応募期間" -> "申請期間"に変更してください。
I, [2017-01-09T10:01:18.386458 #4004] INFO -- : すいません、それとフラッシュキャンペーンの方もお願いします。
I, [2017-01-09T10:01:18.389871 #4004] INFO -- : @HaiTrang @ntphat
すみません、前後を把握していないので誤った御指摘かも知れませんが、
params[:maker]がArrayの場合はskipするのではなく、
選択したmakerの全て、もしくは一部を条件にして検索する、等の対応が正しい事はありませんか？
I, [2017-01-09T10:01:18.394152 #4004] INFO -- : @s1z エラーはSPで発生しています。PCは大丈夫です。下記はPCでのソースです
https://github.com/ZIGExN/kuruma-ex/blob/9dfb0e9d12db26cd13bc267c31eafc93c16c3c1b/app/controllers/usedcar_controller.rb#L202
I, [2017-01-09T10:01:18.397634 #4004] INFO -- : @ntphat please choose the data type of `ref_code` Array or String exclusively. Although it is possible in Ruby, we should avoid multiple data type for a variable.
I, [2017-01-09T10:01:18.401102 #4004] INFO -- : @ntphat can we use this gem? https://github.com/ActsAsParanoid/acts_as_paranoid/tree/rails_2-2-2
I, [2017-01-09T10:01:18.404514 #4004] INFO -- : @ntphat can we use `find_or_initialize_by_global_key`?
I, [2017-01-09T10:01:18.407803 #4004] INFO -- : @vinh-nguyen rails 2, no support that method.
I, [2017-01-09T10:01:18.411199 #4004] INFO -- : @ntphat do we need to set limit?
I, [2017-01-09T10:01:18.414541 #4004] INFO -- : @vinh-nguyen it's defined in spec.
I, [2017-01-09T10:01:18.417892 #4004] INFO -- : DONE
I, [2017-01-09T10:01:19.675030 #4004] INFO -- : DONE
I, [2017-01-09T10:01:19.682280 #4004] INFO -- : [x] ADMIN reuse old system, NOT APPLY
I, [2017-01-09T10:01:19.684888 #4004] INFO -- : [x] BIKE is stopped, NOT APPLY
I, [2017-01-09T10:01:19.687470 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:19.690086 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:19.692657 #4004] INFO -- : store favorite to database
I, [2017-01-09T10:01:19.695313 #4004] INFO -- : [x] MOBILE is stopped. NOT APPLY
I, [2017-01-09T10:01:19.697960 #4004] INFO -- : @ntphat why do you need to execute this?
I, [2017-01-09T10:01:19.700666 #4004] INFO -- : @ntphat what is the purpose of this line?
I, [2017-01-09T10:01:19.703344 #4004] INFO -- : @ntphat can you shorten this code? for example:
```ruby
[:price_min, :price_max, :year_min].all?{|k| recommend_conditions[k].present?}
```
I, [2017-01-09T10:01:19.706064 #4004] INFO -- : @ntphat can we move this to `CommonUtils::Search` module, for example: `CommonUtils::Search.find_price_by_value()`, `CommonUtils::Search.find_odd_by_value()`
I, [2017-01-09T10:01:19.709040 #4004] INFO -- : @ntphat please don't duplicate code.
I, [2017-01-09T10:01:19.712117 #4004] INFO -- : @ntphat same as this comment: https://github.com/ZIGExN/kuruma-ex/pull/360/files#r90389954
I, [2017-01-09T10:01:19.715217 #4004] INFO -- : @ntphat can we use render with collection option instead?
I, [2017-01-09T10:01:19.718337 #4004] INFO -- : @ntphat I think we should move to a separated class, instead of put the recommend logic in `searcher.rb`
I, [2017-01-09T10:01:19.721452 #4004] INFO -- : @ntphat do we need `to_i`?
I, [2017-01-09T10:01:19.724618 #4004] INFO -- : @ntphat use `map`
I, [2017-01-09T10:01:19.727717 #4004] INFO -- : @HaiTrang @ntphat コメントアウトの理由も追記しておいてください
I, [2017-01-09T10:01:19.730701 #4004] INFO -- : @HaiTrang @ntphat
ここはなぜmailが出て来ているのでしょうか？
I, [2017-01-09T10:01:19.733772 #4004] INFO -- : @s1z 当ユーザーを外すためです
I, [2017-01-09T10:01:19.736726 #4004] INFO -- : @HaiTrang なるほど。ありがとうございます。
I, [2017-01-09T10:01:19.739739 #4004] INFO -- : @vietthventura Change logic sort for search default
I, [2017-01-09T10:01:19.742849 #4004] INFO -- : @vietthventura New Table: save favorite to DB
I, [2017-01-09T10:01:19.745921 #4004] INFO -- : @vietthventura Save favorite to DB
I, [2017-01-09T10:01:19.748950 #4004] INFO -- : @vietthventura Mobile not use
I, [2017-01-09T10:01:19.752063 #4004] INFO -- : @vietthventura Save favorite to DB
I, [2017-01-09T10:01:19.755200 #4004] INFO -- : @vietthventura it will change only one solr query sort
I, [2017-01-09T10:01:19.758331 #4004] INFO -- : [x] ADMIN reuse old system
I, [2017-01-09T10:01:19.761540 #4004] INFO -- : store favorites to database
I, [2017-01-09T10:01:19.764756 #4004] INFO -- : @vietthventura will check
I, [2017-01-09T10:01:20.955389 #4004] INFO -- : @vietthventura add new fields in solr's schema ``inquiry_count``, ``favorite_count``
I, [2017-01-09T10:01:20.959901 #4004] INFO -- : @vietthventura add new fields in solr's schema ``inquiry_count``, ``favorite_count``
I, [2017-01-09T10:01:20.963373 #4004] INFO -- : @vietthventura will check
- Note: check email smartphone and pc
I, [2017-01-09T10:01:20.966827 #4004] INFO -- : [x] BIKE stopped
I, [2017-01-09T10:01:20.970352 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:20.973745 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:20.977107 #4004] INFO -- : [x] MOBILE stopped
I, [2017-01-09T10:01:20.980742 #4004] INFO -- : @vietthventura will check
I, [2017-01-09T10:01:20.985138 #4004] INFO -- : @sondnm will check flashcapaign
I, [2017-01-09T10:01:20.988817 #4004] INFO -- : @toidbzigexnvn will check
I, [2017-01-09T10:01:20.992210 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:20.995530 #4004] INFO -- : reuse old system
I, [2017-01-09T10:01:20.998928 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:21.002116 #4004] INFO -- : @sondnm will check
I, [2017-01-09T10:01:21.005320 #4004] INFO -- : @vietthventura will check
I, [2017-01-09T10:01:21.008576 #4004] INFO -- : @vietthventura will check
I, [2017-01-09T10:01:21.011788 #4004] INFO -- : [x] ADMIN
I, [2017-01-09T10:01:21.015040 #4004] INFO -- : [x] ADMIN
I, [2017-01-09T10:01:21.018245 #4004] INFO -- : applied
I, [2017-01-09T10:01:21.021314 #4004] INFO -- : applied
I, [2017-01-09T10:01:21.024360 #4004] INFO -- : applied
I, [2017-01-09T10:01:21.027471 #4004] INFO -- : DONT CARE
I, [2017-01-09T10:01:21.031607 #4004] INFO -- : DONT CARE
I, [2017-01-09T10:01:21.036781 #4004] INFO -- : DONT CARE
I, [2017-01-09T10:01:21.040059 #4004] INFO -- : @vinh-nguyen solr へのクエリが失敗する事が結構あるので、 `rescue` して。
I, [2017-01-09T10:01:21.043068 #4004] INFO -- : @vinh-nguyen 除外するなら 252行目より前の方が良くない？
I, [2017-01-09T10:01:21.046052 #4004] INFO -- : @take-ookubo 対応しました。
I, [2017-01-09T10:01:21.049082 #4004] INFO -- : @take-ookubo 対応しました。
I, [2017-01-09T10:01:21.052062 #4004] INFO -- : this file applied
I, [2017-01-09T10:01:21.055012 #4004] INFO -- : MAX_REUPLOAD_IMAGES_EACH_TIME not use
OUTPUT_IMAGE_PATH for flashcampaign
I, [2017-01-09T10:01:22.318345 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.321876 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.324955 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.328013 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.330944 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.333894 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.336830 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.339681 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.342737 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.345614 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.348511 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.351490 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.354403 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.357263 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.360146 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.362995 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.365863 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.368753 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.371664 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.374618 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.377569 #4004] INFO -- : applied
I, [2017-01-09T10:01:22.380570 #4004] INFO -- : Finished task update in 70.613009036s
lib/github_loader.rb
...@@ -27,7 +27,6 @@ class GithubLoader ...@@ -27,7 +27,6 @@ class GithubLoader
db_repo.html_url = repo.html_url db_repo.html_url = repo.html_url
db_repo.created_at = repo.created_at db_repo.created_at = repo.created_at
db_repo.updated_at = repo.updated_at db_repo.updated_at = repo.updated_at
end end
db_repo.save db_repo.save
# list_db_repo.append(db_repo) # list_db_repo.append(db_repo)
...@@ -90,7 +89,6 @@ class GithubLoader ...@@ -90,7 +89,6 @@ class GithubLoader
db_user.login = user.login db_user.login = user.login
db_user.url = user.url db_user.url = user.url
db_user.html_url = user.html_url db_user.html_url = user.html_url
end end
db_user.save db_user.save
# list_db_user.append(db_user) # list_db_user.append(db_user)
...@@ -99,11 +97,11 @@ class GithubLoader ...@@ -99,11 +97,11 @@ class GithubLoader
# list_db_user # list_db_user
end end
def insert_issues(client) def insert_issues(client, db_repos)
$logger.info "Insert issues" $logger.info "Insert issues"
list_db_user = User.all list_db_user = User.all
list_db_label = Label.all list_db_label = Label.all
db_repos = Repository.all # db_repos = Repository.all
# list_db_issue = [] # list_db_issue = []
db_repos.each do |repo| db_repos.each do |repo|
...@@ -167,7 +165,7 @@ class GithubLoader ...@@ -167,7 +165,7 @@ class GithubLoader
timeline.end_time = Time.now timeline.end_time = Time.now
timeline.save timeline.save
rescue rescue
byebug # byebug
end end
new_timeline(db_issue.id, new_label.name) new_timeline(db_issue.id, new_label.name)
...@@ -198,10 +196,10 @@ class GithubLoader ...@@ -198,10 +196,10 @@ class GithubLoader
# list_db_issue # list_db_issue
end end
def insert_comments(client) def insert_comments(client, list_db_repo)
$logger.info "Insert comments" $logger.info "Insert comments"
# list_db_comment = [] # list_db_comment = []
list_db_repo = Repository.all # list_db_repo = Repository.all
list_db_repo.each do |db_repo| list_db_repo.each do |db_repo|
comments = client.issues_comments($org + "/" + db_repo.name) comments = client.issues_comments($org + "/" + db_repo.name)
...@@ -236,10 +234,8 @@ class GithubLoader ...@@ -236,10 +234,8 @@ class GithubLoader
# list_db_comment # list_db_comment
end end
def insert_review_comments(client) def insert_review_comments(client, list_db_repo)
$logger.info "Insert review comments" $logger.info "Insert review comments"
# list_db_rv_comment = []
list_db_repo = Repository.all
list_db_repo.each do |db_repo| list_db_repo.each do |db_repo|
rv_comments = client.pull_requests_comments($org + "/" + db_repo.name) rv_comments = client.pull_requests_comments($org + "/" + db_repo.name)
last_page = 1 last_page = 1
...@@ -249,12 +245,14 @@ class GithubLoader ...@@ -249,12 +245,14 @@ class GithubLoader
for i in (1..last_page) for i in (1..last_page)
rv_comments = client.pull_requests_comments($org + "/" + db_repo.name, { page: i }) rv_comments = client.pull_requests_comments($org + "/" + db_repo.name, { page: i })
rv_comments.each do |rv_comment| rv_comments.each do |rv_comment|
db_rv_comment = ReviewComment.find_by(commit_id: rv_comment.commit_id) $logger.info rv_comment.body
db_rv_comment = ReviewComment.where(commit_id: rv_comment.commit_id, rv_comment_id: rv_comment.id).first
if db_rv_comment.nil? if db_rv_comment.nil?
db_rv_comment = ReviewComment.new db_rv_comment = ReviewComment.new
# db_rv_comment.rv_comment_id = rv_comment.id
db_rv_comment.commit_id = rv_comment.commit_id db_rv_comment.commit_id = rv_comment.commit_id
db_rv_comment.rv_comment_id = rv_comment.id
db_rv_comment.url = rv_comment.url db_rv_comment.url = rv_comment.url
db_rv_comment.diff_hunk = rv_comment.diff_hunk db_rv_comment.diff_hunk = rv_comment.diff_hunk
db_rv_comment.path = rv_comment.path db_rv_comment.path = rv_comment.path
...@@ -277,12 +275,11 @@ class GithubLoader ...@@ -277,12 +275,11 @@ class GithubLoader
db_rv_comment.updated_at = rv_comment.updated_at db_rv_comment.updated_at = rv_comment.updated_at
db_rv_comment.body = rv_comment.body db_rv_comment.body = rv_comment.body
db_rv_comment.save db_rv_comment.save
# list_db_rv_comment.append(db_rv_comment)
end end
end end
end end
# list_db_rv_comment
end end
def update_issue_pull_association def update_issue_pull_association
......
lib/tasks/github.rake
...@@ -4,12 +4,6 @@ namespace :github do ...@@ -4,12 +4,6 @@ namespace :github do
$org = "ZIGExN" $org = "ZIGExN"
$logger = Logger.new("github.log") $logger = Logger.new("github.log")
desc "Task description"
task task_test: :environment do
# logger = Logger.new("test.log")
# logger.info "a message"
end
desc "Insert Zigexn Github data" desc "Insert Zigexn Github data"
task insert_github_data: :environment do task insert_github_data: :environment do
loader = GithubLoader.new loader = GithubLoader.new
...@@ -19,7 +13,7 @@ namespace :github do ...@@ -19,7 +13,7 @@ namespace :github do
loader.insert_repos($client) loader.insert_repos($client)
loader.insert_users($client) loader.insert_users($client)
loader.insert_labels($client) loader.insert_labels($client)
loader.insert_issues($client) loader.insert_issues($client, Repository.all)
loader.update_issue_pull_association loader.update_issue_pull_association
...@@ -66,32 +60,13 @@ namespace :github do ...@@ -66,32 +60,13 @@ namespace :github do
task insert_github_data_for_specific_repos: :environment do task insert_github_data_for_specific_repos: :environment do
loader = GithubLoader.new loader = GithubLoader.new
start_time = Time.now start_time = Time.now
repos_to_update = Other.where(data_type: 2).map{ |x|x.data } repos_to_update = Other.where(data_type: 2).map{ |x| x.data }
$logger.info "Begin task update " + repos_to_update.to_s $logger.info "Begin task update " + repos_to_update.to_s
list_db_repo = Repository.where(name: repos_to_update) list_db_repo = Repository.where(name: repos_to_update)
list_db_user = User.all loader.insert_issues($client, list_db_repo)
list_db_label = Label.all loader.insert_comments($client, list_db_repo)
list_db_issue = loader.insert_issues($client, list_db_user, list_db_label, list_db_repo) loader.insert_review_comments($client, list_db_repo)
list_db_comment = loader.insert_comments($client, list_db_repo)
list_db_rv_comment = loader.insert_review_comments($client, list_db_repo)
$logger.info "begin transaction"
start_time_transaction = Time.now
ActiveRecord::Base.transaction do
list_db_issue.each do |db_issue|
db_issue.save
end
list_db_comment.each do |db_comment|
db_comment.save
end
list_db_rv_comment.each do |db_rv_comment|
db_rv_comment.save
end
end
$logger.info "Finished transaction in #{Time.now - start_time_transaction}s"
$logger.info "Finished task update in #{Time.now - start_time}s" $logger.info "Finished task update in #{Time.now - start_time}s"
end end
......
test/controllers/pulls_controller_test.rb 0 → 100644
require 'test_helper'
class PullsControllerTest < ActionDispatch::IntegrationTest
# test "the truth" do
# assert true
# end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment