Merge pull request #53 from doxa-tech/v2/cards-validity

Add a (information) validity attribute to cards

app/controllers/users/cards_controller.rb

@@ -3,26 +3,20 @@ class Users::CardsController < ApplicationController
   layout "admin"
 
   def edit
-    @confirm = params[:confirm]
-    @confirmed = params[:confirmed]
-
+    @confirmed = params[:confirmed] == "true"
     @card = card
   end
 
   def update
     @card = card
-    @card.last_updated = Time.current
-
-    if @card.update(card_params)
-      if params[:confirmed]
-        redirect_to edit_users_card_path(@card, confirmed:true), success: "Ton groupe a été mis à jour"
-      else
-        redirect_to edit_users_card_path(@card), success: "Ton groupe a été mis à jour"
-      end
+    @card.assign_attributes(card_params)
+    was_outdated = !@card.maintained?
+    if @card.valid?
+      @card.last_updated = Time.current
+      @card.validity = :maintained
+      @card.save
+      redirect_to edit_users_card_path(@card, confirmed: was_outdated), success: "Ton groupe a été mis à jour"
     else
-      if params[:confirmed]
-        @confirming = true
-      end
       render 'edit'
     end
   end

app/models/card.rb

@@ -9,6 +9,7 @@ class Card < ApplicationRecord
 
   enum card_type: [:youth, :adult, :activist, :organization, :network, :training]
   enum status: [:pending, :online, :incomplete, :change]
+  enum validity: [:maintained, :solicited, :disabled]
 
   belongs_to :location, optional: true # validation made manually according to the step
   belongs_to :user

app/views/users/cards/_confirmed.html.erb

@@ -0,0 +1,12 @@
+<div data-controller="popup">
+  <div class="standard-popup active" data-popup-target="content">
+    <div class="content">
+
+      <p>Merci d'avoir confirmé ton groupe. Aucune autre action de ta part n'est nécessaire.</p>
+
+      <div class="buttons">
+        <button class="cancel" type="button" data-action="popup#close">Fermer</button>
+      </div>
+    </div>
+  </div>
+</div>

app/views/users/cards/_outdated.html.erb

@@ -0,0 +1,13 @@
+<div data-controller="popup">
+  <div class="standard-popup active" data-popup-target="content">
+    <div class="content">
+
+      <p>Merci de vérifier (et mettre à jour si nécessaire) les informations de ton groupe.</p>
+      <p>Quand tu as fini, clique sur le bouton <b>"Sauvegarder et mettre à jour"</b>, même si tu n'a fait aucun changement.</p>
+
+      <div class="buttons">
+        <button class="cancel" type="button" data-action="popup#close">Fermer</button>
+      </div>
+    </div>
+  </div>
+</div>

app/views/users/cards/edit.html.erb

@@ -5,37 +5,10 @@
   <%= link_to "Voir le groupe", card_path(@card) %>
 <% end %>
 
-<% if @confirm %>
-  <div data-controller="popup">
-    <div class="standard-popup active" data-popup-target="content">
-      <div class="content">
-
-        <p>Merci de vérifier (et mettre à jour si nécessaire) les information de ton groupe.</p>
-        <p>Quand tu as fini, clique sur le bouton <b>"Sauvegarder et mettre à jour"</b>, même si tu n'a fait aucune mise à jour.</p>
-
-        <div class="buttons">
-          <button class="cancel" type="button" data-action="popup#close">Fermer</button>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
-
-<% if @confirmed %>
-  <div data-controller="popup">
-    <div class="standard-popup active" data-popup-target="content">
-      <div class="content">
-
-        <p>Merci d'avoir confirmé ton groupe. Aucune autre action de ta part n'est nécessaire.</p>
-
-        <div class="buttons">
-          <button class="cancel" type="button" data-action="popup#close">Fermer</button>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
+<%= render "outdated" if !@card.maintained? %>
 
+<%= render "confirmed" if @confirmed %>
+
 <section class="std-container top-container">
   <div class="left">
     <div class="title red">
@@ -71,10 +44,6 @@
 
 <%= render "error_messages", object: f.object %>
 
-<% if @confirm || @confirming %>
-  <%= hidden_field_tag 'confirmed', true  %>
-<% end %>
-
 <section class="std-container content-container">
 
   <div class="left">

db/migrate/20211219170017_add_validity_to_cards.rb

@@ -0,0 +1,5 @@
+class AddValidityToCards < ActiveRecord::Migration[6.0]
+  def change
+    add_column :cards, :validity, :integer, default: 0
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_06_163807) do
+ActiveRecord::Schema.define(version: 2021_12_19_170017) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -112,6 +112,7 @@
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.datetime "last_updated"
+    t.integer "validity", default: 0
     t.index ["location_id"], name: "index_cards_on_location_id"
     t.index ["user_id"], name: "index_cards_on_user_id"
   end

features/cards/edit.feature

@@ -1,4 +1,4 @@
-Feature: update a card
+Feature: Update a card
 
   So that the card's information are update
   as the owner
@@ -13,6 +13,7 @@ Feature: update a card
     When I visit the card's update page
     And I update the card's name with "Spacestation"
     Then I should see "Spacestation"
+    And I should not see "Merci d'avoir confirmé ton groupe"
 
   Scenario: I update the card with an error
     When I visit the card's update page

features/cards/validity.feature

@@ -0,0 +1,25 @@
+Feature: Confirm the validity of a card
+
+  So that my card is not disabled
+  as the owner
+  I want to update the card
+
+  Background:
+    Given I am a confirmed user
+    And I am signed in
+
+  Scenario: The card is up-to-date
+    Given I have a complete card
+    When I visit the card's update page
+    Then I should not see "Merci de vérifier"
+
+  Scenario: The owner received a request to confirm the card
+    Given I have a card that must be confirmed
+    When I visit the card's update page
+    Then I should see "Merci de vérifier"
+
+  Scenario: I update an card after a request
+    Given I have a card that must be confirmed
+    When I visit the card's update page
+    And I click the button "Sauvegarder et mettre à jour"
+    Then I should see "Merci d'avoir confirmé ton groupe"

features/step_definitions/cards/confirmation_steps.rb

@@ -2,6 +2,10 @@
   @card = create(:card, user: @user)
 end
 
+Given('I have a card that must be confirmed') do
+  @card = create(:card, user: @user, validity: :solicited)
+end
+
 Given("I have an incomplete card") do
   visit "/cards/wizards/new"
   step "I complete the first step and submit it"

lib/tasks/cards_update_check.rake

@@ -32,13 +32,14 @@ namespace :cards_update do
 
       if step == 4
         # => To be implemented in model
-        #card.deactivated = true
-        #card.save
+        card.update_attribute(:validity, :disabled)
 
         Admin::CardMailer.deactivated(card).deliver_now
       end
 
       if step != -1
+        card.update_attribute(:validity, :outdated) if step < 4 && !@card.outdated
+
         CardMailer.update_check(card, step).deliver_now
       end
     end

spec/factories.rb

@@ -28,6 +28,7 @@
     location { Location.find_by_official_name("Bulle") || create(:location) }
     card_type { :youth }
     status { :online }
+    validity { :maintained }
   end
 
   factory :location do