Create note subscription table and model

diff --git a/app/models/note.rb b/app/models/note.rb
index 0b0597434f0fa5842f31862da19bdf9ec1711da6..6d8ca078fa42e1d12e1652e3795a1e32caf02c26 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -23,6 +23,8 @@ class Note < ApplicationRecord
 
   has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
   has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note
 
   has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
   has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note

+  has_many :subscriptions, :class_name => "NoteSubscription"
+  has_many :subscribers, :through => :subscriptions, :source => :user

 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

diff --git a/app/models/note_subscription.rb b/app/models/note_subscription.rb
new file mode 100644 (file)
index 0000000..76e8a22
--- /dev/null
+++ b/app/models/note_subscription.rb
@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: note_subscriptions
+#
+#  user_id :bigint(8)        not null, primary key
+#  note_id :bigint(8)        not null, primary key
+#
+# Indexes
+#
+#  index_note_subscriptions_on_note_id  (note_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (note_id => notes.id)
+#  fk_rails_...  (user_id => users.id)
+#
+class NoteSubscription < ApplicationRecord
+  belongs_to :user
+  belongs_to :note
+end

diff --git a/app/models/user.rb b/app/models/user.rb
index dd1c08d985154fd733e815761d040b39af4255d3..d8e8771d84b976d9ef0aa561849323d300d748ca 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -66,6 +66,8 @@ class User < ApplicationRecord
   has_and_belongs_to_many :changeset_subscriptions, :class_name => "Changeset", :join_table => "changesets_subscribers", :foreign_key => "subscriber_id"
   has_many :note_comments, :foreign_key => :author_id, :inverse_of => :author
   has_many :notes, :through => :note_comments
   has_and_belongs_to_many :changeset_subscriptions, :class_name => "Changeset", :join_table => "changesets_subscribers", :foreign_key => "subscriber_id"
   has_many :note_comments, :foreign_key => :author_id, :inverse_of => :author
   has_many :notes, :through => :note_comments

+  has_many :note_subscriptions, :class_name => "NoteSubscription"
+  has_many :subscribed_notes, :through => :note_subscriptions, :source => :note

 
   has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :as => :owner
   has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id
 
   has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :as => :owner
   has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id

diff --git a/db/migrate/20241022141247_create_note_subscriptions.rb b/db/migrate/20241022141247_create_note_subscriptions.rb
new file mode 100644 (file)
index 0000000..9a2a28a
--- /dev/null
+++ b/db/migrate/20241022141247_create_note_subscriptions.rb
@@ -0,0 +1,8 @@
+class CreateNoteSubscriptions < ActiveRecord::Migration[7.2]
+  def change
+    create_table :note_subscriptions, :primary_key => [:user_id, :note_id] do |t|
+      t.references :user, :foreign_key => true, :index => false
+      t.references :note, :foreign_key => true
+    end
+  end
+end

diff --git a/db/structure.sql b/db/structure.sql
index 25b2f173fc6f2a42d00856e3b94c7bec45818b4c..35ef5e2b3107518378de971a2691f8413c7271fa 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1051,6 +1051,16 @@ CREATE SEQUENCE public.note_comments_id_seq
 ALTER SEQUENCE public.note_comments_id_seq OWNED BY public.note_comments.id;
 
 
 ALTER SEQUENCE public.note_comments_id_seq OWNED BY public.note_comments.id;
 
 

+--
+-- Name: note_subscriptions; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.note_subscriptions (
+    user_id bigint NOT NULL,
+    note_id bigint NOT NULL
+);
+
+

 --
 -- Name: notes; Type: TABLE; Schema: public; Owner: -
 --
 --
 -- Name: notes; Type: TABLE; Schema: public; Owner: -
 --


@@ -2010,6 +2020,14 @@ ALTER TABLE ONLY public.note_comments
     ADD CONSTRAINT note_comments_pkey PRIMARY KEY (id);
 
 
     ADD CONSTRAINT note_comments_pkey PRIMARY KEY (id);
 
 

+--
+-- Name: note_subscriptions note_subscriptions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.note_subscriptions
+    ADD CONSTRAINT note_subscriptions_pkey PRIMARY KEY (user_id, note_id);
+
+

 --
 -- Name: notes notes_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
 --
 -- Name: notes notes_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --


@@ -2498,6 +2516,13 @@ CREATE INDEX index_note_comments_on_body ON public.note_comments USING gin (to_t
 CREATE INDEX index_note_comments_on_created_at ON public.note_comments USING btree (created_at);
 
 
 CREATE INDEX index_note_comments_on_created_at ON public.note_comments USING btree (created_at);
 
 

+--
+-- Name: index_note_subscriptions_on_note_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_note_subscriptions_on_note_id ON public.note_subscriptions USING btree (note_id);
+
+

 --
 -- Name: index_oauth_access_grants_on_application_id; Type: INDEX; Schema: public; Owner: -
 --
 --
 -- Name: index_oauth_access_grants_on_application_id; Type: INDEX; Schema: public; Owner: -
 --


@@ -2953,6 +2978,14 @@ ALTER TABLE ONLY public.diary_entry_subscriptions
     ADD CONSTRAINT diary_entry_subscriptions_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
 
 
     ADD CONSTRAINT diary_entry_subscriptions_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
 
 

+--
+-- Name: note_subscriptions fk_rails_2c1913f293; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.note_subscriptions
+    ADD CONSTRAINT fk_rails_2c1913f293 FOREIGN KEY (note_id) REFERENCES public.notes(id);
+
+

 --
 -- Name: oauth_access_grants fk_rails_330c32d8d9; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 --
 -- Name: oauth_access_grants fk_rails_330c32d8d9; Type: FK CONSTRAINT; Schema: public; Owner: -
 --


@@ -2993,6 +3026,14 @@ ALTER TABLE ONLY public.active_storage_variant_records
     ADD CONSTRAINT fk_rails_993965df05 FOREIGN KEY (blob_id) REFERENCES public.active_storage_blobs(id);
 
 
     ADD CONSTRAINT fk_rails_993965df05 FOREIGN KEY (blob_id) REFERENCES public.active_storage_blobs(id);
 
 

+--
+-- Name: note_subscriptions fk_rails_a352f4eced; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.note_subscriptions
+    ADD CONSTRAINT fk_rails_a352f4eced FOREIGN KEY (user_id) REFERENCES public.users(id);
+
+

 --
 -- Name: oauth_access_grants fk_rails_b4b53e07b8; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
 --
 -- Name: oauth_access_grants fk_rails_b4b53e07b8; Type: FK CONSTRAINT; Schema: public; Owner: -
 --


@@ -3356,6 +3397,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('23'),
 ('22'),
 ('21'),
 ('23'),
 ('22'),
 ('21'),

+('20241022141247'),

 ('20240913171951'),
 ('20240912181413'),
 ('20240910175616'),
 ('20240913171951'),
 ('20240912181413'),
 ('20240910175616'),