Code

Video Stores#2

Code

Open

annamm77 wants to merge 91 commits intoAda-C5:masterAda-C5/VideoStoreAPI:masterfrom annamm77:masterannamm77/VideoStoreAPI:masterCopy head branch name to clipboard

+896-89

Commits

Commits on Jun 14, 2016

• added customers and movies route files

  annamm77

  committed
  1f9bb09

• added movies and customers routes to app.js

  annamm77

  committed
  e3ccafe

• moved something

  annamm77

  committed
  86d8707

• tested zomg route and it worked

  annamm77

  committed
  3aac48f

• Added massive to npm, and gave it wave1 scripts

  nicosaki

  committed
  2d87356

• single route change /sort

  nicosaki

  committed
  3125a51

• db/setup schema

  nicosaki

  committed
  085fa3d

• load schema and (non functional) seeding tasks

  nicosaki

  committed
  6289482

• Updated package.json; scripts + seed to db:reset (not yet working)

  nicosaki

  committed
  4b9a5c9

• Added instance of controller to customers routes

  nicosaki

  committed
  44cf9d1

• Added instance of movies to movies routes

  nicosaki

  committed
  80cc378

• extra index routes

  nicosaki

  committed
  92c4acf

• fixed scripts, seed still bad

  nicosaki

  committed
  c13105c

• Idunnolol

  nicosaki

  committed
  82528b9

• Controller scaffolding, no complete methods

  nicosaki

  committed
  d064cb3

• Customers routes updated

  nicosaki

  committed
  9e4f462

• task to seed - INCORRECT

  nicosaki

  committed
  4334276

• movies routes to controller, includes rentals

  nicosaki

  committed
  aeaad3c

• not sure what you want me to commit, git

  nicosaki

  committed
  8b82b56

• log stuff that probably goes in the .gitignore

  nicosaki

  committed
  ea9ab9b

Commits on Jun 15, 2016

• moved controllers to correct file, deleted extra movies controller

  annamm77

  committed
  740a680

• updated seed script, unknown if works

  nicosaki

  committed
  d967453

• finished seed script with asynch functionality

  nicosaki

  committed
  d0f5940

• fixed schema - still no index but is working

  nicosaki

  committed
  e1b1b14

• fixed massive db errors

  nicosaki

  committed
  e0bfbbc

• edited an error where massive was being referred to as a database. changed to video_store.

  annamm77

  committed
  273fb94

• fixed seed script

  nicosaki

  committed
  3399dab

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

  nicosaki

  committed
  7ce6835

Commits on Jun 16, 2016

• two SQL commands for movies controller

  annamm77

  committed
  0d437a2

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

  nicosaki

  committed
  c51dd94

• sorttitle controller function returns JSON of sorted movie titles

  annamm77

  committed
  f100322

• movies sortrelease works

  annamm77

  committed
  ea0a928

• created rentals seed

  annamm77

  committed
  b254141

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

  nicosaki

  committed
  c445524

• Added rental seed script

  nicosaki

  committed
  730fd1c

• Ability to see currently checked out movies by id number

  nicosaki

  committed
  28c1ac3

• Ability to see previously checked out movies by id number

  nicosaki

  committed
  b1a410f

• added rentals to app.js routes

  annamm77

  committed
  0abe12d

• no rentals routes nevermind hehe

  annamm77

  committed
  444e42a

• Added all movies endpoints and rentalsTitle(NONFUNCTIONAL) to movies controller

  nicosaki

  committed
  8b5b222

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

  nicosaki

  committed
  58900ea

• added customer id to movie routes that check in and check out movies

  annamm77

  committed
  f8acce5

• scaffolded return function

  annamm77

  committed
  465c269

Commits on Jun 17, 2016

• updated movies/rentals/return route to a get

  annamm77

  committed
  378b6b3

• return function does what it's supposed to. might want to change what it renders on success

  annamm77

  committed
  05362cf

• return route returns 200 success upon update

  annamm77

  committed
  4359739

• changed movies/returns/checkout to get

  annamm77

  committed
  24d49ec

• checkout function will create a new rental instance

  annamm77

  committed
  362f029

• Methods all complete and functional for customer routes

  nicosaki

  committed
  49d5632

• All methods added for movie routes, functional, wheee

  nicosaki

  committed
  5ab6d98

• All endpoints complete and functional

  nicosaki

  committed
  c372c91

• added movies / route

  annamm77

  committed
  172a544

• added allMovies controller function for / path

  annamm77

  committed
  8efb962

• moved rentals/overdue route above rentals/:id route because it was getting stuck

  annamm77

  committed
  3faea59

• overdue controller function works

  annamm77

  committed
  09714e0

• Fixed customer info show for current and history sorts

  nicosaki

  committed
  4ea9647

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

  nicosaki

  committed
  08c4f34

• added start-test and test scripts

  annamm77

  committed
  def6b6f

• added customers controller spec file

  annamm77

  committed
  4de6aee

• added n and p to queries involving configurable sorting

  nicosaki

  committed
  da60deb

• movies controller with custome information displayed in current/history retrieval, plus n and p query functionality

  nicosaki

  committed
  78d72af

• fixed route for sorting by release-date

  nicosaki

  committed
  644b1db

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

  nicosaki

  committed
  457d37c

• all endpoints complete and functionally tested. Formal testing next

  nicosaki

  committed
  a60b62f

Commits on Jun 20, 2016

• checkout function deducts from customers account

  annamm77

  committed
  e5f18d0

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

  annamm77

  committed
  e0b5145

• checkout and return are now posts instead of gets. works in postman so thats cool

  annamm77

  committed
  8e7ff34

• installed istanbul

  annamm77

  committed
  43b7613

• remove coverage from git tracking

  annamm77

  committed
  50e9829

• updated test script to include instanbul and it works yey

  annamm77

  committed
  0cd3c08

• Created documentation for our API, have not yet connected its existence to serve it up JSON or HTML

  nicosaki

  committed
  57a09ab

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

  nicosaki

  committed
  775ae32

• tests for /movies route

  annamm77

  committed
  9aee2be

• testing for /customers

  annamm77

  committed
  aa195e6

• Added .json documentation endpoint, successful.

  nicosaki

  committed
  4a3e3aa

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

  nicosaki

  committed
  1044e71

Commits on Jun 21, 2016

• added array of objects tests for movies and cusomters

  annamm77

  committed
  3e8b816

• Minor test change

  nicosaki

  committed
  8dc8e1e

• test coverage for more endpoints in movies

  annamm77

  committed
  e9121ec

Commits on Jun 22, 2016

• fixmerge

  nicosaki

  committed
  8a34e0d

• MERGE ALREADY

  nicosaki

  committed
  5b5a978

Commits on Jun 23, 2016

• Fixed tests, all pass; functional testing not being checked by istanbul

  nicosaki

  committed
  d21395e

• deleted a bracket because javascript

  annamm77

  committed
  8d89d2c

• removed the bracket i worked so hard to delete

  annamm77

  committed
  5169923

• refactored doubled sql commands

  annamm77

  committed
  3370f6b

Commits on Jun 24, 2016

• added details for checkout route

  annamm77

  committed
  226ab50

• fixed bug with rentalstitle

  annamm77

  committed
  6b1acb1

• edited checkout URL

  annamm77

  committed
  8cd23ac

• added statement about errors

  annamm77

  committed
  93668cc

• edited some so that errors will show

  annamm77

  committed
  3158e46

• minor edits

  annamm77

  committed
  439fb49