Code

Natalia & Cynthia#19

Code

Open

natalia-ku wants to merge 79 commits intoAda-C7:masterAda-C7/VideoStoreAPI:masterfrom natalia-ku:masterCopy head branch name to clipboard

+1,971-273

Commits

Commits on May 9, 2017

• generated controllers? models? seeeds

  natalia-ku

  committed
  4fb27ff

  Copy full SHA for 4fb27ff

• added missing fields to db tables

  cynthiacd

  committed
  b4031ae

  Copy full SHA for b4031ae

• seeded customer data

  cynthiacd

  committed
  0bf8287

  Copy full SHA for 0bf8287

• seeded movies data

  natalia-ku

  committed
  b5a313a

  Copy full SHA for b5a313a

• merged conflicts resolved

  natalia-ku

  committed
  9029035

  Copy full SHA for 9029035

• added movie validations in model

  cynthiacd

  committed
  7e6293c

  Copy full SHA for 7e6293c

• added movie fixtures

  cynthiacd

  committed
  04f4c21

  Copy full SHA for 04f4c21

• added movie validation tests

  cynthiacd

  committed
  60170ce

  Copy full SHA for 60170ce

• working on movies index method and testing

  cynthiacd

  committed
  dbdf7af

  Copy full SHA for dbdf7af

• added tests for model Customer and customers controller

  natalia-ku

  committed
  15a70a5

  Copy full SHA for 15a70a5

• added tests for model Customer and customers controller

  natalia-ku

  committed
  916e7a0

  Copy full SHA for 916e7a0

• passing movie index tests

  cynthiacd

  committed
  7559976

  Copy full SHA for 7559976

• dryed up model validations testing

  cynthiacd

  committed
  362d3e0

  Copy full SHA for 362d3e0

• added test for validation

  natalia-ku

  committed
  96245c5

  Copy full SHA for 96245c5

• added movie show request

  cynthiacd

  committed
  44b83da

  Copy full SHA for 44b83da

• merged get_movies into master

  cynthiacd

  committed
  6236dcb

  Copy full SHA for 6236dcb

Commits on May 10, 2017

• added 2 tests for show movie method

  natalia-ku

  committed
  c638a5f

  Copy full SHA for c638a5f

• fixed test for movies cotnroller

  natalia-ku

  committed
  9866184

  Copy full SHA for 9866184

• added serializer for customers

  natalia-ku

  committed
  c99020e

  Copy full SHA for c99020e

• finished with test

  natalia-ku

  committed
  4680f83

  Copy full SHA for 4680f83

• fixed test for movies show method

  natalia-ku

  committed
  d3c8eca

  Copy full SHA for d3c8eca

• fixed typo in table column

  natalia-ku

  committed
  0152a5e

  Copy full SHA for 0152a5e

• added serializer for movies controller

  cynthiacd

  committed
  6c2fdd6

  Copy full SHA for 6c2fdd6

• typo in movie

  natalia-ku

  committed
  8915dbc

  Copy full SHA for 8915dbc

• Merge branch 'master' of https://github.com/natalia-ku/VideoStoreAPI

  natalia-ku

  committed
  7a43b5a

  Copy full SHA for 7a43b5a

• created rentals table and relationships between models

  cynthiacd

  committed
  23a7338

  Copy full SHA for 23a7338

• Merge branch 'master' of https://github.com/natalia-ku/VideoStoreAPI

  natalia-ku

  committed
  53e5072

  Copy full SHA for 53e5072

• added rental validations

  cynthiacd

  committed
  655a03c

  Copy full SHA for 655a03c

• Merge branch 'master' of https://github.com/natalia-ku/VideoStoreAPI

  natalia-ku

  committed
  a31bd11

  Copy full SHA for a31bd11

• success test for rental validations

  cynthiacd

  committed
  b488bb9

  Copy full SHA for b488bb9

• test for missing rental validations

  cynthiacd

  committed
  fb947e7

  Copy full SHA for fb947e7

• added create method for rentals

  natalia-ku

  committed
  e4b19a1

  Copy full SHA for e4b19a1

• Merge branch 'nk-rentals'

  cynthiacd

  committed
  d69d9af

  Copy full SHA for d69d9af

• have rental checkout method working

  cynthiacd

  committed
  b7ab645

  Copy full SHA for b7ab645

• create method for rentals

  natalia-ku

  committed
  b23796e

  Copy full SHA for b23796e

• Merge branch 'nk-rentals' of https://github.com/natalia-ku/VideoStoreAPI into nk-rentals

  natalia-ku

  committed
  a840b8a

  Copy full SHA for a840b8a

• added get overdue ,ethod to Movie controller

  natalia-ku

  committed
  aecc061

  Copy full SHA for aecc061

• Merge branch 'master' of https://github.com/natalia-ku/VideoStoreAPI

  natalia-ku

  committed
  473d60b

  Copy full SHA for 473d60b

• Merge branch 'nk-rentals' into rentals_checkout

  natalia-ku

  committed
  710ab33

  Copy full SHA for 710ab33

• get overdue movies method works

  natalia-ku

  committed
  95c6632

  Copy full SHA for 95c6632

• success test for rental create

  cynthiacd

  committed
  6384a23

  Copy full SHA for 6384a23

• added to rentals create success test

  cynthiacd

  committed
  5e3812f

  Copy full SHA for 5e3812f

• added failure case for rental create - bad customer id

  cynthiacd

  committed
  feac1e3

  Copy full SHA for feac1e3

Commits on May 11, 2017

• made serializer for overdue works

  natalia-ku

  committed
  e8d086e

  Copy full SHA for e8d086e

• add fail case for rental create given movie DNE

  cynthiacd

  committed
  d1a8c5c

  Copy full SHA for d1a8c5c

• added update method for rentals

  natalia-ku

  committed
  2d432a1

  Copy full SHA for 2d432a1

• tests for Rental model overdue_movies method

  natalia-ku

  committed
  760f1fd

  Copy full SHA for 760f1fd

• added tests for controller overdue rentals method

  natalia-ku

  committed
  c5b977c

  Copy full SHA for c5b977c

• typis in routes

  natalia-ku

  committed
  6dd09c7

  Copy full SHA for 6dd09c7

• tests working

  natalia-ku

  committed
  f69235a

  Copy full SHA for f69235a

• cleaned up test files

  cynthiacd

  committed
  5f0bc3f

  Copy full SHA for 5f0bc3f

• merged rental overdue and checkin features

  cynthiacd

  committed
  65b53c1

  Copy full SHA for 65b53c1

• tsts for overdue_movies are orking

  natalia-ku

  committed
  c5b5093

  Copy full SHA for c5b5093

• fixed test for overdue movies in Rentals controller

  natalia-ku

  committed
  bb2ded9

  Copy full SHA for bb2ded9

• working on checked in testing - found major bug

  cynthiacd

  committed
  4568570

  Copy full SHA for 4568570

Commits on May 12, 2017

• tests for overdue movies are working

  natalia-ku

  committed
  260436d

  Copy full SHA for 260436d

• make update inventory work in create method

  natalia-ku

  committed
  0831f1e

  Copy full SHA for 0831f1e

• make update inventory work in create method

  natalia-ku

  committed
  8e0cebe

  Copy full SHA for 8e0cebe

• create and update works but two tests now are failing

  natalia-ku

  committed
  09db5de

  Copy full SHA for 09db5de

• added a current duplicate rental check

  cynthiacd

  committed
  098049e

  Copy full SHA for 098049e

• available inventory working

  natalia-ku

  committed
  dfb4c7b

  Copy full SHA for dfb4c7b

• added available inventory method to controller

  natalia-ku

  committed
  34348b9

  Copy full SHA for 34348b9

• working on rentals controller tests

  cynthiacd

  committed
  38f152b

  Copy full SHA for 38f152b

• added tests for update rental controller action

  natalia-ku

  committed
  4b370ee

  Copy full SHA for 4b370ee

• rental checkin and overdue passing tests

  cynthiacd

  committed
  0ce4434

  Copy full SHA for 0ce4434

• removed rental update tests to prepare for merge

  cynthiacd

  committed
  0fbb0c2

  Copy full SHA for 0fbb0c2

• trying to refactor creTE IN RENTALS CONTROLLER

  natalia-ku

  committed
  04dbdb3

  Copy full SHA for 04dbdb3

• merged update and create tests for rentals

  natalia-ku

  committed
  1675135

  Copy full SHA for 1675135

• added tests for update and create method to test available inventroy and movies count

  natalia-ku

  committed
  355a4d7

  Copy full SHA for 355a4d7

• added check inventory rental validation

  cynthiacd

  committed
  517c060

  Copy full SHA for 517c060

• added check inventory rental validation

  cynthiacd

  committed
  d8eae4c

  Copy full SHA for d8eae4c

• added edge case inventory validation test

  cynthiacd

  committed
  f15ff3d

  Copy full SHA for f15ff3d

• cleaning up rental validations tests

  cynthiacd

  committed
  7888bd5

  Copy full SHA for 7888bd5

• cleaned up model files create_rental method

  cynthiacd

  committed
  6947be1

  Copy full SHA for 6947be1

• added tests for update and creTE

  natalia-ku

  committed
  a993420

  Copy full SHA for a993420

• commented out controller and tests

  natalia-ku

  committed
  012f430

  Copy full SHA for 012f430

• merge inventory branches

  cynthiacd

  committed
  2ed392f

  Copy full SHA for 2ed392f

• final clean up of files

  cynthiacd

  committed
  0cb37b0

  Copy full SHA for 0cb37b0

• more spacing cleanuo

  cynthiacd

  committed
  b82c077

  Copy full SHA for b82c077