From df6653e94b68f14bd7d9817accf8f5c9a17a45fd Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 30 Nov 2021 18:41:04 +0000
Subject: [PATCH] Add user routes

---
 app/models/user.rb                     | 14 --------------
 app/views/organisations/users.html.erb | 10 ++++++----
 config/routes.rb                       |  7 +++++--
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index ec58e221b..81d3d2d9c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,18 +19,4 @@ class User < ApplicationRecord
   def not_completed_case_logs
     case_logs.not_completed
   end
-
-  def name_email_display
-    %i[name email].map { |field| public_send(field) }.join("\n")
-  end
-
-  def org_role_display
-    [organisation.name, role].join("\n")
-  end
-
-  def last_sign_in_at_display
-    return unless last_sign_in_at
-
-    last_sign_in_at.strftime("%d %b %Y")
-  end
 end
diff --git a/app/views/organisations/users.html.erb b/app/views/organisations/users.html.erb
index 679806c6e..4b27fe2d6 100644
--- a/app/views/organisations/users.html.erb
+++ b/app/views/organisations/users.html.erb
@@ -1,4 +1,4 @@
-<%= govuk_button_link_to "Invite user", new_case_log_path, method: :post %>
+<%= govuk_button_link_to "Invite user", new_user_path, method: :post %>
 <%= govuk_table do |table| %>
   <%= table.head do |head| %>
     <%= head.row do |row|
@@ -10,9 +10,11 @@
   <% @organisation.users.each do |user| %>
     <%= table.body do |body| %>
       <%= body.row do |row|
-        row.cell(text: simple_format(user.name_email_display, {}, wrapper_tag: "div"))
-        row.cell(text: simple_format(user.org_role_display, {}, wrapper_tag: "div"))
-        row.cell(text: user.last_sign_in_at_display )
+        user_cell = [govuk_link_to(user.name, user), user.email].join("\n")
+        org_cell = [user.organisation.name, user.role].join("\n")
+        row.cell(text: simple_format(user_cell, {}, wrapper_tag: "div"))
+        row.cell(text: simple_format(org_cell, {}, wrapper_tag: "div"))
+        row.cell(text: user.last_sign_in_at&.strftime("%d %b %Y") )
       end %>
     <% end %>
   <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 990942241..ddd1f5dc8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,12 +12,15 @@ Rails.application.routes.draw do
   ActiveAdmin.routes(self)
   root to: "test#index"
   get "about", to: "about#index"
-  get "/users/account", to: "users/account#index"
-  get "/users/account/personal_details", to: "users/account#personal_details"
 
   form_handler = FormHandler.instance
   form = form_handler.get_form("2021_2022")
 
+  resources :users do
+    get "account", to: "users/account#index"
+    get "account/personal_details", to: "users/account#personal_details"
+  end
+
   resources :organisations do
     member do
       get "details", to: "organisations#show"