Simplify the name of the object....

Author: epugh

app/controllers/admin/announcements_controller.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Admin
+  class AnnouncementsController < Admin::AdminController
+    skip_before_action :check_for_announcement
+    def index
+      @announcements = Announcement.all
+    end
+
+    def new
+      @announcement = Announcement.new
+      @announcement.text = ''
+    end
+
+    def edit
+      @announcement = Announcement.find(params[:id])
+    end
+
+    def create
+      @announcement = Announcement.new(announcement_params)
+      @announcement.author = current_user
+
+      if @announcement.save
+        redirect_to admin_announcements_path
+      else
+        render 'new'
+      end
+    end
+
+    def update
+      @announcement = Announcement.find(params[:id])
+      if @announcement.update(announcement_params)
+        redirect_to admin_announcements_path
+      else
+        render 'edit'
+      end
+    end
+
+    def destroy
+      @announcement = Announcement.find(params[:id])
+      @announcement.destroy
+      redirect_to admin_announcements_path
+    end
+
+    private
+
+    def announcement_params
+      params.require(:announcement).permit(:text, :author_id)
+    end
+  end
+end

app/controllers/admin/app_announcements_controller.rb

@@ -28,7 +28,7 @@ def signup_enabled?
   end
 
   def check_for_announcement
-    @announcement = AppAnnouncement.latest_unseen_for_user(@current_user).first if @current_user
-    AppAnnouncementViewed.create(user: @current_user, app_announcement: @announcement) if @announcement
+    @announcement = Announcement.latest_unseen_for_user(@current_user).first if @current_user
+    AnnouncementViewed.create(user: @current_user, announcement: @announcement) if @announcement
   end
 end

app/controllers/app_announcements_viewed_controller.rb

@@ -2,27 +2,27 @@
 
 # == Schema Information
 #
-# Table name: app_announcements
+# Table name: announcements
 #
 #  id         :bigint           not null, primary key
 #  text       :string(255)
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  author_id  :integer
 #
-class AppAnnouncement < ApplicationRecord
+class Announcement < ApplicationRecord
   belongs_to :author, class_name: 'User'
-  has_many :app_announcement_viewed, dependent: :destroy
-  has_many :viewers, through: :app_announcement_viewed, source: :user
+  has_many :announcement_viewed, dependent: :destroy
+  has_many :viewers, through: :announcement_viewed, source: :user
 
   scope :latest_unseen_for_user, ->(user) {
     join_condition = "
-      LEFT OUTER JOIN `app_announcement_vieweds`
-        ON `app_announcements`.`id` = `app_announcement_vieweds`.`app_announcement_id`
-        AND `app_announcement_vieweds`.`user_id` = ?
+      LEFT OUTER JOIN `announcement_vieweds`
+        ON `announcements`.`id` = `announcement_vieweds`.`announcement_id`
+        AND `announcement_vieweds`.`user_id` = ?
     "
     joins(sanitize_sql_array([ join_condition, user.id ]))
-      .where('`app_announcement_vieweds`.`user_id` IS NULL')
+      .where('`announcement_vieweds`.`user_id` IS NULL')
       .order(created_at: :desc)
   }
 end

app/controllers/application_controller.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: announcement_vieweds
+#
+#  id              :bigint           not null, primary key
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  announcement_id :integer
+#  user_id         :integer
+#
+class AnnouncementViewed < ApplicationRecord
+  belongs_to :user
+  belongs_to :announcement
+end

app/models/app_announcement.rb app/models/announcement.rb

@@ -114,8 +114,8 @@ class User < ApplicationRecord
            class_name: 'BookMetadatum',
            dependent:  :destroy
 
-  has_many :app_announcements, foreign_key: 'author_id', dependent: :destroy, inverse_of: :author
-  has_many :viewed_app_announcements, through: :app_announcements_viewed, source: :app_announcement
+  has_many :announcements, foreign_key: 'author_id', dependent: :destroy, inverse_of: :author
+  has_many :viewed_announcements, through: :announcements_viewed, source: :announcement
 
   # Validations
 
@@ -251,8 +251,8 @@ def pending_invite?
   end
 
   def unseen_app_notifications
-    AppAnnouncement
-      .left_outer_joins(:app_announcement_viewed)
+    Announcement
+      .left_outer_joins(:announcement_viewed)
       .where('user_id != ? OR user_id IS NULL', id)
       .order(:created_at)
   end

app/models/announcement_viewed.rb

@@ -3,7 +3,7 @@
 </div>
 
 
-<%= form_for [:admin, @app_announcement] do |form| %>
+<%= form_for [:admin, @announcement] do |form| %>
 
   <div class="mb-3">
     <%= form.label :text, class: 'form-label' %>
@@ -21,5 +21,5 @@
 
 
 <br>
-<%= button_to 'Back to Quepid Announcements', admin_app_announcements_path, method: :get %>
+<%= button_to 'Back to Quepid Announcements', admin_announcements_path, method: :get %>
 <br>

app/models/app_announcement_viewed.rb

@@ -1,8 +1,8 @@
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-  <h1 class="h2">Quepid Announcements</h1>
+  <h1 class="h2">Quepid Announcements to Users</h1>
   <div class="btn-toolbar mb-2 mb-md-0">
     <div class="btn-group me-2">
-      <%= link_to 'New Quepid Announcement', new_admin_app_announcement_path, class: "btn btn-sm btn-outline-secondary" %>
+      <%= link_to 'New Quepid Announcement', new_admin_announcement_path, class: "btn btn-sm btn-outline-secondary" %>
     </div>
   </div>
 </div>
@@ -21,15 +21,15 @@
   </thead>
 
   <tbody>
-  <% @app_announcements.each do |announcement| %>
+  <% @announcements.each do |announcement| %>
     <tr>
       <td><%= announcement.text.html_safe %></td>
       <td><%= announcement.author.name %> </td>
       <td><%= announcement.created_at.strftime("%B %d %Y, %l:%M%P") %> </td>
-      <td><%= announcement.app_announcement_viewed.size %> </td>
+      <td><%= announcement.announcement_viewed.size %> </td>
       <td>
-        <%= link_to 'Edit', edit_admin_app_announcement_path(announcement) %>
-        <%= link_to 'Delete', admin_app_announcement_path(announcement), method: :delete, data: { confirm: 'Are you sure?' } %>
+        <%= link_to 'Edit', edit_admin_announcement_path(announcement) %>
+        <%= link_to 'Delete', admin_announcement_path(announcement), method: :delete, data: { confirm: 'Are you sure?' } %>
       </td>
     </tr>
   <% end %>

app/models/user.rb

@@ -3,12 +3,12 @@
 </div>
 
 
-<%= form_for [:admin, @app_announcement] do |form| %>
+<%= form_for [:admin, @announcement] do |form| %>
 
   <div class="mb-3">
     <%= form.label :text, class: 'form-label' %>
     <%= form.text_field :text, required: true, class: 'form-control' %>
-    <div class="form-text">The announcement.</div>
+    <div class="form-text">You can use HTML and emojis.</div>
   </div>
 
   <br>
@@ -21,5 +21,5 @@
 
 
 <br>
-<%= button_to 'Back to Quepid Announcements', admin_app_announcements_path, method: :get %>
+<%= button_to 'Back to Quepid Announcements', admin_announcements_path, method: :get %>
 <br>

app/views/admin/app_announcements/edit.html.erb app/views/admin/announcements/edit.html.erb

@@ -6,7 +6,7 @@
   <ul>
   <li><%= link_to 'Users', admin_users_path %>
   <li><%= link_to 'Quepid Communal Scorers', admin_communal_scorers_path %></li>
-  <li><%= link_to 'Announcements', admin_app_announcements_path %>
+  <li><%= link_to 'Announcements', admin_announcements_path %>
   <li><%= link_to 'Job Manager', sidekiq_web_path %></li>  
   </ul>
   </div>

app/views/admin/app_announcements/index.html.erb app/views/admin/announcements/index.html.erb

@@ -80,7 +80,7 @@
             <li><%= link_to 'Admin Home', admin_path, class: 'dropdown-item', target: '_self' %></li>
             <li><%= link_to 'Users', admin_users_path, class: 'dropdown-item', target: '_self' %></li>
             <li><%= link_to 'Quepid Scorers', admin_communal_scorers_path, class: 'dropdown-item', target: '_self' %></li>
-            <li><%= link_to 'Announcements', admin_app_announcements_path, class: 'dropdown-item', target: '_self' %></li>
+            <li><%= link_to 'Announcements', admin_announcements_path, class: 'dropdown-item', target: '_self' %></li>
             <li><%= link_to 'Job Manager', sidekiq_web_path, class: 'dropdown-item', target: '_self' %></li>
             <% end %>
 

app/views/admin/app_announcements/new.html.erb app/views/admin/announcements/new.html.erb

@@ -65,7 +65,7 @@
             <li><%= link_to 'Admin Home', admin_path, class: 'dropdown-link', target: '_self' %></li>
             <li><%= link_to 'Users', admin_users_path, class: 'dropdown-link', target: '_self' %></li>
             <li><%= link_to 'Quepid Scorers', admin_communal_scorers_path, class: 'dropdown-link', target: '_self' %></li>
-            <li><%= link_to 'Announcements', admin_app_announcements_path, class: 'dropdown-item', target: '_self' %></li>
+            <li><%= link_to 'Announcements', admin_announcements_path, class: 'dropdown-item', target: '_self' %></li>
             <li><%= link_to 'Job Manager', sidekiq_web_path, class: 'dropdown-link', target: '_self' %></li>
             <% end %>
           </ul>

app/views/admin/app_announcements/show.html.erb

@@ -48,10 +48,6 @@
     resources :ratings, only: [ :index ]
   end
 
-  resources :app_announcements, only: [] do
-    resources :app_announcements_viewed, only: [ :create ]
-  end
-
   resources :books do
     resources :judgements
     resources :query_doc_pairs do
@@ -105,7 +101,7 @@
       resource :pulse, only: [ :show ], module: :users
     end
     resources :communal_scorers
-    resources :app_announcements
+    resources :announcements
   end
 
   # preview routes for mailers

app/views/admin/home/index.html.erb

@@ -0,0 +1,10 @@
+class CreateAnnouncements < ActiveRecord::Migration[7.0]
+  def change
+    create_table :announcements do |t|
+      t.string :text
+      t.integer :author_id
+
+      t.timestamps
+    end
+  end
+end

app/views/layouts/_header.html.erb

@@ -0,0 +1,10 @@
+class CreateAnnouncementVieweds < ActiveRecord::Migration[7.0]
+  def change
+    create_table :announcement_vieweds do |t|
+      t.integer :announcement_id
+      t.integer :user_id
+
+      t.timestamps
+    end
+  end
+end