Feature/pbrh+ 28 add user to item waitlist

app/controllers/items_controller.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/ClassLength
 class ItemsController < ApplicationController
   before_action :set_item, only: %i[ show edit update destroy ]
 
@@ -22,15 +23,10 @@ def edit
   # POST /items or /items.json
   def create
     @item = Item.new(item_params)
-    respond_to do |format|
-      if @item.save
-        format.html { redirect_to item_url(@item), notice: t("models.item.created") }
-        format.json { render :show, status: :created, location: @item }
-      else
-        format.html { render :new, status: :unprocessable_entity }
-        format.json { render json: @item.errors, status: :unprocessable_entity }
-      end
-    end
+    @item.waitlist = Waitlist.new
+    @item.set_status_lent unless @item.holder.nil?
+
+    create_create_response
   end
 
   # PATCH/PUT /items/1 or /items/1.json
@@ -56,7 +52,29 @@ def destroy
     end
   end
 
+  def add_to_waitlist
+    @item = Item.find(params[:id])
+    @user = current_user
+
+    create_add_to_waitlist_response
+  end
+
+  def leave_waitlist
+    @item = Item.find(params[:id])
+    @user = current_user
+    @item.remove_from_waitlist(@user)
+    @item.save
+    redirect_to item_url(@item)
+  end
+
   def request_lend
+    @item = Item.find(params[:id])
+    @user = current_user
+    @item.holder = @user.id
+    @item.set_status_lent
+    @item.save
+
+    redirect_to item_url(@item)
   end
 
   def request_return
@@ -69,10 +87,17 @@ def request_return
                                                     borrower: @user)
       @notification.save
     end
-
     redirect_to item_url(@item)
   end
 
+  def accept_lend
+    @item = Item.find(params[:id])
+    @notification = LendRequestNotification.find_by(item: @item)
+    @item.set_status_lent
+    @item.holder = @notification.borrower.id
+    @item.save
+  end
+
   def accept_return
     @item = Item.find(params[:id])
     @notification = ReturnRequestNotification.find_by(item: @item)
@@ -95,6 +120,31 @@ def deny_return
 
   private
 
+  def create_create_response
+    respond_to do |format|
+      if @item.save
+        format.html { redirect_to item_url(@item), notice: t("models.item.created") }
+        format.json { render :show, status: :created, location: @item }
+      else
+        format.html { render :new, status: :unprocessable_entity }
+        format.json { render json: @item.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def create_add_to_waitlist_response
+    respond_to do |format|
+      if @item.add_to_waitlist(@user) && @item.save
+        format.html do
+          redirect_to item_url(@item),
+                      notice: t("models.waitlist.added_to_waitlist", position: @item.waitlist.position(@user) + 1)
+        end
+      else
+        format.html { redirect_to item_url(@item), alert: t("models.waitlist.failed_adding_to_waitlist") }
+      end
+    end
+  end
+
   # Use callbacks to share common setup or constraints between actions.
   def set_item
     @item = Item.find(params[:id])
@@ -103,6 +153,8 @@ def set_item
   # Only allow a list of trusted parameters through.
   def item_params
     params.require(:item).permit(:name, :category, :location, :description, :image, :price_ct, :rental_duration_sec,
-                                 :rental_start, :return_checklist, :owner, :holder, :lend_status)
+                                 :rental_start, :return_checklist, :owner, :holder, :waitlist_id, :lend_status)
   end
 end
+
+# rubocop:enable Metrics/ClassLength

app/models/added_to_waitlist_notification.rb

@@ -0,0 +1,15 @@
+# class of a notification send to user, when he/her has been added to a waitlist.
+class AddedToWaitlistNotification < ApplicationRecord
+  acts_as :notification
+
+  belongs_to :item
+
+  def title
+    I18n.t("views.notifications.added_to_waitlist.title")
+  end
+
+  def description
+    I18n.t("views.notifications.added_to_waitlist.description", position: item.waitlist.position(user) + 1,
+                                                                item: item.name)
+  end
+end

app/models/item.rb

@@ -1,6 +1,7 @@
 # class of a basic item.
 class Item < ApplicationRecord
   has_one_attached :image
+  has_one :waitlist, dependent: :destroy
   has_many :lend_request_notifications, dependent: :destroy
   has_and_belongs_to_many :users, join_table: "wishlist"
 
@@ -39,7 +40,19 @@ def deny_return
     # TODO
   end
 
+  def set_status_lent
+    self.lend_status = :lent
+  end
+
   def price_in_euro=(euros)
     self.price_ct = euros * 100
   end
+
+  def add_to_waitlist(user)
+    waitlist.add_user(user)
+  end
+
+  def remove_from_waitlist(user)
+    waitlist.remove_user(user)
+  end
 end

app/models/move_up_on_waitlist_notification.rb

@@ -0,0 +1,15 @@
+# class of a notification send to user, when position in a waitlist changes.
+class MoveUpOnWaitlistNotification < ApplicationRecord
+  acts_as :notification
+
+  belongs_to :item
+
+  def title
+    I18n.t("views.notifications.move_up_on_waitlist.title")
+  end
+
+  def description
+    I18n.t("views.notifications.move_up_on_waitlist.description", position: item.waitlist.position(user) + 1,
+                                                                  item: item.name)
+  end
+end

app/models/user.rb

@@ -13,6 +13,8 @@ class User < ApplicationRecord
   has_many :ownerships, class_name: 'Ownership', dependent: :destroy
   has_many :owned_groups, through: :ownerships, source: :group
 
+  has_and_belongs_to_many :waitlists
+
   def email_parts
     email.split("@")[0].split(".")
   end

app/models/waitlist.rb

@@ -0,0 +1,67 @@
+# Waitlist model for handling adding and removing of users from items waitlist and corresponding side effects.
+class Waitlist < ApplicationRecord
+  belongs_to :item
+  has_and_belongs_to_many :users
+
+  def position(user)
+    users.find_index(user)
+  end
+
+  def first_user
+    users.first
+  end
+
+  def add_user(user)
+    unless users.exists?(user.id) || user.id == item.owner
+      users << user
+      add_added_to_waitlist_notification(user)
+      return true
+    end
+    false
+  end
+
+  def remove_user(user)
+    user_index = users.find_index(user)
+    users.delete(user)
+
+    delete_waitlist_notifications(user)
+
+    return if user_index.nil? || user_index >= users.size
+
+    users[user_index..].each do |temp_user|
+      delete_waitlist_notifications(temp_user)
+      add_move_up_on_waitlist_notification(temp_user)
+    end
+  end
+
+  private
+
+  def delete_waitlist_notifications(user)
+    delete_added_to_waitlist_notification(user)
+    delete_moved_up_on_waitlist_notification(user)
+  end
+
+  def add_added_to_waitlist_notification(user)
+    @notification = AddedToWaitlistNotification.new(user: user, date: Time.zone.now, item: item)
+    @notification.save
+  end
+
+  def add_move_up_on_waitlist_notification(user)
+    @notification = MoveUpOnWaitlistNotification.new(user: user, date: Time.zone.now, item: item)
+    @notification.save
+  end
+
+  def delete_added_to_waitlist_notification(user)
+    @notification = AddedToWaitlistNotification.find_by(item: item, user: user)
+    return if @notification.nil?
+
+    @notification.destroy
+  end
+
+  def delete_moved_up_on_waitlist_notification(user)
+    @notification = MoveUpOnWaitlistNotification.find_by(item: item, user: user)
+    return if @notification.nil?
+
+    @notification.destroy
+  end
+end

app/views/items/show.html.erb

@@ -148,15 +148,31 @@
       <p class="body1"><%= User.find(@item.owner).email %></p>
       <p class="subtitle"><%= t('views.show_item.lend_until')%></p>
       <p class="body1"><%= ((@item.rental_start.nil? ? Time.now() : @item.rental_start) + (@item.rental_duration_sec.nil? ? 86400 : @item.rental_duration_sec)).strftime('%d.%m.%Y') %></p>
-      <% if !current_user.nil? && @item.holder == current_user.id %>
-        <%= button_to t('views.show_item.return'), action:"request_return" %>
-      <% else %>
-        <% if @item.lend_status == "available" %>
-          <%= button_to t('views.show_item.borrow'), action:"request_lend" %>
+      <p class="subtitle"><%= t('views.show_item.waitlist')%></p>
+      <p class="body1">
+        <% if !current_user.nil? %>
+          <% if [email protected]?(current_user.id) %>
+            <%= t('views.show_item.users_waiting', amount: @item.waitlist.users.size) %>
+          <% else %>
+            <%= t('views.show_item.waitlist_position', position: @item.waitlist.users.find_index(current_user) + 1) %>      
+          <% end %>
+        <% end %>
+      </p>
+      <% if !current_user.nil? && current_user.id != @item.owner %>
+        <% if @item.holder == current_user.id %>
+          <%= button_to t('views.show_item.return'), { action: "request_return" }, class: "primaryButton" %>
         <% else %>
-          <%= button_to t('views.show_item.enter_waitlist') %>
+          <% if @item.lend_status == "available" %>
+            <%= button_to t('views.show_item.lend'), { action: "request_lend" }, class: "primaryButton" %>
+          <% else %>
+            <% if [email protected]?(current_user.id) %>
+              <%= button_to t('views.show_item.enter_waitlist'), { action: "add_to_waitlist" }, class: "primaryButton" %>
+            <% else %>
+              <%= button_to t('views.show_item.leave_waitlist'), { action: "leave_waitlist" }, class: "primaryButton" %>
+            <% end %>
+          <% end %>
         <% end %>
-      <% end %> 
+      <% end %>
       <br><br><br>
     </div>
   </div>

app/views/notifications/_lend_request_notification.html.erb

@@ -18,7 +18,7 @@
       </div>
       <div class="modal-footer">        
         <%= button_to t("defaults.decline"), "/", class:"btn btn-danger" %>
-        <%= button_to t("defaults.accept"), "/" , class:"btn btn-success" %>
+        <%= button_to t("defaults.accept"), accept_lend_path(id: notification.item.id) , class:"btn btn-success" %>
       </div>
     </div>
   </div>

app/views/notifications/index.html.erb

@@ -8,18 +8,10 @@
     <div class="notification-grey-box">
     <% notifications.each do |notification|%>
       <div class="container notification">
-        <div class="row row-cols-2 ">          
-          <div class="col-sm-1 align-self-center">
+        <div class="row ">          
+          <div class="col align-self-center">
             <%= render_if_exists notification.custom_partial, notification: notification %>
-          </div>
-          <div class="col-sm-11 align-self-center ">
-            <h3>
-                <%= notification.title %>
-            </h3>
-            <p>
-              <%= notification.description %>
-            </p>
-          </div>
+          </div>          
         </div>
       </div>
     <% end %>