Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ampers - Abinnet + Lily #16

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
85e505e
g models, set up db, g api, updated rails-template file on Lily's local
lillers1122 May 7, 2018
a351df8
created routes for customer index and movies index, show and create
lillers1122 May 7, 2018
55a5ab5
created controller for movies and customers, rails reflect controller…
lillers1122 May 7, 2018
6f285df
validations for customers and movies
lillers1122 May 7, 2018
9cf126e
registered_at column added to customer
lillers1122 May 7, 2018
7995bfa
customer zip not postal_code
lillers1122 May 7, 2018
529054d
created movies controller tests
Abiaina May 7, 2018
47b028a
customer - controller tests, controller index, fixutres, model tests …
lillers1122 May 7, 2018
e5305ea
movie model testing validations written
Abiaina May 7, 2018
8ff62f7
customer model tests
lillers1122 May 7, 2018
3b8c4ee
merge resolution
lillers1122 May 7, 2018
c8e28d4
finished controller testing and writing code for customer and movie
Abiaina May 8, 2018
54358d9
params fixed and wave 2 postman tests pass - fails related to optionals
lillers1122 May 8, 2018
761945b
created rental model, validations and relationshps with customer and …
Abiaina May 8, 2018
750f104
uncommented out model validations
Abiaina May 8, 2018
fa833a2
rental controller generated; rental route futzed with; rental model v…
lillers1122 May 8, 2018
af8dcae
merge resolution
lillers1122 May 8, 2018
693ba81
updated new rental route; fixed rental create typo
lillers1122 May 8, 2018
ca24c2f
model validations for rentals passing and created
Abiaina May 8, 2018
4e90c9e
updated movie model tests and model ymls are still not working. movie…
Abiaina May 8, 2018
c9d72f1
updated routes to be more RESTFUL
Abiaina May 9, 2018
0430c9b
updated routes, test now pass for controller rental create path with …
Abiaina May 9, 2018
718ec59
movies have column tracking available inventory as integer
Abiaina May 9, 2018
345aa17
added model test for decrement available inventory method created in …
Abiaina May 9, 2018
db2eb30
movie yml working; validations for movie updated to include avail_inv…
lillers1122 May 9, 2018
c6453f4
model and controller tests; work on checkin-out and check-in
lillers1122 May 9, 2018
0455297
tests updated after conversation with Chris
lillers1122 May 9, 2018
406466b
many nominal tests passing
lillers1122 May 9, 2018
8ec5286
added column to customers tracking movie rental count, reseeded data,…
Abiaina May 9, 2018
2e826d4
updated movie show and index api outputs in code and tests
Abiaina May 9, 2018
e5ae520
updated api show json for customers to reflect wave requirements, upd…
Abiaina May 9, 2018
19f7e18
updated body response for creating a movie in api and testing
Abiaina May 9, 2018
1fbcdbf
post checkout route updated
lillers1122 May 9, 2018
31051b9
all postman tests pass but one
lillers1122 May 10, 2018
157a2ea
rental controller tests updated and passing
lillers1122 May 10, 2018
0d9e083
created and passed edge cases for rental controller create action
Abiaina May 11, 2018
8c19caf
added more tests in rentals controller and updated rental controller …
Abiaina May 11, 2018
cb3ef1f
removed update controller test line passing customer id in params, th…
Abiaina May 11, 2018
402fc53
added edge case testing upate action, need to update update controlle…
Abiaina May 11, 2018
41e18c2
attempted to pass update edge case with nil movie , make model method…
Abiaina May 11, 2018
b668b00
code to account for postman test that doesn't have available_inventor…
lillers1122 May 11, 2018
ddd08d1
rental code adjustments - invalid create tests need attention
lillers1122 May 11, 2018
c045ad2
customer add and remove movie functionaltiy and model tests
lillers1122 May 11, 2018
09cf8da
rental controller tests passing, fixed errors in update and create ac…
Abiaina May 11, 2018
4bc363b
removed redundant code and added nil filters for customer values, inc…
Abiaina May 11, 2018
d60f25e
added merge conflict missing info in customer update removie movie me…
Abiaina May 11, 2018
aee83b2
tests fixed with charles; thank you; postman all pass
lillers1122 May 11, 2018
a88dc65
reworded update rental test
lillers1122 May 11, 2018
7fe18cb
cleaned up tests
lillers1122 May 11, 2018
7a937cf
fixed error messages for failing tests in rentals controller
Abiaina May 11, 2018
362d37a
Merge branch 'master' of https://github.com/lillers1122/VideoStoreAPI
Abiaina May 11, 2018
6caca68
removed comments and tests still pass
Abiaina May 11, 2018
418cf78
went over the testing again with Mariano notes in tests for tests to …
Abiaina May 24, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

.byebug_history
50 changes: 50 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
# gem 'rack-cors'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
end

group :development do
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :development, :test do
gem 'pry-rails'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
154 changes: 154 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (8.0.0)
builder (3.2.3)
byebug (10.0.2)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
erubi (1.7.1)
ffi (1.9.23)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
puma (3.11.4)
rack (2.0.5)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)

PLATFORMS
ruby

DEPENDENCIES
byebug
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data

BUNDLED WITH
1.16.1
Loading