Merge pull request #3176 from fjordllc/feature/remove_features_of_books

書籍貸出に関する機能の削除
fjordllc · Sep 6, 2021 · 2cefbf6 · 2cefbf6
2 parents 20929c1 + 7644314
commit 2cefbf6
Show file tree

Hide file tree

Showing 48 changed files with 21 additions and 743 deletions.
diff --git a/Gemfile b/Gemfile
@@ -44,7 +44,6 @@ gem 'rails_autolink'
 gem 'rails-i18n'
 gem 'ransack'
 gem 'rollbar'
-gem 'rqrcode'
 gem 'slim-rails'
 gem 'sorcery'
 gem 'sorcery-jwt'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -107,7 +107,6 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
-    chunky_png (1.4.0)
     cocoon (1.2.15)
     coderay (1.1.3)
     coffee-rails (5.0.0)
@@ -345,10 +344,6 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rollbar (3.1.1)
-    rqrcode (1.2.0)
-      chunky_png (~> 1.0)
-      rqrcode_core (~> 0.2)
-    rqrcode_core (0.2.0)
     rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -531,7 +526,6 @@ DEPENDENCIES
   rails_autolink
   ransack
   rollbar
-  rqrcode
   rubocop
   rubocop-fjord
   rubocop-minitest

diff --git a/app/assets/images/pijord-book-logo.svg b/app/assets/images/pijord-book-logo.svg
diff --git a/app/assets/stylesheets/qrcodes.sass b/app/assets/stylesheets/qrcodes.sass
diff --git a/app/controllers/admin/books/qrcodes_controller.rb b/app/controllers/admin/books/qrcodes_controller.rb
diff --git a/app/controllers/admin/books_controller.rb b/app/controllers/admin/books_controller.rb
diff --git a/app/controllers/books/borrowed_controller.rb b/app/controllers/books/borrowed_controller.rb
diff --git a/app/controllers/books/search_results_controller.rb b/app/controllers/books/search_results_controller.rb
diff --git a/app/controllers/books_controller.rb b/app/controllers/books_controller.rb
diff --git a/app/controllers/borrowings_controller.rb b/app/controllers/borrowings_controller.rb
diff --git a/app/decorators/book_decorator.rb b/app/decorators/book_decorator.rb
diff --git a/app/models/book.rb b/app/models/book.rb
diff --git a/app/models/borrowing.rb b/app/models/borrowing.rb
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -45,7 +45,6 @@ class User < ApplicationRecord
   belongs_to :company, optional: true
   belongs_to :course
   has_many :learnings, dependent: :destroy
-  has_many :borrowings, dependent: :destroy
   has_many :pages, dependent: :destroy
   has_many :comments,      dependent: :destroy
   has_many :reports,       dependent: :destroy
@@ -97,9 +96,6 @@ class User < ApplicationRecord
            source: :practice,
            dependent: :destroy
 
-  has_many :books,
-           through: :borrowings
-
   has_many :active_relationships,
            class_name: 'Following',
            foreign_key: 'follower_id',
@@ -479,20 +475,6 @@ def unread_notifications_exists?
     unread_notifications_count.positive?
   end
 
-  def borrow(book)
-    book.update(borrowed: true)
-    borrowings.create(book_id: book.id)
-  end
-
-  def give_back(book)
-    book.update(borrowed: false)
-    borrowings.find_by(book_id: book.id).destroy
-  end
-
-  def borrowing?(book)
-    borrowings.exists?(book_id: book.id)
-  end
-
   def avatar_url
     default_image_path = '/images/users/avatars/default.png'
     if avatar.attached?

diff --git a/app/views/admin/_admin_page_tabs.html.slim b/app/views/admin/_admin_page_tabs.html.slim
@@ -21,10 +21,6 @@
         = link_to '企業',
           admin_companies_path,
           class: "page-tabs__item-link #{current_link(/^admin-companies/)}"
-      li.page-tabs__item
-        = link_to '書籍',
-          admin_books_path,
-          class: "page-tabs__item-link #{current_link(/^admin-books/)}"
       li.page-tabs__item
         = link_to '席',
           admin_seats_path,

diff --git a/app/views/admin/books/_form.html.slim b/app/views/admin/books/_form.html.slim
diff --git a/app/views/admin/books/_table.html.slim b/app/views/admin/books/_table.html.slim
diff --git a/app/views/admin/books/edit.html.slim b/app/views/admin/books/edit.html.slim