mumuki-domain 9.0.4 → 9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a503cf97148dbefc08c07e442bb086ac2eb37ad13e00abb39497f980e5b2e5ec
-  data.tar.gz: 41056f07210ae148026a0333518a5948739766ad70333038413f393acd7a3ad1
+  metadata.gz: 46425c74cf597dd17603273a455f7a5956c2f0b80926f81e739f45de0bd4e17e
+  data.tar.gz: 9241fe5525d3c387e726fda5037044c96564d77c802ec4af9e01de086648018e
 SHA512:
-  metadata.gz: 643e7098cd029bd2185c99ea476b3d82e04b3e161970047b310f78edef0f68b753bcf142ceab2e0b53711f353092a176c40babfef9259f437178fefcb5f483f6
-  data.tar.gz: 85e12de8b448db4fffcf1227231de46026a7e2142664a31c15310042138ed86cfd5f44aa09afe7c7bae27aaf3aeb4ab6cce9835604c809e1285301d14432beae
+  metadata.gz: f7ff8c266a27514fac9fe776572efa0ec5d742627bda381b42218364853d75bd51c22aa7aae86be0fb0c8692e9b9b43209e96bc8ac6015cebacce0f3cdb869e7
+  data.tar.gz: 4ba53f6362fcbbbb38e9be6fc19e8a90561cfb02e6a0cc2ba82e597ca5cae8fc06d768f2e0ec7ef8255366d241f5558b1a0f2409b34bedc074466792d78f27fa

data/app/models/application_record.rb

@@ -87,6 +87,22 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def self.with_temporary_token(field_name, duration = 2.hours)
+    class_eval do
+      token_attribute = field_name
+      token_date_attribute = "#{field_name}_expiration_date"
+
+      define_method("generate_#{field_name}!") do
+        update!(token_attribute => self.class.generate_secure_token, token_date_attribute => duration.from_now)
+      end
+
+      define_method("#{field_name}_matches?") do |token|
+        actual_token = attribute(token_attribute)
+        actual_token.present? && token == actual_token && attribute(token_date_attribute)&.future?
+      end
+    end
+  end
+
   def self.numbered(*associations)
     class_eval do
       associations.each do |it|
@@ -140,4 +156,8 @@ class ApplicationRecord < ActiveRecord::Base
   def raise_foreign_key_error!
     raise ActiveRecord::InvalidForeignKey.new "#{model_name} is still referenced"
   end
+
+  def self.generate_secure_token
+    SecureRandom.base58(24)
+  end
 end

data/app/models/message.rb

@@ -2,6 +2,8 @@ class Message < ApplicationRecord
 
   belongs_to :discussion, optional: true
   belongs_to :assignment, foreign_key: :submission_id, primary_key: :submission_id, optional: true
+  belongs_to :approved_by, class_name: 'User', optional: true
+
   has_one :exercise, through: :assignment
 
   validates_presence_of :content, :sender
@@ -50,14 +52,22 @@ class Message < ApplicationRecord
     update! read: true
   end
 
-  def toggle_approved!
-    toggle! :approved
+  def toggle_approved!(user)
+    if approved?
+      disapprove!
+    else
+      approve!(user)
+    end
   end
 
   def toggle_not_actually_a_question!
     toggle! :not_actually_a_question
   end
 
+  def approved?
+    approved_at?
+  end
+
   def validated?
     approved? || from_moderator?
   end
@@ -93,4 +103,14 @@ class Message < ApplicationRecord
       Assignment.find_by(submission_id: message_data.delete('submission_id'))&.receive_answer! message_data
     end
   end
+
+  private
+
+  def approve!(user)
+    update! approved: true, approved_at: Time.now, approved_by: user
+  end
+
+  def disapprove!
+    update! approved: false, approved_at: nil, approved_by: nil
+  end
 end

data/app/models/user.rb

@@ -49,6 +49,7 @@ class User < ApplicationRecord
   PLACEHOLDER_IMAGE_URL = 'user_shape.png'.freeze
 
   resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
+  with_temporary_token :delete_account_token
 
   def last_lesson
     last_guide.try(:lesson)

data/db/migrate/20210308145910_add_approved_by_and_at_to_message.rb

@@ -0,0 +1,6 @@
+class AddApprovedByAndAtToMessage < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :approved_at, :datetime
+    add_reference :messages, :approved_by, index: true
+  end
+end

data/db/migrate/20210310195602_add_delete_account_token_to_user.rb

@@ -0,0 +1,6 @@
+class AddDeleteAccountTokenToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :delete_account_token, :string
+    add_column :users, :delete_account_token_expiration_date, :datetime
+  end
+end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.0.4'
+    VERSION = '9.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.0.4
+  version: 9.0.5
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -659,6 +659,8 @@ files:
 - db/migrate/20210119190204_create_exam_registration_exam_join_table.rb
 - db/migrate/20210301210530_add_period_start_and_end_to_course.rb
 - db/migrate/20210302181654_add_faqs_to_organizations.rb
+- db/migrate/20210308145910_add_approved_by_and_at_to_message.rb
+- db/migrate/20210310195602_add_delete_account_token_to_user.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb