added models

danielcjacobs · danielcjacobs · commit e82e2b97bf3a · 2020-04-22T22:12:05.000-04:00
diff --git a/app/javascript/packs/myjs.js b/app/javascript/packs/myjs.js
@@ -1,8 +1,8 @@
 $(function(){
 	console.log("got here");
-	$.get("plans/1.json", function(data){
-		console.log(data);
-	});
+	//$.get("plans/1.json", function(data){
+	//	console.log(data);
+	//});
 });
 
 class Course {
diff --git a/app/models/catalog.rb b/app/models/catalog.rb
@@ -0,0 +1,2 @@
+class Catalog < ApplicationRecord
+end
diff --git a/app/models/catalog_course.rb b/app/models/catalog_course.rb
@@ -0,0 +1,4 @@
+class CatalogCourse < ApplicationRecord
+  belongs_to :catalog
+  belongs_to :course
+end
diff --git a/app/models/category.rb b/app/models/category.rb
@@ -0,0 +1,3 @@
+class Category < ApplicationRecord
+  belongs_to :requirements
+end
diff --git a/app/models/category_course.rb b/app/models/category_course.rb
@@ -0,0 +1,4 @@
+class CategoryCourse < ApplicationRecord
+  belongs_to :category
+  belongs_to :course
+end
diff --git a/app/models/major.rb b/app/models/major.rb
@@ -0,0 +1,2 @@
+class Major < ApplicationRecord
+end
diff --git a/app/models/requirement.rb b/app/models/requirement.rb
@@ -0,0 +1,4 @@
+class Requirement < ApplicationRecord
+  belongs_to :major
+  belongs_to :catalog
+end
diff --git a/db/migrate/20200423015752_create_catalogs.rb b/db/migrate/20200423015752_create_catalogs.rb
@@ -0,0 +1,9 @@
+class CreateCatalogs < ActiveRecord::Migration[6.0]
+  def change
+    create_table :catalogs do |t|
+      t.integer :year
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200423015846_create_catalog_courses.rb b/db/migrate/20200423015846_create_catalog_courses.rb
@@ -0,0 +1,10 @@
+class CreateCatalogCourses < ActiveRecord::Migration[6.0]
+  def change
+    create_table :catalog_courses do |t|
+      t.references :catalog, null: false, foreign_key: true
+      t.references :course, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200423020044_create_categories.rb b/db/migrate/20200423020044_create_categories.rb
@@ -0,0 +1,10 @@
+class CreateCategories < ActiveRecord::Migration[6.0]
+  def change
+    create_table :categories do |t|
+      t.string :name
+      t.references :requirements, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200423020132_create_category_courses.rb b/db/migrate/20200423020132_create_category_courses.rb
@@ -0,0 +1,10 @@
+class CreateCategoryCourses < ActiveRecord::Migration[6.0]
+  def change
+    create_table :category_courses do |t|
+      t.references :category, null: false, foreign_key: true
+      t.references :course, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200423020156_create_majors.rb b/db/migrate/20200423020156_create_majors.rb
@@ -0,0 +1,9 @@
+class CreateMajors < ActiveRecord::Migration[6.0]
+  def change
+    create_table :majors do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200423020234_create_requirements.rb b/db/migrate/20200423020234_create_requirements.rb
@@ -0,0 +1,10 @@
+class CreateRequirements < ActiveRecord::Migration[6.0]
+  def change
+    create_table :requirements do |t|
+      t.references :major, null: false, foreign_key: true
+      t.references :catalog, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200423020407_add_major_id_to_users.rb b/db/migrate/20200423020407_add_major_id_to_users.rb
@@ -0,0 +1,5 @@
+class AddMajorIdToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :major_id, :integer
+  end
+end
diff --git a/db/migrate/20200423020519_add_description_to_courses.rb b/db/migrate/20200423020519_add_description_to_courses.rb
@@ -0,0 +1,5 @@
+class AddDescriptionToCourses < ActiveRecord::Migration[6.0]
+  def change
+    add_column :courses, :description, :string
+  end
+end
diff --git a/db/migrate/20200423020621_add_curr_term_to_plans.rb b/db/migrate/20200423020621_add_curr_term_to_plans.rb
@@ -0,0 +1,5 @@
+class AddCurrTermToPlans < ActiveRecord::Migration[6.0]
+  def change
+    add_column :plans, :curr_term, :string
+  end
+end
diff --git a/db/migrate/20200423020641_add_curr_year_to_plans.rb b/db/migrate/20200423020641_add_curr_year_to_plans.rb
@@ -0,0 +1,5 @@
+class AddCurrYearToPlans < ActiveRecord::Migration[6.0]
+  def change
+    add_column :plans, :curr_year, :integer
+  end
+end
diff --git a/db/migrate/20200423021017_add_major_id_to_plans.rb b/db/migrate/20200423021017_add_major_id_to_plans.rb
@@ -0,0 +1,5 @@
+class AddMajorIdToPlans < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :plans, :major, null: true, foreign_key: true
+  end
+end
diff --git a/db/migrate/20200423021033_add_catalog_id_to_plans.rb b/db/migrate/20200423021033_add_catalog_id_to_plans.rb
@@ -0,0 +1,5 @@
+class AddCatalogIdToPlans < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :plans, :catalog, null: true, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,14 +10,53 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_03_31_190210) do
+ActiveRecord::Schema.define(version: 2020_04_23_021033) do
+
+  create_table "catalog_courses", force: :cascade do |t|
+    t.integer "catalog_id", null: false
+    t.integer "course_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["catalog_id"], name: "index_catalog_courses_on_catalog_id"
+    t.index ["course_id"], name: "index_catalog_courses_on_course_id"
+  end
+
+  create_table "catalogs", force: :cascade do |t|
+    t.integer "year"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
+  create_table "categories", force: :cascade do |t|
+    t.string "name"
+    t.integer "requirements_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["requirements_id"], name: "index_categories_on_requirements_id"
+  end
+
+  create_table "category_courses", force: :cascade do |t|
+    t.integer "category_id", null: false
+    t.integer "course_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["category_id"], name: "index_category_courses_on_category_id"
+    t.index ["course_id"], name: "index_category_courses_on_course_id"
+  end
 
   create_table "courses", force: :cascade do |t|
     t.string "name"
     t.string "designator"
     t.integer "credits"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.string "description"
+  end
+
+  create_table "majors", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
   end
 
   create_table "plan_courses", force: :cascade do |t|
@@ -36,6 +75,21 @@
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.integer "user_id"
+    t.string "curr_term"
+    t.integer "curr_year"
+    t.integer "major_id"
+    t.integer "catalog_id"
+    t.index ["catalog_id"], name: "index_plans_on_catalog_id"
+    t.index ["major_id"], name: "index_plans_on_major_id"
+  end
+
+  create_table "requirements", force: :cascade do |t|
+    t.integer "major_id", null: false
+    t.integer "catalog_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["catalog_id"], name: "index_requirements_on_catalog_id"
+    t.index ["major_id"], name: "index_requirements_on_major_id"
   end
 
   create_table "users", force: :cascade do |t|
@@ -47,11 +101,21 @@
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.string "login"
+    t.integer "major_id"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["login"], name: "index_users_on_login", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  add_foreign_key "catalog_courses", "catalogs"
+  add_foreign_key "catalog_courses", "courses"
+  add_foreign_key "categories", "requirements", column: "requirements_id"
+  add_foreign_key "category_courses", "categories"
+  add_foreign_key "category_courses", "courses"
   add_foreign_key "plan_courses", "courses"
   add_foreign_key "plan_courses", "plans"
+  add_foreign_key "plans", "catalogs"
+  add_foreign_key "plans", "majors"
+  add_foreign_key "requirements", "catalogs"
+  add_foreign_key "requirements", "majors"
 end
diff --git a/test/fixtures/catalog_courses.yml b/test/fixtures/catalog_courses.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  catalog: one
+  course: one
+
+two:
+  catalog: two
+  course: two
diff --git a/test/fixtures/catalogs.yml b/test/fixtures/catalogs.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  year: 1
+
+two:
+  year: 1
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: MyString
+  requirements: one
+
+two:
+  name: MyString
+  requirements: two
diff --git a/test/fixtures/category_courses.yml b/test/fixtures/category_courses.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  category: one
+  course: one
+
+two:
+  category: two
+  course: two
diff --git a/test/fixtures/majors.yml b/test/fixtures/majors.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString
diff --git a/test/fixtures/requirements.yml b/test/fixtures/requirements.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  major: one
+  catalog: one
+
+two:
+  major: two
+  catalog: two
diff --git a/test/models/catalog_course_test.rb b/test/models/catalog_course_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CatalogCourseTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/catalog_test.rb b/test/models/catalog_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CatalogTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/category_course_test.rb b/test/models/category_course_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CategoryCourseTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/major_test.rb b/test/models/major_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MajorTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/requirement_test.rb b/test/models/requirement_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class RequirementTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Catalog < ApplicationRecord`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class Category < ApplicationRecord`
	`2`	`+ belongs_to :requirements`
	`3`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Major < ApplicationRecord`
	`2`	`+end`