From 333249ac1f8c9a0412c29fa02c2f769dd038a85d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 11:36:52 +0000 Subject: [PATCH 1/4] chore(deps): update active_model_otp digest to d41713e --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3d9c3724..0850c81f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: '6ed9927' +gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: 'd41713e61c40ee4edf4bf64da908dac89e009258' gem 'dav4rack', git: 'https://github.com/csvalpha/dav4rack.git', ref: '8541e53' gem 'bcrypt', '~> 3.1', '>= 3.1.20' From b42a88d75732bf149236220dec0377b08f152e6c Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:03:31 +0100 Subject: [PATCH 2/4] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0850c81f..32725175 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: 'd41713e61c40ee4edf4bf64da908dac89e009258' +gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: 'd41713e' gem 'dav4rack', git: 'https://github.com/csvalpha/dav4rack.git', ref: '8541e53' gem 'bcrypt', '~> 3.1', '>= 3.1.20' From 2ff050e7705949f8429b9bc40f6a817c53e2b27c Mon Sep 17 00:00:00 2001 From: Jorai Geertsema Date: Sun, 19 Jan 2025 17:41:31 +0100 Subject: [PATCH 3/4] intial commit --- app/models/study_room_presence.rb | 2 +- spec/factories/study_room_presences.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/study_room_presence.rb b/app/models/study_room_presence.rb index a6ae4ecc..0313fecb 100644 --- a/app/models/study_room_presence.rb +++ b/app/models/study_room_presence.rb @@ -4,7 +4,7 @@ class StudyRoomPresence < ApplicationRecord validates :start_time, presence: true validates :end_time, presence: true validates_datetime :end_time, after: :start_time - validates :status, inclusion: { in: %w[chilling studying banaan] } + validates :status, inclusion: { in: %w[chilling studying vergaderen] } scope :current, (lambda { where('start_time <= :current_time AND end_time >= :current_time', diff --git a/spec/factories/study_room_presences.rb b/spec/factories/study_room_presences.rb index 31bc0d4b..4db1fa7f 100644 --- a/spec/factories/study_room_presences.rb +++ b/spec/factories/study_room_presences.rb @@ -2,7 +2,7 @@ factory :study_room_presence do start_time { Faker::Time.between(from: 3.days.ago, to: 5.days.ago) } end_time { Faker::Time.between(from: 10.days.from_now, to: 5.days.from_now) } - status { %w[chilling studying banaan].sample } + status { %w[chilling studying vergaderen].sample } user trait(:future) { start_time { Faker::Time.between(from: 1.day.from_now, to: 4.days.from_now) } } From b3fea47b5c44fab313368428b84d901574e979f3 Mon Sep 17 00:00:00 2001 From: lodewiges <131907615+lodewiges@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:44:50 +0100 Subject: [PATCH 4/4] remove activemodel update --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 32725175..3d9c3724 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: 'd41713e' +gem 'active_model_otp', git: 'https://github.com/heapsource/active_model_otp.git', ref: '6ed9927' gem 'dav4rack', git: 'https://github.com/csvalpha/dav4rack.git', ref: '8541e53' gem 'bcrypt', '~> 3.1', '>= 3.1.20'