enju_circulation 0.4.0.beta.4 → 0.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 516387cbac4a70663f83ded054892637bf98e5f6d64233017821acced1942296
-  data.tar.gz: 90e73348c2f3293cf0d418733fed3215545dd528b6f3147a3a6ba6274260c0bb
+  metadata.gz: d8fcd1cfe77ab4212272e640bb1adb78422a1dcd3aa3dd7d44a6a028fd5f140c
+  data.tar.gz: 81bfde2ee1205d7a8a3f892cf4dfd98d88106fbd5a55f98ab0dfe226af66594b
 SHA512:
-  metadata.gz: 04f9013ee9f47db46c91f466e6cbf780e64b1ff9a24a867aab041d0dd983efe12e7c19dae88834e9a157c6511f05e9b0973d0b8b15a0f1f466c506aef062c0f9
-  data.tar.gz: 91d41e5eeba412df21206023bb4bb95911decf8cb40503b0887b0a581180c6b27e9f68bd16ea5f8a3c4e03875fff91402b540c1b10e9f85772c35e70e5b10760
+  metadata.gz: a43d1848806014026e757b3d531c975bb16eb716d7af4bc660e14bf8bc74852d659c1995c9bdd9ac7dae79c938bb78bb70deb5a53f99f8f6926d6b75e2ba4eb0
+  data.tar.gz: 26d59d22ec2a036b9ee43e2917275900f5b71848272c9ae33874f721fda32620e8b70fe9aa781b304d0cd5f0b51e00d4706fcda78ef63faf2f5699b25626c45f

data/README.md

@@ -1,5 +1,5 @@
 # EnjuCirculation
-![](https://github.com/next-l/enju_circulation/workflows/Ruby/badge.svg?branch=2.x)
+[![CircleCI](https://circleci.com/gh/next-l/enju_circulation/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_circulation/tree/2.x)
 [![Coverage Status](https://coveralls.io/repos/github/next-l/enju_circulation/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_circulation?branch=2.x)
 
 This project rocks and uses MIT-LICENSE.

data/app/models/carrier_type_has_checkout_type.rb

@@ -16,11 +16,11 @@ end
 #
 # Table name: carrier_type_has_checkout_types
 #
-#  id               :integer          not null, primary key
-#  carrier_type_id  :integer          not null
-#  checkout_type_id :integer          not null
+#  id               :bigint           not null, primary key
+#  carrier_type_id  :bigint           not null
+#  checkout_type_id :bigint           not null
 #  note             :text
 #  position         :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #

data/app/models/checked_item.rb

@@ -116,12 +116,12 @@ end
 #
 # Table name: checked_items
 #
-#  id           :integer          not null, primary key
-#  item_id      :integer          not null
-#  basket_id    :integer          not null
-#  librarian_id :integer
+#  id           :bigint           not null, primary key
+#  item_id      :bigint           not null
+#  basket_id    :bigint           not null
+#  librarian_id :bigint
 #  due_date     :datetime         not null
-#  created_at   :datetime
-#  updated_at   :datetime
-#  user_id      :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  user_id      :bigint
 #

data/app/models/checkin.rb

@@ -85,12 +85,12 @@ end
 #
 # Table name: checkins
 #
-#  id           :integer          not null, primary key
-#  item_id      :integer          not null
-#  librarian_id :integer
-#  basket_id    :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id           :bigint           not null, primary key
+#  item_id      :bigint           not null
+#  librarian_id :bigint
+#  basket_id    :bigint
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  lock_version :integer          default(0), not null
-#  checkin_id   :bigint
+#  checkout_id  :bigint
 #

data/app/models/checkout.rb

@@ -167,17 +167,17 @@ end
 #
 # Table name: checkouts
 #
-#  id                     :integer          not null, primary key
-#  user_id                :integer
-#  item_id                :integer          not null
-#  checkin_id             :integer
-#  librarian_id           :integer
-#  basket_id              :integer
+#  id                     :bigint           not null, primary key
+#  user_id                :bigint
+#  item_id                :bigint           not null
+#  checkin_id             :bigint
+#  librarian_id           :bigint
+#  basket_id              :bigint
 #  due_date               :datetime
 #  checkout_renewal_count :integer          default(0), not null
 #  lock_version           :integer          default(0), not null
-#  created_at             :datetime
-#  updated_at             :datetime
-#  shelf_id               :integer
-#  library_id             :integer
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  shelf_id               :bigint
+#  library_id             :bigint
 #

data/app/models/checkout_stat_has_manifestation.rb

@@ -14,10 +14,10 @@ end
 #
 # Table name: checkout_stat_has_manifestations
 #
-#  id                             :integer          not null, primary key
-#  manifestation_checkout_stat_id :integer          not null
-#  manifestation_id               :integer          not null
+#  id                             :bigint           not null, primary key
+#  manifestation_checkout_stat_id :bigint           not null
+#  manifestation_id               :bigint           not null
 #  checkouts_count                :integer
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #

data/app/models/checkout_stat_has_user.rb

@@ -14,10 +14,10 @@ end
 #
 # Table name: checkout_stat_has_users
 #
-#  id                    :integer          not null, primary key
-#  user_checkout_stat_id :integer          not null
-#  user_id               :integer          not null
+#  id                    :bigint           not null, primary key
+#  user_checkout_stat_id :bigint           not null
+#  user_id               :bigint           not null
 #  checkouts_count       :integer          default(0), not null
-#  created_at            :datetime
-#  updated_at            :datetime
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #

data/app/models/checkout_type.rb

@@ -19,12 +19,12 @@ end
 #
 # Table name: checkout_types
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/circulation_status.rb

@@ -17,12 +17,12 @@ end
 #
 # Table name: circulation_statuses
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/concerns/enju_circulation/enju_item.rb

@@ -35,12 +35,13 @@ module EnjuCirculation
       has_many :reserves
       has_many :checked_items
       has_many :baskets, through: :checked_items
-      belongs_to :circulation_status, validate: true
+      belongs_to :circulation_status
       belongs_to :checkout_type
       has_one :item_has_use_restriction, dependent: :destroy
       has_one :use_restriction, through: :item_has_use_restriction
-      validates_associated :circulation_status, :checkout_type
       validates :circulation_status, :checkout_type, presence: true
+      validate :check_circulation_status
+
       searchable do
         string :circulation_status do
           circulation_status.name
@@ -53,6 +54,14 @@ module EnjuCirculation
       self.circulation_status = CirculationStatus.find_by(name: 'In Process') if circulation_status.nil?
     end
 
+    def check_circulation_status
+      #circulation_status.name_will_change!
+      #return unless circulation_status.name_change.first == 'Removed'
+      return unless circulation_status.name == 'Removed'
+      errors[:base] << I18n.t('activerecord.errors.models.item.attributes.circulation_status_id.is_rented') if rented?
+      errors[:base] << I18n.t('activerecord.errors.models.item.attributes.circulation_status_id.is_reserved') if reserved?
+    end
+
     def checkout_status(user)
       return nil unless user
        user.profile.user_group.user_group_has_checkout_types.find_by(checkout_type_id: checkout_type.id)
@@ -68,6 +77,10 @@ module EnjuCirculation
       false
     end
 
+    def rented?
+      rent?
+    end
+
     def reserved_by_user?(user)
       if manifestation.next_reservation
         return true if manifestation.next_reservation.user == user

data/app/models/concerns/enju_circulation/enju_withdraw.rb

@@ -3,7 +3,8 @@ module EnjuCirculation
     extend ActiveSupport::Concern
 
     included do
-      before_save :withdraw!, on: :create
+      before_create :withdraw!
+      validate :check_item
     end
 
     def withdraw!
@@ -12,5 +13,10 @@ module EnjuCirculation
       item.use_restriction = UseRestriction.where(name: 'Not For Loan').first
       item.index!
     end
+
+    def check_item
+      errors.add(:item_id, :is_rented) if item.try(:rent?)
+      errors.add(:item_id, :is_reserved) if item.try(:reserved?)
+    end
   end
 end

data/app/models/demand.rb

@@ -8,10 +8,10 @@ end
 #
 # Table name: demands
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  item_id    :integer
-#  message_id :integer
+#  id         :bigint           not null, primary key
+#  user_id    :bigint
+#  item_id    :bigint
+#  message_id :bigint
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #

data/app/models/item_has_use_restriction.rb

@@ -14,9 +14,9 @@ end
 #
 # Table name: item_has_use_restrictions
 #
-#  id                 :integer          not null, primary key
-#  item_id            :integer          not null
-#  use_restriction_id :integer          not null
-#  created_at         :datetime
-#  updated_at         :datetime
+#  id                 :bigint           not null, primary key
+#  item_id            :bigint           not null
+#  use_restriction_id :bigint           not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #

data/app/models/manifestation_checkout_stat.rb

@@ -39,29 +39,19 @@ class ManifestationCheckoutStat < ApplicationRecord
     transition_to!(:completed)
     send_message
   end
-
-  private
-
-  def self.transition_class
-    ManifestationCheckoutStatTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: manifestation_checkout_stats
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
-#  user_id      :integer
+#  user_id      :bigint
 #

data/app/models/manifestation_checkout_stat_transition.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: manifestation_checkout_stat_transitions
 #
-#  id                             :integer          not null, primary key
+#  id                             :bigint           not null, primary key
 #  to_state                       :string
 #  metadata                       :text             default({})
 #  sort_key                       :integer
 #  manifestation_checkout_stat_id :integer
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #  most_recent                    :boolean          not null
 #

data/app/models/manifestation_reserve_stat.rb

@@ -39,29 +39,19 @@ class ManifestationReserveStat < ApplicationRecord
     transition_to!(:completed)
     send_message
   end
-
-  private
-
-  def self.transition_class
-    ManifestationReserveStatTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: manifestation_reserve_stats
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
-#  user_id      :integer
+#  user_id      :bigint
 #

data/app/models/manifestation_reserve_stat_transition.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: manifestation_reserve_stat_transitions
 #
-#  id                            :integer          not null, primary key
+#  id                            :bigint           not null, primary key
 #  to_state                      :string
 #  metadata                      :text             default({})
 #  sort_key                      :integer
 #  manifestation_reserve_stat_id :integer
-#  created_at                    :datetime
-#  updated_at                    :datetime
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #  most_recent                   :boolean          not null
 #

data/app/models/reserve.rb

@@ -374,7 +374,7 @@ class Reserve < ApplicationRecord
   end
 
   def manifestation_must_include_item
-    if item_id.present? && !completed?
+    if manifestation && item && !completed?
       errors[:base] << I18n.t('reserve.invalid_item') unless manifestation.items.include?(item)
     end
   end
@@ -382,31 +382,22 @@ class Reserve < ApplicationRecord
   if defined?(EnjuInterLibraryLoan)
     has_one :inter_library_loan
   end
-
-  def self.transition_class
-    ReserveTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: reserves
 #
-#  id                           :integer          not null, primary key
-#  user_id                      :integer          not null
-#  manifestation_id             :integer          not null
-#  item_id                      :integer
-#  request_status_type_id       :integer          not null
+#  id                           :bigint           not null, primary key
+#  user_id                      :bigint           not null
+#  manifestation_id             :bigint           not null
+#  item_id                      :bigint
+#  request_status_type_id       :bigint           not null
 #  checked_out_at               :datetime
-#  created_at                   :datetime
-#  updated_at                   :datetime
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
-#  deleted_at                   :datetime
 #  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
 #  pickup_location_id           :integer

data/app/models/reserve_stat_has_manifestation.rb

@@ -12,10 +12,10 @@ end
 #
 # Table name: reserve_stat_has_manifestations
 #
-#  id                            :integer          not null, primary key
-#  manifestation_reserve_stat_id :integer          not null
-#  manifestation_id              :integer          not null
+#  id                            :bigint           not null, primary key
+#  manifestation_reserve_stat_id :bigint           not null
+#  manifestation_id              :bigint           not null
 #  reserves_count                :integer
-#  created_at                    :datetime
-#  updated_at                    :datetime
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #

data/app/models/reserve_stat_has_user.rb

@@ -15,10 +15,10 @@ end
 #
 # Table name: reserve_stat_has_users
 #
-#  id                   :integer          not null, primary key
-#  user_reserve_stat_id :integer          not null
-#  user_id              :integer          not null
+#  id                   :bigint           not null, primary key
+#  user_reserve_stat_id :bigint           not null
+#  user_id              :bigint           not null
 #  reserves_count       :integer
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #

data/app/models/reserve_transition.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: reserve_transitions
 #
-#  id          :integer          not null, primary key
+#  id          :bigint           not null, primary key
 #  to_state    :string
 #  metadata    :text             default({})
 #  sort_key    :integer
 #  reserve_id  :integer
-#  created_at  :datetime
-#  updated_at  :datetime
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
 #  most_recent :boolean          not null
 #

data/app/models/use_restriction.rb

@@ -18,12 +18,12 @@ end
 #
 # Table name: use_restrictions
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/user_checkout_stat.rb

@@ -38,29 +38,19 @@ class UserCheckoutStat < ApplicationRecord
     transition_to!(:completed)
     send_message
   end
-
-  private
-
-  def self.transition_class
-    UserCheckoutStatTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: user_checkout_stats
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
-#  user_id      :integer
+#  user_id      :bigint
 #

data/app/models/user_checkout_stat_transition.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: user_checkout_stat_transitions
 #
-#  id                    :integer          not null, primary key
+#  id                    :bigint           not null, primary key
 #  to_state              :string
 #  metadata              :text             default({})
 #  sort_key              :integer
 #  user_checkout_stat_id :integer
-#  created_at            :datetime
-#  updated_at            :datetime
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #  most_recent           :boolean          not null
 #

data/app/models/user_group_has_checkout_type.rb

@@ -46,9 +46,9 @@ end
 #
 # Table name: user_group_has_checkout_types
 #
-#  id                             :integer          not null, primary key
-#  user_group_id                  :integer          not null
-#  checkout_type_id               :integer          not null
+#  id                             :bigint           not null, primary key
+#  user_group_id                  :bigint           not null
+#  checkout_type_id               :bigint           not null
 #  checkout_limit                 :integer          default(0), not null
 #  checkout_period                :integer          default(0), not null
 #  checkout_renewal_limit         :integer          default(0), not null
@@ -58,7 +58,7 @@ end
 #  fixed_due_date                 :datetime
 #  note                           :text
 #  position                       :integer
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #  current_checkout_count         :integer
 #

data/app/models/user_reserve_stat.rb

@@ -38,29 +38,19 @@ class UserReserveStat < ApplicationRecord
     transition_to!(:completed)
     send_message
   end
-
-  private
-
-  def self.transition_class
-    UserReserveStatTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: user_reserve_stats
 #
-#  id           :integer          not null, primary key
+#  id           :bigint           not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
-#  user_id      :integer
+#  user_id      :bigint
 #

data/app/models/user_reserve_stat_transition.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: user_reserve_stat_transitions
 #
-#  id                   :integer          not null, primary key
+#  id                   :bigint           not null, primary key
 #  to_state             :string
 #  metadata             :text             default({})
 #  sort_key             :integer
 #  user_reserve_stat_id :integer
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #  most_recent          :boolean          not null
 #

data/app/views/checked_items/edit.html.erb

@@ -11,11 +11,6 @@
     <%= f.label t('activerecord.models.basket') -%><br />
     <%= f.text_field :basket_id -%>
   </div>
-
-  <div class="actions">
-    <%= f.hidden_field :lock_version %>
-    <%= f.submit %>
-  </div>
 <%- end -%>
 
 <%= link_to t('page.show'), checked_item_path(@checked_item) -%> |

data/app/views/checkouts/_list.html.erb

@@ -24,6 +24,13 @@
         <%= link_to checkout.shelf.display_name, checkout.shelf %>
         (<%= link_to checkout.shelf.library.display_name, checkout.shelf.library %>)
       <% end %>
+      <% if checkout.item.manifestation.next_reservation %>
+        <br />
+        (<%= link_to_if(current_user.has_role?('Librarian'),
+            t('page.number_of_reservations',
+            count: Reserve.waiting.where(manifestation_id: checkout.item.manifestation.id, checked_out_at: nil).count),
+            reserves_path(query: "manifestation_id_i:#{checkout.item.manifestation.id}")) -%>)
+      <% end %>
     </td>
     <td>
       <%= l(checkout.due_date, format: :only_date) -%>