Code

Ania and Suze#1

Code

Open

SuzHarrison wants to merge 70 commits intoAda-C5:masterAda-C5/VideoStoreAPI:masterfrom SuzHarrison:masterSuzHarrison/VideoStoreAPI:masterCopy head branch name to clipboard

+984-6

Commits

Commits on Jun 14, 2016

• psuedo code for routes.

  SuzHarrison

  committed
  2eaf465

• small change to routes file to require cust id and title for rentals

  SuzHarrison

  committed
  9140fac

• baseline completed. print json it works in json, at /zomg.

  SuzHarrison

  committed
  fa4ce05

• added scripts for db.

  SuzHarrison

  committed
  e03e453

Commits on Jun 15, 2016

• made changes to schema.sql, package.json, and made tasks/seed_data.js. Seed data now loads, and includes logic to take care of asynchronous seeding for customers and movies.

  SuzHarrison

  committed
  c841893

• added node run db:seed to the db:reset command in scripts package.json.

  SuzHarrison

  committed
  a7e7d95

• Created customers routes

  aniagonzalez

  committed
  d18f5b6

Commits on Jun 16, 2016

• added routes for movies and rentals. Added / routes to app.js file for each. working at root.

  SuzHarrison

  committed
  dadef92

• small change to post (from get) to rentals return route.

  SuzHarrison

  committed
  5a3475e

• small change to customer route for history.

  SuzHarrison

  committed
  d522894

• added contollers folder and movies_controller.

  SuzHarrison

  committed
  852f807

• made changes to movies route file calling on controller functions.

  SuzHarrison

  committed
  bacbd69

• Added customer routes

  aniagonzalez

  committed
  635b981

• changed movies route dynamic from name to title. Started redoing rentals routes. Opened a rentals_controller.js.

  SuzHarrison

  committed
  3f45045

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  abc06c2

• finished redoing the routes for rentals.

  SuzHarrison

  committed
  9c4d9a7

• basics for the customers controller

  aniagonzalez

  committed
  1b78096

• added mostly empty functions to movies_controller.js.

  SuzHarrison

  committed
  661e237

• adding parameters to the new functions.

  SuzHarrison

  committed
  db9f160

• small change to function name.

  SuzHarrison

  committed
  2255b0b

Commits on Jun 17, 2016

• Created customer model

  aniagonzalez

  committed
  3841493

• fixed circular app.get bug. added more to the movie model constructor.

  SuzHarrison

  committed
  7b66c21

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  aniagonzalez

  committed
  c55332f

• pushing changes to movie model. added this.title and this.id, as well as release_date and inventory.

  SuzHarrison

  committed
  4a043b3

• export modules missing

  aniagonzalez

  committed
  0f16284

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  aniagonzalez

  committed
  137c11e

• added _development to all references to video_store_api in seed scripts and in package.json. server wokin again.

  SuzHarrison

  committed
  06a287e

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  aniagonzalez

  committed
  271d97f

• Fixed typo

  Show description for 24b3e0f
  aniagonzalez

  committed
  24b3e0f

• Fixed Customer model

  aniagonzalez

  committed
  1de9c8f

• added properties to Movie model. now correctly getting json hash with info.

  SuzHarrison

  committed
  e465000

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  b8c9e89

• got Customers.all working

  aniagonzalez

  committed
  c9a803d

• route with query for customers sort

  aniagonzalez

  committed
  9ba25d6

• working on movies query routes and model.

  SuzHarrison

  committed
  2af017c

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  9c93b1a

• Customers can be sorted by name

  aniagonzalez

  committed
  70e3005

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  ccd6bbc

• customers sorted by name with limit and offset

  aniagonzalez

  committed
  93acdf2

• finally got sort by relase to work.

  SuzHarrison

  committed
  e367891

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  e2a630d

• Refactored sql query from run to find

  aniagonzalez

  committed
  ed3d48d

• added to ability to sort release_date or title through sort. working on server.

  SuzHarrison

  committed
  a5fe028

• Seeded Rentals

  aniagonzalez

  committed
  543c4fb

• updated test script

  aniagonzalez

  committed
  12ecba9

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  aniagonzalez

  committed
  9cf6b95

• movie/title/current route enabled. starting to work on movie controller.

  SuzHarrison

  committed
  d070933

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  7cd4de3

Commits on Jun 20, 2016

• commented out routes for editing

  SuzHarrison

  committed
  3f3f0d5

• You can now get movie rentals for a specific customer:

  aniagonzalez

  committed
  706c7da

• Customer current movies now only return movies with no return date

  aniagonzalez

  committed
  ecd858f

• Customer history gives all rentals with checkout and return date

  aniagonzalez

  committed
  1ce38eb

• movies. current now working.

  SuzHarrison

  committed
  aad4b53

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  aniagonzalez

  committed
  55fffe5

• Merge branch 'master' of github.com:SuzHarrison/VideoStoreAPI

  SuzHarrison

  committed
  e9fdace

• broken movies history.

  SuzHarrison

  committed
  98ae357

• saving routes uncommented now.

  SuzHarrison

  committed
  ef5e344

• fixed the circular app.js on customer and movie models. started model movie spec.js

  SuzHarrison

  committed
  2728048

Commits on Jun 21, 2016

• added db/movie/customers_by_movie.sql to extract the sql query from movies model. added to load_schema to load test db. changed some seed data.

  SuzHarrison

  committed
  802c19b

• got the rentals by title route working.

  SuzHarrison

  committed
  080e432

• changed the given data to the Rental.all by title.

  SuzHarrison

  committed
  13d1809

• fixed the route and methods for finding all customers that have renatls currently out for specific.

  SuzHarrison

  committed
  a2833c2

Commits on Jun 22, 2016

• starting the checkout route but not working.

  SuzHarrison

  committed
  11aa91b

Commits on Jun 23, 2016

• fixed the rentals controller so that information is stored correctly

  aniagonzalez

  committed
  85b4f51

• Set the return date for the rental checkout in db

  aniagonzalez

  committed
  03cf03f

• changed schema to accept decimal for account_credit in customers. added logic in model to charge for the movie.

  SuzHarrison

  committed
  e746491

• added function to rental models to charge for rental and change the inventory in the database.

  SuzHarrison

  committed
  08fe5f6

Commits on Jun 24, 2016

• started the return rental function. Route uncommented but function not working yet. urrently stuck on error: throw new Error('Can\'t set headers after they are sent.');

  SuzHarrison

  committed
  1a61a2b

• fixed the return rental and the double callback

  aniagonzalez

  committed
  fbffdad

• added overdue function.

  SuzHarrison

  committed
  87cd727