Land #97, Mdm::Vuln#note_id

MSP-11994

app/models/mdm/note.rb

@@ -23,6 +23,15 @@ class Mdm::Note < ActiveRecord::Base
              class_name: 'Mdm::Service',
              inverse_of: :notes
 
+  # @!attribute [rw] vuln
+  #   The vuln to which this note is attached.
+  #
+  #   @return [Mdm::Vuln] if note is attached to an {Mdm::Vuln}.
+  #   @return [nil] if not is attached to an {Mdm::Host}.
+  belongs_to :vuln,
+             class_name: 'Mdm::Vuln',
+             inverse_of: :notes
+
   # @!attribute [rw] workspace
   #   The workspace in which the {#host} or {#service} exists.
   #

app/models/mdm/vuln.rb

@@ -56,6 +56,16 @@ class Mdm::Vuln < ActiveRecord::Base
            dependent: :destroy,
            inverse_of: :vuln
 
+  # @!attribute [rw] notes
+  #   Notes about the vuln entered by a user with {Mdm::Note#created_at oldest notes} first.
+  #
+  #   @return [Array<Mdm::Note>]
+  has_many :notes,
+           class_name: 'Mdm::Note',
+           inverse_of: :vuln,
+           dependent: :delete_all,
+           order: 'notes.created_at'
+
   #
   # Through :vuln_refs
   #

db/migrate/20150209195939_add_vuln_id_to_note.rb

@@ -0,0 +1,6 @@
+class AddVulnIdToNote < ActiveRecord::Migration
+  def change
+    add_column :notes, :vuln_id, :integer
+    add_index :notes, :vuln_id
+  end
+end

lib/metasploit_data_models/version.rb

@@ -5,8 +5,8 @@ module Version
     MAJOR = 0
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 23
-    # The patch number, scoped to the {MINOR} version number.
-    PATCH = 0
+    # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
+    PATCH = 1
 
     # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the `PRERELEASE` in the
     # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

spec/app/models/mdm/note_spec.rb

@@ -21,6 +21,7 @@
       it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
       it { should have_db_column(:host_id).of_type(:integer) }
       it { should have_db_column(:service_id).of_type(:integer) }
+      it { should have_db_column(:vuln_id).of_type(:integer) }
       it { should have_db_column(:ntype).of_type(:string) }
       it { should have_db_column(:critical).of_type(:boolean) }
       it { should have_db_column(:seen).of_type(:boolean) }
@@ -44,6 +45,7 @@
     it { should belong_to(:workspace).class_name('Mdm::Workspace') }
     it { should belong_to(:host).class_name('Mdm::Host') }
     it { should belong_to(:service).class_name('Mdm::Service') }
+    it { should belong_to(:vuln).class_name('Mdm::Vuln') }
   end
 
   context 'scopes' do

spec/app/models/mdm/vuln_spec.rb

@@ -42,6 +42,7 @@
     it { should have_many(:vuln_details).class_name('Mdm::VulnDetail').dependent(:destroy) }
     # @todo https://www.pivotaltracker.com/story/show/49004623
     it { should have_many(:vulns_refs).class_name('Mdm::VulnRef').dependent(:destroy) }
+    it { should have_many(:notes).class_name('Mdm::Note').dependent(:delete_all).order('notes.created_at') }
 
     context 'module_details' do
       it { should have_many(:module_details).class_name('Mdm::Module::Detail').through(:module_refs) }

spec/dummy/db/structure.sql

@@ -818,7 +818,8 @@ CREATE TABLE notes (
     updated_at timestamp without time zone,
     critical boolean,
     seen boolean,
-    data text
+    data text,
+    vuln_id integer
 );
 
 
@@ -2679,6 +2680,13 @@ CREATE INDEX index_module_targets_on_module_detail_id ON module_targets USING bt
 CREATE INDEX index_notes_on_ntype ON notes USING btree (ntype);
 
 
+--
+-- Name: index_notes_on_vuln_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE INDEX index_notes_on_vuln_id ON notes USING btree (vuln_id);
+
+
 --
 -- Name: index_refs_on_name; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -2998,6 +3006,8 @@ INSERT INTO schema_migrations (version) VALUES ('20150112203945');
 
 INSERT INTO schema_migrations (version) VALUES ('20150205192745');
 
+INSERT INTO schema_migrations (version) VALUES ('20150209195939');
+
 INSERT INTO schema_migrations (version) VALUES ('20150212214222');
 
 INSERT INTO schema_migrations (version) VALUES ('21');