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.

Sign up for GitHub

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

Jump to bottom

Yordanos & Val #7

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Yordanos & Val #7

wants to merge 44 commits into from

Conversation

digivava
Copy link

Here's our video store API yaaaaay?

digivava and others added 30 commits June 14, 2016 15:05
@digivava
Set up basic controller structure for customers and tested out our co…
ac77c9d 
…de on a similar index controller
@digivava
Created other controller bases and added massive as a dependency
060d1a6
@digivava
Wrote some scripts for handling database, and set up connection with …
39bd746 
…massivejs
@yordanosd
removed load_schema file and added a seed file in tasks. Seeding data…
95af556 
… works. Added seed script to package.json
@digivava
Set up controller for movies and movie.all method in movie model. wor…
31e6969 
…king on callback function that handles that data now.
@digivava
Made it so db.movies.run callback method creates a new instance of movie
03945db
@yordanosd
added models folder and account.js file. created a find function in t…
9e675f8 
…he model and got cutomers.all to render a json response
@yordanosd
changed commit differences in app.js file
8bfcc38
@yordanosd
fixed a missing a comma in the controller before current that was cra…
4594099 
…shing the app file
@digivava
Set up error handling for movies controller index method
74f7d14
@yordanosd
fixing merge conflict from another branch
18067f2
@digivava
movies index endpoint WORKING FOR REALS yay
f519cdf
@digivava
Wrote callback method for Movie.sort in moviecontroller
ec2b0ce
@digivava
Finished Movie.sort method in model
58f07cd
@digivava
Added limit and offset functionality to Movie.sort
424a319
@yordanosd
completed customers sort path
4ee5fa1
@yordanosd
uncommented movie and rental routes in app file
622ea10
@yordanosd
fixed merge conflict in app file
d63af90
@yordanosd
created a script to run our test env
772c29e
@digivava
Created blank files for all controller tests and unit tests
5232b46
@digivava
Trying to get test script working
105ddba
@digivava
Fixed WEIRD issue with npm test not working
2c3aa1c
@yordanosd
added test db connection to seed and schema file
8e1622a
@yordanosd
added '/' route and added 'movies route' to movies controller test
75ab1a4
@yordanosd
finished reseeding data for both database types
77fb09c
@digivava
Got rentals show URL working
3632ea9
@digivava
Adjusted rentals show method so it gives back a single instance of a …
f12e2cf 
…movie instead of an array
@digivava
Removed id from JSON response for rentals show route
46f492b
@digivava
Removed total_inventory column and replaced with regular ol inventory…
6810c88 
… because test and development environment were getting different results because of STUFF
@digivava
Added POST route for rentals/:title/check-out
812608d
yordanosd and others added 14 commits June 20, 2016 16:52
@yordanosd
added the rental fee to customer and now returning both rental and cu…
56cdff7 
…stomer info in call back for rental/:title/check-out
@digivava
Added callback to updating customer info. The account credit now goes…
0f8896e 
… down by 2
@digivava
Working on Movies.current functionality
fd96a61
@digivava
Movie.current method now fully working. Changed time value for create…
4a3ea36 
…d_at and updated_at to fix timezone issue. Added callback to rental.save for new instance of rental. YAY THINGS WORK
@digivava
Inventory for movie now decreases when you check a copy out
02faef6
@digivava
Started documentation for movies routes
cf79f7d
@digivava
Finished documentation for movie routes
2ae54b1
@digivava
Currently working on api HTML version
3501756
@digivava
Got HTML view set up for documentation
c06f642
@digivava
Trying to format HTML view of documentation to show up in a user-read…
ecbb4c7 
…able way
@digivava
Added formatting for readability to HTML view
35dcf4e
@digivava
HTML VERSION OF DOCUMENTATION IS FINALLY DONE, I SHOULD HAVE USED REC…
893c08b 
…URSION AHHH
@digivava
Added controller test to see if JSON is returned from json docs page
3310410
@digivava
Added a model test to movie model, and one controller test for rentals
256f4e2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dezshino dezshino

@rileslovesyall rileslovesyall

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@digivava @dezshino @rileslovesyall @yordanosd