Added user purchases page and listing index to only show unpurchased items

Author: vincentlieu

app/controllers/listings_controller.rb

@@ -4,7 +4,15 @@ class ListingsController < ApplicationController
   before_action :set_listing, only: [:show, :favourite]
 
   def index()
-    @listings = Listing.all.order("listings.created_at DESC")
+    @all_listings = Listing.all.order("id DESC")
+    @listings = []
+
+    # Don't show listings that have been purchased.
+    @all_listings.each do |listing|
+      if listing.purchase == nil
+        @listings.push(listing)
+      end
+    end
   end
 
   def new()
@@ -85,7 +93,7 @@ def destroy()
     redirect_to listings_path
   end
 
-  def favourite
+  def favourite()
     type = params[:type]
     if type == "favourite"
       current_user.favourites << @listing

app/controllers/payments_controller.rb

@@ -10,9 +10,10 @@ def webhook()
     listing_id = payment.metadata.listing_id
     user_id = payment.metadata.user_id
 
-    p "listing id " + listing_id
-    p "user id " + user_id
-
-    status 200
+    Purchase.create(
+      user_id: user_id,
+      listing_id: listing_id,
+      stripe_receipt: payment_id,
+    )
   end
 end

app/controllers/users_controller.rb

@@ -1,13 +1,17 @@
 class UsersController < ApplicationController
   before_action :authenticate_user!
-  before_action :set_user, only: [:show, :favourites]
+  before_action :set_user, only: [:show, :favourites, :purchases]
 
   def show()
     @user = User.find(params[:id])
   end
 
   def favourites()
-    @user = User.find(params[:id])
+    @favourites = current_user.favourites
+  end
+
+  def purchases()
+    @purchases = current_user.purchases.order("id DESC")
   end
 
   private

app/models/listing.rb

@@ -4,7 +4,11 @@ class Listing < ApplicationRecord
   belongs_to :category
   belongs_to :brand
   has_one_attached :picture
+
   has_many :favourite_listings, dependent: :destroy
   has_many :favourited_by, through: :favourite_listings, source: :user
+
+  has_one :purchase
+
   validates :title, :price, :condition_id, :brand_id, :category_id, presence: :true
 end

app/models/purchase.rb

@@ -0,0 +1,6 @@
+class Purchase < ApplicationRecord
+  belongs_to :user
+  belongs_to :listing
+
+  validates :listing, uniqueness: true
+end

app/models/user.rb

@@ -10,5 +10,7 @@ class User < ApplicationRecord
   has_many :favourite_listings
   has_many :favourites, through: :favourite_listings, source: :listing
 
+  has_many :purchases
+
   validates :full_name, presence: true
 end

app/views/devise/registrations/edit.html.erb

@@ -2,7 +2,7 @@
     <div class="align-self-center">
       <% if current_user.avatar.attached? %>
           <%= image_tag current_user.avatar, class: "rounded" %>
-          <% else %>
+      <% else %>
           <%= image_tag "placeholder-avatar.png", class: "rounded" %>
       <% end %>
     </div>

app/views/listings/index.html.erb

@@ -2,9 +2,9 @@
     <%= link_to "Create new", new_listing_path, class: "btn btn-primary" %>
 </div>
 
-<div class="d-flex flex-wrap justify-content-around mt-2">
+<div class="d-flex flex-wrap mt-2">
     <% @listings.each do |listing| %>
-    <div class= "card m-3", style= "width 15rem">
+    <div class= "card m-3", style= "width: 300px">
         <% if listing.picture.attached? %>
         <%= image_tag listing.picture, class: "card-img-top", style: "width: 250px; height: 250px;" %>
     <% else %>

app/views/listings/show.html.erb

@@ -1,5 +1,6 @@
 <div class="d-flex justify-content-end">
 <% if current_user.id == @listing.user_id %>
+<% # Check current user owns the listing then show Edit/Remove functions %>
   <div>
     <%= link_to "Edit", edit_listing_path(@listing), class: "btn btn-primary mr-2" %>
     <%= link_to "Remove", listing_path(@listing.id), data: { toggle: "modal", target: "#RemoveListingModal" }, class: "btn btn-danger" %>
@@ -29,12 +30,12 @@
       </div>
     </div>
 <% else %>
-  <% # Check to see if the user has already favourited the listing %>
-    <% if current_user.favourites.exists?(@listing.id) %>
-      <%= link_to image_tag("favourited.svg"), favourite_listing_path(@listing, type: "unfavourite", id: @listing.id), data: { toggle: "tooltip", placement: "bottom", title: "Favourited" }, method: :put %>
-  <% else %>
-    <%= link_to image_tag("favourite.svg"), favourite_listing_path(@listing, type: "favourite", id: @listing.id), data: { toggle: "tooltip", placement: "bottom", title: "Add to Favourites" }, method: :put %>
-  <% end %>
+    <% # Check if the user has already favourited the listing %>
+      <% if current_user.favourites.exists?(@listing.id) %>
+        <%= link_to image_tag("favourited.svg"), favourite_listing_path(@listing, type: "unfavourite", id: @listing.id), data: { toggle: "tooltip", placement: "bottom", title: "Favourited" }, method: :put %>
+      <% else %>
+        <%= link_to image_tag("favourite.svg"), favourite_listing_path(@listing, type: "favourite", id: @listing.id), data: { toggle: "tooltip", placement: "bottom", title: "Add to Favourites" }, method: :put %>
+    <% end %>
 <% end %>
 </div>
 
@@ -64,11 +65,17 @@
             <h5>Description:</h5>
             <%= @listing.description %>
         </div>
-        <% if current_user.id != @listing.user_id %>
+        <% if current_user.id != @listing.user_id && @listing.purchase == nil %>
         <div class="mb-2">
           <button data-stripe="payment" class="btn btn-primary">Purchase</button>
         </div>
         <% end %>
+        <% if @listing.purchase != nil %>
+        <div class="mb-2">
+          <button class="btn btn-danger disabled">SOLD</button><br>
+          <small class="text-muted"><%= @listing.purchase.created_at.strftime("%Y/%m/%d %H:%M") %></small>
+        </div>
+        <% end %>
     </div>
 </div>
 

app/views/shared/_navigation_bar.html.erb

@@ -17,6 +17,7 @@
           </a>
           <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
             <%= link_to "Favourites", user_favourites_path(current_user.id), class: "dropdown-item" %>
+            <%= link_to "Purchases", user_purchases_path(current_user.id), class: "dropdown-item" %>
             <%= link_to "Edit Account", edit_user_registration_path, class: "dropdown-item" %>
           <div class="dropdown-divider"></div>
             <%= link_to "Log off", destroy_user_session_path, method: :delete, class: "dropdown-item" %>

app/views/users/favourites.html.erb

@@ -1,3 +1,4 @@
-<% @user.favourites.each do |favourite| %>
+<h2>Favourites</h2>
+<% @favourites.each do |favourite| %>
     <li><%= link_to favourite.title, listing_path(favourite.id) %></li>
 <% end %>

app/views/users/listings.html.erb

@@ -0,0 +1,28 @@
+<div class="container">
+    <h2>Purchases</h2>
+</div>
+<% if @purchases == nil %>
+<div class="container">
+    <div class="row">
+        <div class="col font-weight-bold">Date</div>
+        <div class="col font-weight-bold">Item</div>
+        <div class="col font-weight-bold">Receipt</div>
+    </div>
+<% @purchases.each do |purchase| %>
+    <div class="row">
+        <div class="col">
+            <%= purchase.created_at.strftime("%Y/%m/%d %H:%M") %>
+        </div>
+        <div class="col">
+            <%= link_to purchase.listing.title, listing_path(purchase.listing_id) %>
+        </div>
+        <div class="col">
+            <%= purchase.stripe_receipt %>
+        </div>
+    </div>
+    <% end %>
+<% else %>
+    <div class="container">
+        <%= "You haven't made any purchases yet." %>
+    </div>
+<% end %>

app/views/users/purchases.html.erb

@@ -17,6 +17,7 @@
 
   get "/users/:id", to: "users#show", as: "user_profile"
   get "/users/:id/favourites", to: "users#favourites", as: "user_favourites"
+  get "/users/:id/purchases", to: "users#purchases", as: "user_purchases"
 
   get "/payments/success", to: "payments#success"
   post "/payments/webhook", to: "payments#webhook"

config/routes.rb

@@ -0,0 +1,11 @@
+class CreatePurchases < ActiveRecord::Migration[5.2]
+  def change
+    create_table :purchases do |t|
+      t.references :user, foreign_key: true
+      t.references :listing, foreign_key: true
+      t.string :stripe_receipt
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20200515070610_create_purchases.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_05_14_010507) do
+ActiveRecord::Schema.define(version: 2020_05_15_070610) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -80,6 +80,16 @@
     t.index ["user_id"], name: "index_listings_on_user_id"
   end
 
+  create_table "purchases", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "listing_id"
+    t.string "stripe_receipt"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["listing_id"], name: "index_purchases_on_listing_id"
+    t.index ["user_id"], name: "index_purchases_on_user_id"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
@@ -102,4 +112,6 @@
   add_foreign_key "listings", "categories"
   add_foreign_key "listings", "conditions"
   add_foreign_key "listings", "users"
+  add_foreign_key "purchases", "listings"
+  add_foreign_key "purchases", "users"
 end