!important"
-id="<%="notificationModal#{notification.id}"%>" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+
+
" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-
+
- <%= notification.description %>
+ <%= notification.description %>
+
+ <%= image_tag notification.item.image, class: "img-responsive rounded mx-auto d-block", style: "max-width: 13em" if notification.item.image.attached? %>
+
-
-
+
+
-
-
-
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2a293d0e..b3386f44 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -34,14 +34,20 @@ de:
deletion_history: "Verlauf"
lend_request:
title: "Ausleihanfrage"
- description: "%{user} möchte %{item} von dir ausleihen."
- description_accepted: "%{user} hat %{item} von dir ausgeliehen."
- description_declined: "Du hast abgelehnt %{item} an %{user} auszuleihen"
+ description: "%{receiver} möchte %{item} von dir ausleihen."
+ description_accepted: "%{receiver} hat %{item} von dir ausgeliehen."
+ description_declined: "Du hast abgelehnt %{item} an %{receiver} auszuleihen"
accepted: "Akzeptiert"
declined: "Abgelehnt"
return_request:
title: "Gegenstand zurückgeben"
- description: "%{user} möchte %{item} zurückgeben."
+ description: "%{receiver} möchte %{item} zurückgeben. Bitte beachte, dass der Gegenstand aus dem System entfernt wird, wenn du die Rückgabe ablehnst."
+ return_declined:
+ title: "Rückgabe abgelehnt"
+ description: "%{owner} hat die Rückgabe von %{item} abgelehnt. Dies könnte verschiedene Ursachen haben, z.B. Beschädigungen am Gegenstand. Setze dich am besten nochmal mit den Eigentümer des Gegenstandes in Kontakt."
+ return_accepted:
+ title: "Rückgabe akzeptiert"
+ description: "%{owner} hat die Rückgabe von %{item} akzeptiert. Du hast den Gegenstand also erfolgreich zurückgegeben."
added_to_waitlist:
title: "Zur Warteliste hinzugefügt"
description: "Du wurdest an Position %{position} zur Warteliste für %{item} hinzugefügt."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 85670074..cdccc964 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -65,14 +65,20 @@ en:
deletion_history: "History"
lend_request:
title: "Lend Request"
- description: "%{user} wants to borrow your %{item}."
- description_accepted: "You have lent %{item} to %{user}"
- description_declined: "You have declined to lent %{item} to %{user}"
+ description: "%{receiver} wants to borrow your %{item}."
+ description_accepted: "You have lent %{item} to %{receiver}"
+ description_declined: "You have declined to lent %{item} to %{receiver}"
accepted: "Accepted"
declined: "Declined"
return_request:
title: "Return Item"
- description: "%{user} wants to return your %{item}."
+ description: "%{receiver} wants to return your %{item}. Please note that the item will be removed from the system upon declining the return request."
+ return_declined:
+ title: "Return Declined"
+ description: "%{owner} has declined the return of %{item}. The item might be damaged, please contact the owner of the item for more information."
+ return_accepted:
+ title: "Return Accepted"
+ description: "%{owner} has accepted the return of %{item}. You successfully returned the item."
added_to_waitlist:
title: "Added to Waitlist"
description: "You have been added to Waitlist of %{item} at Position %{position}."
diff --git a/db/migrate/20230102134147_create_return_declined_notifications.rb b/db/migrate/20230102134147_create_return_declined_notifications.rb
new file mode 100644
index 00000000..87cb2648
--- /dev/null
+++ b/db/migrate/20230102134147_create_return_declined_notifications.rb
@@ -0,0 +1,10 @@
+class CreateReturnDeclinedNotifications < ActiveRecord::Migration[7.0]
+ def change
+ create_table :return_declined_notifications do |t|
+ t.references :owner, null: false, foreign_key: { to_table: :users }
+ t.string :item_name
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20230102134206_create_return_accepted_notifications.rb b/db/migrate/20230102134206_create_return_accepted_notifications.rb
new file mode 100644
index 00000000..3f8c1156
--- /dev/null
+++ b/db/migrate/20230102134206_create_return_accepted_notifications.rb
@@ -0,0 +1,10 @@
+class CreateReturnAcceptedNotifications < ActiveRecord::Migration[7.0]
+ def change
+ create_table :return_accepted_notifications do |t|
+ t.references :owner, null: false, foreign_key: { to_table: :users }
+ t.references :item, null: false, foreign_key: true
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20230102165603_change_notifications_user_to_receiver.rb b/db/migrate/20230102165603_change_notifications_user_to_receiver.rb
new file mode 100644
index 00000000..f190438b
--- /dev/null
+++ b/db/migrate/20230102165603_change_notifications_user_to_receiver.rb
@@ -0,0 +1,5 @@
+class ChangeNotificationsUserToReceiver < ActiveRecord::Migration[7.0]
+ def change
+ rename_column :notifications, :user_id, :receiver_id
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c1e59721..f39cf66a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2022_12_12_120242) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_02_165603) do
create_table "active_storage_attachments", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
@@ -100,15 +100,32 @@
create_table "notifications", force: :cascade do |t|
t.datetime "date"
- t.integer "user_id", null: false
+ t.integer "receiver_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "actable_type"
t.integer "actable_id"
- t.boolean "active", null: false
+ t.boolean "active", default: false, null: false
t.boolean "unread"
t.index ["actable_type", "actable_id"], name: "index_notifications_on_actable"
- t.index ["user_id"], name: "index_notifications_on_user_id"
+ t.index ["receiver_id"], name: "index_notifications_on_receiver_id"
+ end
+
+ create_table "return_accepted_notifications", force: :cascade do |t|
+ t.integer "owner_id", null: false
+ t.integer "item_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["item_id"], name: "index_return_accepted_notifications_on_item_id"
+ t.index ["owner_id"], name: "index_return_accepted_notifications_on_owner_id"
+ end
+
+ create_table "return_declined_notifications", force: :cascade do |t|
+ t.integer "owner_id", null: false
+ t.string "item_name"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["owner_id"], name: "index_return_declined_notifications_on_owner_id"
end
create_table "return_request_notifications", force: :cascade do |t|
@@ -159,7 +176,10 @@
add_foreign_key "memberships", "groups"
add_foreign_key "memberships", "users"
add_foreign_key "move_up_on_waitlist_notifications", "items"
- add_foreign_key "notifications", "users"
+ add_foreign_key "notifications", "users", column: "receiver_id"
+ add_foreign_key "return_accepted_notifications", "items"
+ add_foreign_key "return_accepted_notifications", "users", column: "owner_id"
+ add_foreign_key "return_declined_notifications", "users", column: "owner_id"
add_foreign_key "return_request_notifications", "items"
add_foreign_key "return_request_notifications", "users", column: "borrower_id"
add_foreign_key "waitlists", "items"
diff --git a/spec/factories/added_to_waitlist_notifications.rb b/spec/factories/added_to_waitlist_notifications.rb
index 6d14908f..5255a73a 100644
--- a/spec/factories/added_to_waitlist_notifications.rb
+++ b/spec/factories/added_to_waitlist_notifications.rb
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :added_to_waitlist_notification do
- user { nil }
+ receiver { nil }
item { nil }
end
end
diff --git a/spec/factories/items.rb b/spec/factories/items.rb
index b4158254..302580f1 100644
--- a/spec/factories/items.rb
+++ b/spec/factories/items.rb
@@ -37,7 +37,21 @@
return_checklist { "MyChecklist" }
lend_status { :lent }
holder { create(:user).id }
- owner { create(:user).id }
+ owner { holder }
+ end
+ factory :pending_return, class: 'Item' do
+ name { "MyName3" }
+ category { "MyCategory" }
+ location { "MyLocation" }
+ description { "MyDescription" }
+ image { Rack::Test::UploadedFile.new('spec/testimages/test_image.png', 'image/png') }
+ price_ct { 1 }
+ rental_duration_sec { 1 }
+ rental_start { "2022-11-18 15:32:07" }
+ return_checklist { "MyChecklist" }
+ lend_status { :pending_return }
+ holder { create(:user).id }
+ owner { holder }
end
factory :item_book, class: 'Item' do
name { "Ruby on Rails by Example" }
diff --git a/spec/factories/lend_request_notifications.rb b/spec/factories/lend_request_notifications.rb
index 1478b11a..ca74186b 100644
--- a/spec/factories/lend_request_notifications.rb
+++ b/spec/factories/lend_request_notifications.rb
@@ -5,7 +5,7 @@
sequence(:unread) { true }
sequence(:accepted) { false }
borrower { FactoryBot.build(:user) }
- user { FactoryBot.build(:user) }
+ receiver { FactoryBot.build(:user) }
item { FactoryBot.build(:item) }
end
end
diff --git a/spec/factories/return_accepted_notifications.rb b/spec/factories/return_accepted_notifications.rb
new file mode 100644
index 00000000..acacc54d
--- /dev/null
+++ b/spec/factories/return_accepted_notifications.rb
@@ -0,0 +1,13 @@
+FactoryBot.define do
+ factory :return_accepted_notification do
+ receiver { FactoryBot.build(:user) }
+ date { Time.zone.now }
+ item { FactoryBot.build(:pending_return, owner: receiver.id) }
+ owner { FactoryBot.build(:max) }
+ end
+
+ factory :invalid_return_accepted_notification, class: 'ReturnAcceptedNotification' do
+ item { FactoryBot.build(:pending_return) }
+ owner { FactoryBot.build(:max) }
+ end
+end
diff --git a/spec/factories/return_declined_notifications.rb b/spec/factories/return_declined_notifications.rb
new file mode 100644
index 00000000..0492f9dc
--- /dev/null
+++ b/spec/factories/return_declined_notifications.rb
@@ -0,0 +1,13 @@
+FactoryBot.define do
+ factory :return_declined_notification do
+ receiver { FactoryBot.build(:user) }
+ date { Time.zone.now }
+ item_name { FactoryBot.build(:lent, owner: receiver.id).name }
+ owner { FactoryBot.build(:max) }
+ end
+
+ factory :invalid_return_declined_notification, class: 'ReturnDeclinedNotification' do
+ item_name { FactoryBot.build(:lent).name }
+ owner { FactoryBot.build(:max) }
+ end
+end
diff --git a/spec/factories/return_request_notifications.rb b/spec/factories/return_request_notifications.rb
index 2361ed44..d1f81022 100644
--- a/spec/factories/return_request_notifications.rb
+++ b/spec/factories/return_request_notifications.rb
@@ -2,14 +2,14 @@
factory :return_request_notification do
active { true }
unread { true }
- user { FactoryBot.build(:user) }
+ receiver { FactoryBot.build(:user) }
date { Time.zone.now }
- item { FactoryBot.build(:pending, owner: user.id) }
+ item { FactoryBot.build(:pending_return, owner: receiver.id, holder: receiver.id) }
borrower { FactoryBot.build(:max) }
end
factory :invalid_return_request_notification, class: 'ReturnRequestNotification' do
- item { FactoryBot.build(:pending) }
+ item { FactoryBot.build(:pending_return) }
borrower { FactoryBot.build(:max) }
end
end
diff --git a/spec/features/items/show.html.erb_spec.rb b/spec/features/items/show.html.erb_spec.rb
index caadec30..655c86a2 100644
--- a/spec/features/items/show.html.erb_spec.rb
+++ b/spec/features/items/show.html.erb_spec.rb
@@ -126,7 +126,7 @@
sign_in user
visit item_path(item_lent)
find(:button, "Enter Waitlist").click
- notification = AddedToWaitlistNotification.find_by(user: user, item: item_lent)
+ notification = AddedToWaitlistNotification.find_by(receiver: user, item: item_lent)
expect(notification).not_to be_nil
end
@@ -134,7 +134,7 @@
sign_in item_lent.waitlist.users[0]
visit item_path(item_lent)
find(:button, "Leave Waitlist").click
- notification = MoveUpOnWaitlistNotification.find_by(user: Item.find(item_lent.id).waitlist.users[0],
+ notification = MoveUpOnWaitlistNotification.find_by(receiver: Item.find(item_lent.id).waitlist.users[0],
item: item_lent)
expect(notification).not_to be_nil
end
diff --git a/spec/features/notifications/lend_request_notification_spec.rb b/spec/features/notifications/lend_request_notification_spec.rb
index 1002cd9f..89dda555 100644
--- a/spec/features/notifications/lend_request_notification_spec.rb
+++ b/spec/features/notifications/lend_request_notification_spec.rb
@@ -9,7 +9,7 @@
before do
sign_in user
- @notification = build(:lend_request_notification, user: user, item: item, borrower: borrower, active: true)
+ @notification = build(:lend_request_notification, receiver: user, item: item, borrower: borrower, active: true)
@notification.save
end
diff --git a/spec/features/notifications/notifications_spec.rb b/spec/features/notifications/notifications_spec.rb
index c82f6061..19feb311 100644
--- a/spec/features/notifications/notifications_spec.rb
+++ b/spec/features/notifications/notifications_spec.rb
@@ -11,7 +11,7 @@
FactoryBot.reload
# need to use some subclass of notification
# because notifications are "abstract"
- @notifications = create_list(:lend_request_notification, 5, user: user, item: item, borrower: borrower)
+ @notifications = create_list(:lend_request_notification, 5, receiver: user, item: item, borrower: borrower)
@notifications.each(&:save)
end
diff --git a/spec/features/notifications/return_request_notifications_spec.rb b/spec/features/notifications/return_request_notifications_spec.rb
index f5d786e0..69c72c0d 100644
--- a/spec/features/notifications/return_request_notifications_spec.rb
+++ b/spec/features/notifications/return_request_notifications_spec.rb
@@ -3,20 +3,17 @@
describe "Return Request Notifications", type: :feature do
let(:password) { 'password' }
let(:user) { create(:user, password: password) }
- let(:borrower) { create(:max, password: password) }
- let(:item) { create(:pending, owner: user.id) }
before do
sign_in user
FactoryBot.reload
- @notification = build(:return_request_notification, user: user, item: item, borrower: borrower, active: true)
+ @notification = build(:return_request_notification, receiver: user, active: true)
@notification.item.waitlist = Waitlist.new
@notification.save
end
it "shows an accept and decline button" do
visit notifications_path(id: @notification.id)
- click_button("Check")
expect(page).to have_button("Accept")
expect(page).to have_button("Decline")
end
@@ -31,11 +28,32 @@
expect(ReturnRequestNotification.exists?(@notification.id)).to be false
end
- it "deletes the notification upon clicking on 'Decline" do
+ it "deletes the notification upon clicking on 'Decline'" do
visit notifications_path(id: @notification.id)
expect(ReturnRequestNotification.exists?(@notification.id)).to be true
- click_button('Check')
click_button('Decline')
expect(ReturnRequestNotification.exists?(@notification.id)).to be false
end
+
+ it "sends a return accepted notification upon clicking on 'Accept'" do
+ visit notifications_path(id: @notification.id)
+ expect(ReturnRequestNotification.exists?(@notification.id)).to be true
+ click_button('Accept')
+ @accepted_notification = Notification.find_by(receiver: @notification.item.holder,
+ actable_type: "ReturnAcceptedNotification")
+ expect(@accepted_notification.nil?).to be false
+ expect(ReturnAcceptedNotification.exists?(id: @accepted_notification.actable_id,
+ item: @notification.item)).to be true
+ end
+
+ it "sends a return denied notification upon clicking on 'Decline" do
+ visit notifications_path(id: @notification.id)
+ expect(ReturnRequestNotification.exists?(@notification.id)).to be true
+ click_button('Decline')
+ @declined_notification = Notification.find_by(receiver: @notification.item.holder,
+ actable_type: "ReturnDeclinedNotification")
+ expect(@declined_notification.nil?).to be false
+ expect(ReturnDeclinedNotification.exists?(id: @declined_notification.actable_id,
+ item_name: @notification.item.name)).to be true
+ end
end
diff --git a/spec/models/lend_request_notification_spec.rb b/spec/models/lend_request_notification_spec.rb
index d2ab2352..0f14921c 100644
--- a/spec/models/lend_request_notification_spec.rb
+++ b/spec/models/lend_request_notification_spec.rb
@@ -9,7 +9,7 @@
end
it "belongs to a user, a date, an item and a borrower" do
- expect(notification.user).not_to be_blank
+ expect(notification.receiver).not_to be_blank
expect(notification.item).not_to be_blank
expect(notification.borrower).not_to be_blank
expect(notification.date).not_to be_blank
diff --git a/spec/models/return_accepted_notification_spec.rb b/spec/models/return_accepted_notification_spec.rb
new file mode 100644
index 00000000..11302c9f
--- /dev/null
+++ b/spec/models/return_accepted_notification_spec.rb
@@ -0,0 +1,34 @@
+require "rails_helper"
+
+RSpec.describe ReturnAcceptedNotification, type: :model do
+
+ let(:notification) { build(:return_accepted_notification) }
+ let(:invalid_notification) { build(:invalid_return_accepted_notification) }
+
+ it "is creatable via a factory" do
+ expect(notification).to be_valid
+ end
+
+ it 'is not valid when the receiver and/or date is missing' do
+ expect(invalid_notification).not_to be_valid
+ end
+
+ it "belongs to a receiver, a date, an item and a owner" do
+ expect(notification.receiver).not_to be_blank
+ expect(notification.item).not_to be_blank
+ expect(notification.owner).not_to be_blank
+ expect(notification.date).not_to be_blank
+ end
+
+ it "has differently translated title and description" do
+ title, description = ""
+ I18n.with_locale(:en) do
+ title = notification.title
+ description = notification.description
+ end
+ I18n.with_locale(:de) do
+ expect(notification.title).not_to eq title
+ expect(notification.description).not_to eq description
+ end
+ end
+end
diff --git a/spec/models/return_declined_notification_spec.rb b/spec/models/return_declined_notification_spec.rb
new file mode 100644
index 00000000..67d91551
--- /dev/null
+++ b/spec/models/return_declined_notification_spec.rb
@@ -0,0 +1,34 @@
+require 'rails_helper'
+
+RSpec.describe ReturnDeclinedNotification, type: :model do
+
+ let(:notification) { build(:return_declined_notification) }
+ let(:invalid_notification) { build(:invalid_return_declined_notification) }
+
+ it "is creatable via a factory" do
+ expect(notification).to be_valid
+ end
+
+ it 'is not valid when the receiver and/or date is missing' do
+ expect(invalid_notification).not_to be_valid
+ end
+
+ it "belongs to a receiver, a date, an item name and a owner" do
+ expect(notification.receiver).not_to be_blank
+ expect(notification.item_name).not_to be_blank
+ expect(notification.owner).not_to be_blank
+ expect(notification.date).not_to be_blank
+ end
+
+ it "has differently translated title and description" do
+ title, description = ""
+ I18n.with_locale(:en) do
+ title = notification.title
+ description = notification.description
+ end
+ I18n.with_locale(:de) do
+ expect(notification.title).not_to eq title
+ expect(notification.description).not_to eq description
+ end
+ end
+end
diff --git a/spec/models/waitlist_spec.rb b/spec/models/waitlist_spec.rb
index 032db5c3..5f2d4193 100644
--- a/spec/models/waitlist_spec.rb
+++ b/spec/models/waitlist_spec.rb
@@ -47,7 +47,7 @@
waitlist = create(:waitlist_with_item)
user = create(:peter)
waitlist.add_user(user)
- notification = AddedToWaitlistNotification.find_by(user: user, item: waitlist.item)
+ notification = AddedToWaitlistNotification.find_by(receiver: user, item: waitlist.item)
expect(notification).not_to be_nil
end
@@ -55,7 +55,7 @@
waitlist = create(:waitlist_with_item)
user = waitlist.users[0]
waitlist.remove_user(user)
- notification = MoveUpOnWaitlistNotification.find_by(user: waitlist.users[0], item: waitlist.item)
+ notification = MoveUpOnWaitlistNotification.find_by(receiver: waitlist.users[0], item: waitlist.item)
expect(notification).not_to be_nil
end
end