<%= render partial: 'votes/vote', locals: { meal_post: meal_post } %>
-
<%= link_to meal_post.content, meal_post_path(meal_post) %>
+
+ <%= link_to meal_post.content, meal_post_path(meal_post) %>
+ (<%= total_count_and_calories_of(meal_post) %>)
+
<%= meal_post.time %>
- <%= link_to '評価してる人', meal_post_upvoters_path(meal_post) %>
- <%= link_to '呆れてる人', meal_post_downvoters_path(meal_post) %>
+ <%= link_to '高評価した人', meal_post_upvoters_path(meal_post) %>
+ <%= link_to '低評価した人', meal_post_downvoters_path(meal_post) %>
<% if current_user == meal_post.user %>
- <%= link_to "Delete this post", meal_post_path(meal_post),
+ <%= link_to "投稿削除", meal_post_path(meal_post),
method: "delete", remote: true %>
<% end %>
diff --git a/app/views/meal_posts/_new.html.erb b/app/views/meal_posts/_new.html.erb
index 4c074c2..8323aed 100644
--- a/app/views/meal_posts/_new.html.erb
+++ b/app/views/meal_posts/_new.html.erb
@@ -1,17 +1,22 @@
-
-
-<%= form_for @new_meal_post, remote: true do |f| %>
+<%= form_for new_meal_post, remote: true do |f| %>
- <%= f.label :content %>
- <%= f.text_field :content %>
-
+ <%= f.text_field :content, placeholder: 'メニュー名' %>
+
- <%= f.label :time %>
- <%= f.text_field :time, class: 'datetimepicker' %>
+ <%= f.text_field :time, class: 'datetimepicker', placeholder: '食べた日時を選択' %>
- <%= f.submit "Submit" %>
+ <%= f.submit "投稿する" %>
<% end %>
diff --git a/app/views/meal_posts/_total_calories.html.erb b/app/views/meal_posts/_total_calories.html.erb
new file mode 100644
index 0000000..dd99445
--- /dev/null
+++ b/app/views/meal_posts/_total_calories.html.erb
@@ -0,0 +1,8 @@
+
diff --git a/app/views/meal_posts/create.js.erb b/app/views/meal_posts/create.js.erb
index 58734fe..74e05f1 100644
--- a/app/views/meal_posts/create.js.erb
+++ b/app/views/meal_posts/create.js.erb
@@ -1,3 +1,10 @@
console.log("post successfully created");
-// TODO: prependではなくtimeの順番にしたがってしかるべきところに挿入する
+<%# TODO: prependではなくtimeの順番にしたがってしかるべきところに挿入する %>
$(".meal-posts").find(".card").first().prepend("<%= escape_javascript(render(partial: 'meal_posts/meal_post', locals: {meal_post: @new_meal_post})) %>");
+$(".new_meal_post").replaceWith('<%= escape_javascript(render(partial: 'meal_posts/new', locals: {new_meal_post: @next_meal_post})) %>');
+flatpickr(".datetimepicker", {
+ altInput: true,
+ enableTime: true,
+ dateFormat: "Y-m-d H:i",
+ inline: true
+});
diff --git a/app/views/meal_posts/create_failure.js.erb b/app/views/meal_posts/create_failure.js.erb
new file mode 100644
index 0000000..0f45ea8
--- /dev/null
+++ b/app/views/meal_posts/create_failure.js.erb
@@ -0,0 +1,5 @@
+console.log('You could not create your meal post.');
+$(".meal_post_errors").remove();
+errorMessages = '
';
+$(".new_meal_post").prepend(errorMessages);
+
diff --git a/app/views/meal_posts/index.html.erb b/app/views/meal_posts/index.html.erb
index 47d1de4..ca83802 100644
--- a/app/views/meal_posts/index.html.erb
+++ b/app/views/meal_posts/index.html.erb
@@ -1,5 +1,5 @@
-
<% meal_posts&.each do |meal_post| %>
<%= render partial: 'meal_posts/meal_post', locals: {meal_post: meal_post} %>
diff --git a/app/views/meal_posts/show.html.erb b/app/views/meal_posts/show.html.erb
index 2370b2a..2f43a2a 100644
--- a/app/views/meal_posts/show.html.erb
+++ b/app/views/meal_posts/show.html.erb
@@ -1,5 +1,22 @@
このMealPostの詳細
<%= render partial: 'meal_post', locals: {meal_post: @meal_post} %>
+
+
-
+
+
+
+ <%= render partial: 'total_calories', locals: {meal_post: @meal_post}%>
+
+
+ <% if @is_own_meal_post %>
+
+ <%= render partial: 'meal_posts/new', locals: {new_meal_post: @meal_post} %>
+
+ <% end %>
+
+
+
+
+
diff --git a/app/views/meal_posts/update.js.erb b/app/views/meal_posts/update.js.erb
new file mode 100644
index 0000000..b33bd83
--- /dev/null
+++ b/app/views/meal_posts/update.js.erb
@@ -0,0 +1,10 @@
+console.log("post successfully updated");
+$(".total_calories").replaceWith('<%= escape_javascript(render partial: 'meal_posts/total_calories', locals: {meal_post: @meal_post}) %>');
+$(".edit_meal_post").replaceWith('<%= escape_javascript(render partial: 'meal_posts/edit', locals: {meal_post: @meal_post}) %>')
+$("div.edit_meal_post").prepend('食事の投稿を更新できました
');
+flatpickr(".datetimepicker", {
+ altInput: true,
+ enableTime: true,
+ dateFormat: "Y-m-d H:i",
+ inline: true
+});
diff --git a/app/views/meal_posts/update_failure.js.erb b/app/views/meal_posts/update_failure.js.erb
new file mode 100644
index 0000000..742cd7e
--- /dev/null
+++ b/app/views/meal_posts/update_failure.js.erb
@@ -0,0 +1,8 @@
+console.log('You could not edit your meal post.');
+$(".edit_meal_post").replaceWith('<%= escape_javascript(render partial: 'meal_posts/edit', locals: {meal_post: @meal_post}) %>')
+flatpickr(".datetimepicker", {
+ altInput: true,
+ enableTime: true,
+ dateFormat: "Y-m-d H:i",
+ inline: true
+});
diff --git a/config/routes.rb b/config/routes.rb
index bcbf4a4..42de653 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,7 +31,7 @@
end
resources :relationships, only: %i[create destroy]
- resources :meal_posts, only: %i[create destroy show] do
+ resources :meal_posts, only: %i[create destroy show update] do
patch :upvote, to: 'votes#upvote'
patch :downvote, to: 'votes#downvote'
get :upvoters, to: 'users#upvoters_index'
diff --git a/db/migrate/20200426062256_create_food_items.rb b/db/migrate/20200426062256_create_food_items.rb
new file mode 100644
index 0000000..3650830
--- /dev/null
+++ b/db/migrate/20200426062256_create_food_items.rb
@@ -0,0 +1,10 @@
+class CreateFoodItems < ActiveRecord::Migration[6.0]
+ def change
+ create_table :food_items do |t|
+ t.string :name, null: false
+ t.string :amount
+ t.bigint :calory
+ t.references :meal_post, null: false, foreign_key: true
+ end
+ end
+end
diff --git a/db/migrate/20200504084917_add_columns_to_meal_posts.rb b/db/migrate/20200504084917_add_columns_to_meal_posts.rb
new file mode 100644
index 0000000..c6d45c7
--- /dev/null
+++ b/db/migrate/20200504084917_add_columns_to_meal_posts.rb
@@ -0,0 +1,10 @@
+class AddColumnsToMealPosts < ActiveRecord::Migration[6.0]
+ def change
+ add_column :meal_posts, :total_calories, :integer, default: nil
+ add_column :meal_posts, :food_items_count, :integer, default: 0, null: false
+ add_column :meal_posts, :food_items_with_calories_count, :integer, default: 0, null: false
+
+ # counter_cache for existing records
+ FoodItem.counter_culture_fix_counts
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6d1c4ef..0894693 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,17 +10,28 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_04_19_122131) do
+ActiveRecord::Schema.define(version: 2020_05_04_084917) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
+ create_table "food_items", force: :cascade do |t|
+ t.string "name", null: false
+ t.string "amount"
+ t.bigint "calory"
+ t.bigint "meal_post_id", null: false
+ t.index ["meal_post_id"], name: "index_food_items_on_meal_post_id"
+ end
+
create_table "meal_posts", force: :cascade do |t|
t.text "content"
t.datetime "time"
t.bigint "user_id"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
+ t.integer "total_calories"
+ t.integer "food_items_count", default: 0, null: false
+ t.integer "food_items_with_calories_count", default: 0, null: false
t.index ["user_id"], name: "index_meal_posts_on_user_id"
end
@@ -66,6 +77,7 @@
t.index ["user_id"], name: "index_votes_on_user_id"
end
+ add_foreign_key "food_items", "meal_posts"
add_foreign_key "meal_posts", "users"
add_foreign_key "votes", "meal_posts"
add_foreign_key "votes", "users"
diff --git a/package-lock.json b/package-lock.json
index 0e68041..9f104fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2025,6 +2025,18 @@
"q": "^1.1.2"
}
},
+ "cocoon": {
+ "version": "github:nathanvda/cocoon#c24ba53b40e688e7d8b7212824139ec7f352a242",
+ "from": "github:nathanvda/cocoon#c24ba53"
+ },
+ "cocoon-js": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/cocoon-js/-/cocoon-js-0.0.5.tgz",
+ "integrity": "sha512-1h51/2LDnZdyQehtIIA4eqCMSef4yFvUwXQF1XWRp12KSVLCXrvuGOsnoEm7OXviM7wgEiTf1nAkjbyws9i1EQ==",
+ "requires": {
+ "jquery": "^3.2.1"
+ }
+ },
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
diff --git a/package.json b/package.json
index d5be6f4..4172303 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,8 @@
"@rails/ujs": "^6.0.0",
"@rails/webpacker": "4.2.2",
"bootstrap": "^4.4.1",
+ "cocoon": "github:nathanvda/cocoon#c24ba53",
+ "cocoon-js": "^0.0.5",
"flatpickr": "^4.6.3",
"jquery": "^3.5.0",
"popper.js": "^1.16.1",
diff --git a/spec/factories/food_item.rb b/spec/factories/food_item.rb
new file mode 100644
index 0000000..bb2f632
--- /dev/null
+++ b/spec/factories/food_item.rb
@@ -0,0 +1,7 @@
+FactoryBot.define do
+ factory :food_item do
+ name { Faker::Food.dish }
+ amount { Faker::Lorem.word }
+ calory { Faker::Number.within(range: 1..1000) }
+ end
+end
diff --git a/spec/factories/meal_posts.rb b/spec/factories/meal_posts.rb
index 127b810..bbb470d 100644
--- a/spec/factories/meal_posts.rb
+++ b/spec/factories/meal_posts.rb
@@ -3,5 +3,8 @@
content { Faker::Lorem.words }
time { Faker::Time.between(from: DateTime.now - 10.years, to: DateTime.now) }
user
+ after(:build) do |this_meal_post|
+ this_meal_post.food_items << build(:food_item, meal_post: this_meal_post)
+ end
end
end
diff --git a/spec/models/food_item_spec.rb b/spec/models/food_item_spec.rb
new file mode 100644
index 0000000..d602864
--- /dev/null
+++ b/spec/models/food_item_spec.rb
@@ -0,0 +1,87 @@
+require 'rails_helper'
+
+RSpec.describe FoodItem, type: :model do
+ let(:meal_post) { create(:meal_post) }
+ let(:food_item) { create(:food_item, meal_post: meal_post) }
+
+ describe 'FactoryBot' do
+ it 'instantiates valid FoodItem model' do
+ expect(food_item).to be_valid
+ end
+ end
+
+ describe 'Validation' do
+ it 'is invalid without name' do
+ food_item.name = nil
+ expect(food_item).not_to be_valid
+ expect(food_item.errors[:name].size).to eq 1
+ expect(food_item.errors[:name]).to match_array ["can't be blank"]
+ end
+
+ it 'requires name composed of 1-30 letters excluding surrounding blank spaces' do
+ fi = create(:food_item, meal_post: meal_post)
+ fi.name = ' '
+ expect(fi).not_to be_valid
+ expect(fi.errors.size).to eq 1
+ expect(fi.errors[:name]).to match_array ["can't be blank"]
+
+ fi2 = create(:food_item, meal_post: meal_post)
+ fi2.name = ' a '
+ fi2.save
+ # also confirm that it is stripped when saving
+ expect(fi2).to be_valid
+ expect(fi2.name).to eq 'a'
+
+ fi3 = create(:food_item, meal_post: meal_post)
+ fi3.name = 'a' * 30 + ' '
+ expect(fi3).to be_valid
+
+ fi3 = create(:food_item, meal_post: meal_post)
+ fi3.name = 'a' * 31 + ' '
+ expect(fi3).to be_invalid
+ end
+
+ it 'is requires amount composed of 1-30 letters excluding surrounding blank spaces' do
+ fi = create(:food_item, meal_post: meal_post)
+ fi.amount = ' '
+ expect(fi).to be_valid
+
+ fi2 = create(:food_item, meal_post: meal_post)
+ fi2.amount = ' a '
+ fi2.save
+ # also confirm that it is stripped when saving
+ expect(fi2).to be_valid
+ expect(fi2.amount).to eq 'a'
+
+ fi3 = create(:food_item, meal_post: meal_post)
+ fi3.amount = 'a' * 30 + ' '
+ expect(fi3).to be_valid
+
+ fi3 = create(:food_item, meal_post: meal_post)
+ fi3.amount = 'a' * 31 + ' '
+ expect(fi3).to be_invalid
+ end
+
+ it 'is requires calory composed of positive integer' do
+ fi = create(:food_item, meal_post: meal_post)
+ fi.calory = 100
+ expect(fi).to be_valid
+
+ fi = create(:food_item, meal_post: meal_post)
+ fi.calory = nil
+ expect(fi).to be_valid
+
+ fi2 = create(:food_item, meal_post: meal_post)
+ fi2.calory = 0
+ expect(fi2).to be_invalid
+ expect(fi2.errors.size).to eq 1
+ expect(fi2.errors[:calory]).to match_array ['must be greater than 0']
+
+ fi3 = create(:food_item, meal_post: meal_post)
+ fi3.calory = 1.5
+ expect(fi3).to be_invalid
+ expect(fi3.errors.size).to eq 1
+ expect(fi3.errors[:calory]).to match_array ['must be an integer']
+ end
+ end
+end
diff --git a/spec/models/meal_post_spec.rb b/spec/models/meal_post_spec.rb
index e04da60..823fdc1 100644
--- a/spec/models/meal_post_spec.rb
+++ b/spec/models/meal_post_spec.rb
@@ -43,6 +43,14 @@
m_post = build(:meal_post, user: user, content: 'a' * 200)
expect(m_post).to be_valid
end
+
+ it 'is invalid without any meal_post' do
+ m_post = build(:meal_post, user: user)
+ m_post.food_items = []
+ expect(m_post).not_to be_valid
+ expect(m_post.errors.size).to eq 1
+ expect(m_post.errors[:food_items]).to match_array ['should have at least 1 food item.']
+ end
end
describe 'List of meal_posts' do
diff --git a/yarn.lock b/yarn.lock
index 0f1fbbe..931c606 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1785,6 +1785,17 @@ coa@^2.0.2:
chalk "^2.4.1"
q "^1.1.2"
+cocoon-js@^0.0.5:
+ version "0.0.5"
+ resolved "https://registry.yarnpkg.com/cocoon-js/-/cocoon-js-0.0.5.tgz#2d269db2e3375014dbc43e4dda3bdd8d161b238b"
+ integrity sha512-1h51/2LDnZdyQehtIIA4eqCMSef4yFvUwXQF1XWRp12KSVLCXrvuGOsnoEm7OXviM7wgEiTf1nAkjbyws9i1EQ==
+ dependencies:
+ jquery "^3.2.1"
+
+"cocoon@github:nathanvda/cocoon#c24ba53":
+ version "1.2.10"
+ resolved "https://codeload.github.com/nathanvda/cocoon/tar.gz/c24ba53b40e688e7d8b7212824139ec7f352a242"
+
code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -3839,6 +3850,11 @@ jest-worker@^25.1.0:
merge-stream "^2.0.0"
supports-color "^7.0.0"
+jquery@^3.2.1:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+ integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
+
jquery@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"