Edita model Notification

-remove coluna read
-adiciona coluna status

Co-authored-by: ana resgalla <[email protected]>

app/controllers/notifications_controller.rb

@@ -3,6 +3,6 @@ class NotificationsController < ApplicationController
 
   def index
     @notifications = current_user.profile.notifications.order(created_at: :desc)
-    @notifications.update_all(read: true)
+    @notifications.update_all(status: :seen)
   end
 end

app/models/notification.rb

@@ -1,4 +1,6 @@
 class Notification < ApplicationRecord
   belongs_to :profile
   belongs_to :notifiable, polymorphic: true
+
+  enum status: { unseen: 0, seen: 5, clicked: 10 }
 end

app/views/notifications/_comment.html.erb

@@ -1 +1 @@
-<p><%= link_to notification.notifiable.user.full_name, profile_path(notification.notifiable.user.profile) %> comentou em sua publicação: <%= link_to notification.notifiable.post.title, post_path(notification.notifiable.post) %>
+<%= link_to notification.notifiable.user.full_name, profile_path(notification.notifiable.user.profile) %> comentou em sua publicação: <%= link_to notification.notifiable.post.title, post_path(notification.notifiable.post) %>

app/views/notifications/_connection.html.erb

@@ -1 +1 @@
-<p><%= link_to notification.notifiable.follower.user.full_name, profile_path(notification.notifiable.follower) %> começou a te seguir
+<%= link_to notification.notifiable.follower.user.full_name, profile_path(notification.notifiable.follower) %> começou a te seguir

app/views/notifications/_invitation.html.erb

@@ -1 +1 @@
-<p>Você recebeu um convite para <%= link_to notification.notifiable.project_title, invitation_path(notification.notifiable) %>
+Você recebeu um convite para <%= link_to notification.notifiable.project_title, invitation_path(notification.notifiable) %>

app/views/notifications/_like.html.erb

@@ -1,5 +1,5 @@
 <% if notification.notifiable.likeable.is_a?Post %>
-  <p><%= link_to notification.notifiable.user.full_name, profile_path(notification.notifiable.user.profile) %> curtiu sua publicação
+  <%= link_to notification.notifiable.user.full_name, profile_path(notification.notifiable.user.profile) %> curtiu sua publicação
 <% else %>
-  <p><%= link_to notification.notifiable.user.full_name, profile_path(notification.notifiable.user.profile) %> curtiu seu comentário
+  <%= link_to notification.notifiable.user.full_name, profile_path(notification.notifiable.user.profile) %> curtiu seu comentário
 <% end %>

app/views/notifications/_post.html.erb

@@ -1 +1 @@
-<p><%= notification.notifiable.user.full_name %> fez uma <%= link_to 'publicação', post_path(notification.notifiable) %>
+<%= notification.notifiable.user.full_name %> fez uma <%= link_to 'publicação', post_path(notification.notifiable) %>

app/views/notifications/index.html.erb

@@ -1,16 +1,18 @@
 <div class="container d-flex flex-column align-items-center">
   <h2>Notificações</h2>
   <% if @notifications&.any? %>
+    <ul class="list-group list-group-flush">
       <% @notifications.each do |notification| %>
-        <div class="list-group">
-            <%= render(
-            partial: "#{notification.notifiable.class.name.downcase}" ,
-            locals: { notification: notification }
-            )%>
-          há <%= distance_of_time_in_words_to_now(notification.notifiable.created_at) %></p>
-        </div>
+        <li class="list-group-item">
+          <%= render(
+          partial: "#{notification.notifiable.class.name.downcase}" ,
+          locals: { notification: notification }
+          )%>
+          há <%= distance_of_time_in_words_to_now(notification.notifiable.created_at) %>
+        </li>
       <% end %>
+    </ul>
   <% else %>
     <p>Nenhuma notificação encontrada</p>
   <% end %>
-</div>
+</div>

app/views/shared/_navbar.html.erb

@@ -41,9 +41,12 @@
             </li>
             <li class="dropdown-item">
               <%= link_to notifications_path, class: 'nav-link' do %>
-                Notificações <span class="badge bg-primary">
-                              <%= current_user.profile.notifications.where(read: false).count if current_user.profile.notifications.where(read: false).count > 0 %>
-                             </span>
+                Notificações
+                <% if current_user.profile.notifications.unseen.count > 0 %>
+                  <span class="badge bg-primary">
+                    <%= current_user.profile.notifications.unseen.count %>
+                  </span>
+                <% end %>
               <% end %>
             </li>
             <% if current_user.admin? %>

db/migrate/20240212195517_add_status_to_notifications.rb

@@ -0,0 +1,5 @@
+class AddStatusToNotifications < ActiveRecord::Migration[7.1]
+  def change
+    add_column :notifications, :status, :integer, default: 0
+  end
+end

db/migrate/20240212195603_remove_read_from_notifications.rb

@@ -0,0 +1,5 @@
+class RemoveReadFromNotifications < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :notifications, :read, :boolean
+  end
+end

spec/system/notifications/user_sees_notifications_spec.rb

@@ -58,7 +58,7 @@
 
   it 'contagem de notificações muda ao ir para página de notificações' do
     user = create(:user)
-    invitation = create(:invitation, profile: user.profile)
+    create(:invitation, profile: user.profile)
 
     login_as user
     visit notifications_path