Finished API cleanup and added Dockerile for API

schedules_api/Dockerfile

+FROM ruby:2.5
+
+RUN mkdir /api
+WORKDIR /api
+ADD . /api
+
+RUN bundle install --without development
+ENV RAILS_ENV=production

schedules_api/Gemfile

@@ -12,11 +12,6 @@ gem 'sqlite3'
 # Use Puma as the app server
 gem 'puma', '~> 3.7'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
 
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'

schedules_api/app/controllers/calendar_generator_controller.rb

 require 'icalendar'
 require 'time'
 
+# Contains functionality for generating schedules.
 class CalendarGeneratorController < ApplicationController
-  def generate
+  # Render an iCal file containing the schedules of all the 
+  # course sections with the given CRNs.
+  def new
     cal = Icalendar::Calendar.new
-    
+
+    # the intended format for the json is a list of CRNs
     params[:_json].each do |crn| # for each CRN sent by the post request
       section = CourseSection.find_by_crn(crn)
       event = generate_event_from_section(section)

schedules_api/app/controllers/course_sections_controller.rb

@@ -4,7 +4,6 @@ class CourseSectionsController < ApplicationController
   # Render JSON of all Sections belonging to a given Course.
   def index
     @sections = CourseSection.where(course_id: params[:course_id])
-    
     render json: @sections
   end
 end

schedules_api/app/controllers/courses_controller.rb

@@ -4,9 +4,10 @@ class CoursesController < ApplicationController
   def index
     @courses = Course.all
 
+    # filter by subject + course number if the params are included
     @courses = @courses.where(subject: params[:subject].upcase) if params.key?(:subject)
     @courses = @courses.where(course_number: params[:course_number]) if params.key?(:course_number)
-    
+
     render json: @courses
   end
 

schedules_api/app/controllers/search_controller.rb

-class SearchController < ApplicationController
-  def index
-    if params.key?(:crn)
-      crn = params[:crn]
-      @sections = CourseSection.find_by_crn(crn)
-      render json: @sections
-    else
-      render status: 404
-    end
-  end
-end

schedules_api/config/environments/production.rb

@@ -17,7 +17,7 @@ Rails.application.configure do
   # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
   # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
   # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = true
+  # config.read_encrypted_secrets = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.

schedules_api/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
     resources :courses, only: [:index, :show]
     resources :course_sections, only: [:index]
 
-    post 'generate', controller: 'calendar_generator', action: 'generate'
+    post 'generate', controller: 'calendar_generator', action: 'new'
   end
 
   root 'courses#index' # Set the root to be the courses API endpoint

schedules_api/db/seeds.rb

@@ -14,8 +14,8 @@ parser = PatriotWeb::Parser.new
 # get the first semester only
 semester = parser.parse_semesters.first
 
-puts "DDOSing Patriot Web, buckle up kids
-"
+puts "DDOSing Patriot Web, buckle up kids"
+
 # parse all subjects and their courses in the semester
 parser.parse_subjects(semester).each do |subject|
   puts "Getting courses for #{subject}"

schedules_api/start.sh

+#!/bin/sh
+
+export SECRET_KEY_BASE=$(rails secret)
+cp db/development.sqlite3 db/production.sqlite3
+rails s

schedules_api/test/controllers/calendar_generator_controller_test.rb

@@ -2,7 +2,16 @@ require 'test_helper'
 
 class CalendarGeneratorControllerTest < ActionDispatch::IntegrationTest
   test "should get generate" do
-    assert true # TODO: Implement test
-    # assert_response :success
+    crns = [course_sections(:cs112001).crn, course_sections(:cs112002).crn]
+    post "/api/generate", params: crns.to_json, headers: { 'CONTENT_TYPE' => 'application/json' }
+
+    # DTSTAMP and UID lines uniquely identify events, so we can't test against them.
+    # so remove all the lines starting with them.
+    # the \r characters are also annoying so just remove them too
+    gen = @response.body.split("\n").select {|line| !line.include?("DTSTAMP") && !line.include?("UID")}.join("\n").gsub(/\r/, "")
+    correct_ical = File.open("test/test.ics").read.gsub(/\r/, "")
+    assert_equal correct_ical, gen
   end
 end
+
+

schedules_api/test/controllers/courses_controller_test.rb

@@ -10,8 +10,8 @@ class CoursesControllerTest < ActionDispatch::IntegrationTest
     assert_equal courses_count, courses_returned.count
   end
 
-  test '#index should return filtered by subject' do
-    get courses_url subject: "CS"
+  test '#index should return filtered by subject case insensitive' do
+    get courses_url subject: "Cs"
     assert_response :success
 
     courses_returned = JSON.parse @response.body

schedules_api/test/fixtures/closures.yml

 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 may1st: # tuesday
-  date: 2018-05-01
-  semester: one
+  date: <%= Date.new(2018, 5, 30) %>
+  semester: fall2018
 
 may2nd: # wednesday
-  date: 2018-05-02
-  semester: two
+  date: <%= Date.new(2018, 5, 31) %>
+  semester: fall2018

schedules_api/test/fixtures/course_sections.yml

@@ -6,11 +6,11 @@ cs112001:
   section_type: MyString
   title: MyString
   instructor: MyString
-  start_date: 2018-04-07
-  end_date: 2018-04-07
-  days: MyString
-  start_time: MyString
-  end_time: MyString
+  start_date: 2018-05-21
+  end_date: 2018-06-04
+  days: MWF
+  start_time: 12:00 pm
+  end_time: 1:00 pm
   location: MyString
   status: MyString
   campus: MyString
@@ -24,11 +24,11 @@ cs112002:
   section_type: MyString
   title: MyString
   instructor: MyString
-  start_date: 2018-04-07
-  end_date: 2018-04-07
-  days: MyString
-  start_time: MyString
-  end_time: MyString
+  start_date: 2018-05-21
+  end_date: 2018-06-04
+  days: TR
+  start_time: 11:00 am
+  end_time: 2:00 pm
   location: MyString
   status: MyString
   campus: MyString
@@ -42,11 +42,11 @@ cs211001:
   section_type: MyString
   title: MyString
   instructor: MyString
-  start_date: 2018-04-07
-  end_date: 2018-04-07
-  days: MyString
-  start_time: MyString
-  end_time: MyString
+  start_date: 2018-05-21
+  end_date: 2018-06-04
+  days: TR
+  start_time: 2:30 pm
+  end_time: 3:00 pm
   location: MyString
   status: MyString
   campus: MyString

schedules_api/test/test.ics

+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:icalendar-ruby
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTART:20180521T120000
+DTEND:20180521T130000
+DESCRIPTION:MyString
+LOCATION:MyString
+SUMMARY:MyString
+RRULE:FREQ=WEEKLY;UNTIL=20180604T130000;BYDAY=MO,WE,FR
+EXDATE:20180530T120000
+EXDATE:20180531T120000
+END:VEVENT
+BEGIN:VEVENT
+DTSTART:20180521T110000
+DTEND:20180521T140000
+DESCRIPTION:MyString
+LOCATION:MyString
+SUMMARY:MyString2
+RRULE:FREQ=WEEKLY;UNTIL=20180604T140000;BYDAY=TU,TH
+EXDATE:20180530T110000
+EXDATE:20180531T110000
+EXDATE:20180521T110000
+END:VEVENT
+END:VCALENDAR
\ No newline at end of file