Commit graph

221 commits

Author SHA1 Message Date
Ahmet Alp Balkan
7f4319ae54 frontend: order result screen
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-28 00:15:16 -07:00
Ahmet Alp Balkan
21909b4674 k8s: cartservice listen addr
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 22:31:50 -07:00
Ahmet Alp Balkan
7c83802b9e fix cartservice listen addr
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 22:31:50 -07:00
Simon Zeltser
4373f02025 Merge remote-tracking branch 'origin' into createCartService 2018-06-27 22:30:06 -07:00
Simon Zeltser
f06bc11dd4 Renaming cart service env vars
Renaming Cart service environment variables:
CART_SERVICE_ADDR => LISTEN_ADDR
CART_SERVICE_PORT => PORT
2018-06-27 22:28:04 -07:00
Ahmet Alp Balkan
483e113643 frontend: place order
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 22:16:03 -07:00
Ahmet Alp Balkan
3eb02c0679 frontend/templates: reenable empty cart
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 16:28:16 -07:00
Ahmet Alp Balkan
05cb7ecfb9 currencyservice: fix nanos overflow due to rounding
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 16:24:26 -07:00
Ahmet Alp Balkan
0dc4055b82 breaking changes to Address in proto
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 15:51:33 -07:00
Ahmet Alp Balkan
2ec570c507 frontend: checkout form
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 15:43:24 -07:00
Ahmet Alp Balkan
10748d6b0a frontend/templates: fix money rendering
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 14:55:19 -07:00
Ahmet Alp Balkan
6c2336b21e frontend: money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 14:31:38 -07:00
Ahmet Alp Balkan
71c27ccea0 checkoutservice: money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 14:27:17 -07:00
Ace Nassri
6f1a3d79e1 Move to new proto + add magic of left-pad 2018-06-27 13:51:08 -07:00
Ahmet Alp Balkan
51d5e9a3ed currencyservice: [WIP] money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:18 -07:00
Ahmet Alp Balkan
f5dc3dd056 checkoutservice: money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:17 -07:00
Ahmet Alp Balkan
3d22afac72 delete currencyservicetemp implementation
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:17 -07:00
Ahmet Alp Balkan
129eb9be66 paymentservice: money proto migration
the logs will reflect full nanos representation, I'm not sure how to
divide this by 10000000 and left pad a zero (%02d).

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:17 -07:00
Ahmet Alp Balkan
c2b08f0793 shippingservice: money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:17 -07:00
Ahmet Alp Balkan
8a07a97872 recommendationservice: money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:17 -07:00
Ahmet Alp Balkan
bc87db4601 test-cli: money proto migration
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:16 -07:00
Ahmet Alp Balkan
c43dcd7c90 productcatalog: regenerate protos
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:16 -07:00
Ahmet Alp Balkan
8ca3593635 frontend/money: add money utilities
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:16 -07:00
Ahmet Alp Balkan
3144c87e21 frontend: ui tweaks
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-27 13:30:16 -07:00
Simon Zeltser
22762b28bd Fixing AddItem and adding more tests/cartservice/CartServiceTests
Updated AddItem functionality so it handles update quantities scenario.
Added tests
2018-06-27 10:33:18 -07:00
Simon Zeltser
6891793b4e Merge remote-tracking branch 'origin' into createCartService 2018-06-26 14:47:41 -07:00
Simon Zeltser
2041bdcb48 Fixing GetCart for non-existing user
Now GetCart returns an empty cart for non-existing user
(user that haven't added anything to the cart before)
Added test to cover that

Also enhanced windows script for running cart service locally.
Now we have two options:
 - Running the service and redis locally (assuming redis emulator is installed)
   This is good for easier local debugging and troubleshooting

   docker_setup local

 - Running the service and redis in two separate docker containers
   This is good for better simulation of what will happen in the cloud
2018-06-26 14:41:00 -07:00
Ahmet Alp Balkan
908df8d331 frontend: integrate recommmendationservice
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-26 14:19:22 -07:00
Ahmet Alp Balkan
9634693f37 recommendationservice: exclude input ids
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-26 14:01:05 -07:00
Ahmet Alp Balkan
289bd4db13 frontend: view cart, add to cart, empty cart
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-26 12:55:07 -07:00
Ahmet Alp Balkan
f3fe6d42ad connect cartservice
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-26 11:01:24 -07:00
Ahmet Alp Balkan
36b7b9eb65 frontend: stop refreshing cookies
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-25 23:26:26 -07:00
Ahmet Alp Balkan
e16172c14a frontend: product page
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-25 22:47:33 -07:00
Ahmet Alp Balkan
8a6be04035 productcatalog: longer product IDs
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-25 22:47:21 -07:00
Ahmet Alp Balkan
6268802ab5 frontend: homepage template showing products
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-25 21:55:09 -07:00
Ahmet Alp Balkan
4ccf44582f frontend/productservice: add product inventory
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-25 21:51:48 -07:00
Ace Nassri
f6ab191e2f Add logs 2018-06-25 15:47:39 -07:00
Ace Nassri
296841756d Add caching 2018-06-25 13:16:40 -07:00
Ahmet Alp Balkan
7063092393 frontend: more organization
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-25 11:18:08 -07:00
Simon Zeltser
ef92ddc351 Merge remote-tracking branch 'origin' into createCartService 2018-06-25 09:49:39 -07:00
Simon Zeltser
c3c76effea Fixing cache implementation 2018-06-25 09:44:56 -07:00
Ahmet Alp Balkan
3cbda5fc65 frontend: add home template
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-24 23:37:28 -07:00
Ahmet Alp Balkan
11ba676828 frontend: connect to productcatalog, currencysvc
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-24 23:37:28 -07:00
Ahmet Alp Balkan
f734e96733 frontend: initial prototype
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-24 23:37:28 -07:00
Simon Zeltser
3262ff82b0 Updating docker file to not include ports. Added scripts folder and script to run docker with env vars passed via command line. Also now the build and packaging is happening in container 2018-06-22 17:17:34 -07:00
Ace Nassri
97a36a6374 Fix math bug 2018-06-22 15:44:50 -07:00
Ace Nassri
1fa7b44c83 Fix bugs 2018-06-22 14:51:01 -07:00
Ace Nassri
9620c9bb1c Actually add protos 2018-06-22 14:35:37 -07:00
Ace Nassri
057d8ae35a Switch to genproto.sh 2018-06-22 14:14:43 -07:00
Ace Nassri
ab5fb7bde4 Fix nit 2018-06-22 13:54:40 -07:00
Ace Nassri
28a6fbb8f1 Initial commit 2018-06-22 13:43:39 -07:00
Ahmet Alp Balkan
ea974982bd rm redundant leftover comment
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-22 11:52:13 -07:00
Ahmet Alp Balkan
31adf1400c test-cli: add smoke test for cartservice
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-22 11:50:36 -07:00
Ahmet Alp Balkan
2d5dcfb3f6 currencyservice: fix test, add test for fractional result
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-22 11:43:41 -07:00
Ahmet Alp Balkan
7d1d1d6614 checkoutservice: activate cartservice link
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-22 09:12:41 -07:00
Ahmet Alp Balkan
9deb87d62f remove unused .gitkeep
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 22:35:54 -07:00
Ahmet Alp Balkan
fa46e85220 currencyservicefake: temp replacement for currencysvc
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 22:34:46 -07:00
Ahmet Alp Balkan
5b3530c021 test-cli: refactor currencyservice smoke test
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 22:34:17 -07:00
Ahmet Alp Balkan
1c00f04e1e paymentservice: check in proto/
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 22:33:38 -07:00
Ahmet Alp Balkan
08144db10a checkoutservice prototype!!1
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 21:36:01 -07:00
Simon Zeltser
4646d528b7 Merge branch 'master' of sso://user/ahmetb/microservices-demo into createCartService 2018-06-21 15:45:40 -07:00
Jonathan Lui
d37c0841ce return v4 uuid for paymentservice 2018-06-21 15:04:37 -07:00
Simon Zeltser
bd7da5fe89 Merge branch 'master' of sso://user/ahmetb/microservices-demo into createCartService 2018-06-21 14:54:12 -07:00
Simon Zeltser
5d44d019b3 Fixing docker issues. Now the server can run in linux docker container but doesn't work with real redis yet 2018-06-21 14:53:07 -07:00
Jonathan Lui
cb6a105b51 PaymentService: use genproto.sh to cp proto to paymentservice 2018-06-21 14:40:14 -07:00
Ahmet Alp Balkan
25dd31952c checkoutservice: change port to 5050
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 14:07:08 -07:00
Ahmet Alp Balkan
28956fb240 unify ENTRYPOINTS in dockerfiles (no /bin/sh)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 14:03:04 -07:00
Jonathan Lui
91663aa541 Merge branch 'master' of sso://user/ahmetb/microservices-demo 2018-06-21 13:03:40 -07:00
Jonathan Lui
47669a51f7 copy over proto into payment-service; add Dockerfile and .dockerignore node_modules 2018-06-21 13:02:41 -07:00
Jonathan Lui
88ac6d8fc1 more validation on credit card info; change smoke test for payment service to have a valid credit card 2018-06-21 12:48:53 -07:00
Ahmet Alp Balkan
4ade7ddb29 remove -v from go-build dockerfiles
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 12:40:07 -07:00
Ahmet Alp Balkan
f06818db0c checkoutservice: partial implementation
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 12:15:53 -07:00
Ahmet Alp Balkan
95ed2f3b64 Merge branch 'master' of sso://user/ahmetb/microservices-demo 2018-06-21 11:45:06 -07:00
Ahmet Alp Balkan
164e52fa44 checkoutservice: add code stubs, TODO implement
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 11:44:47 -07:00
Simon Zeltser
238197008c Merge branch 'master' of sso://user/ahmetb/microservices-demo into createCartService 2018-06-21 11:22:43 -07:00
Simon Zeltser
d7d9165da6 added gitignore file for .net proj 2018-06-21 11:19:48 -07:00
Jonathan Lui
c7e7692057 indents 2018-06-21 11:19:28 -07:00
Ahmet Alp Balkan
af9db7b021 recommendationsvc: compile_proto.sh -> genproto.sh
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 11:12:17 -07:00
Simon Zeltser
0ce195bb80 command line arguments handling 2018-06-21 11:10:13 -07:00
Simon Zeltser
8860d8bfdd added redis integration and command line arguments handling to cart service. Didn't test in the cloud yet 2018-06-21 11:09:12 -07:00
Jonathan Lui
7a6edd751d finish up PaymentService 2018-06-21 10:52:34 -07:00
Ahmet Alp Balkan
e5ea2154d2 recommendationservice: add requirements.txt
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 10:31:07 -07:00
Dan Sanche
017c8a91ed Merge branch 'master' of sso://user/ahmetb/microservices-demo 2018-06-21 10:27:28 -07:00
Dan Sanche
31d099b861 Merge branch 'master' of sso://user/ahmetb/microservices-demo 2018-06-21 10:26:32 -07:00
Ahmet Alp Balkan
1372aad813 recommendationservice: require PRODUCT_CATALOG_SERVICE_ADDR
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 10:22:28 -07:00
Ahmet Alp Balkan
2f8b278718 rm .DS_Store files
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-21 09:28:48 -07:00
Dan Sanche
61291a5105 regenerated protos 2018-06-20 23:53:23 -07:00
Dan Sanche
5cdc65777a regenerated protos 2018-06-20 23:40:47 -07:00
Dan Sanche
933a05205f pull ids from product catalog service 2018-06-20 23:26:32 -07:00
Dan Sanche
c753f9a6ff added product catalog address env var 2018-06-20 22:37:56 -07:00
michaelawyu
1fc51262ff Added Cloud Mail client library + Dummy mode support + Minor Fixes 2018-06-20 18:14:28 -07:00
Ahmet Alp Balkan
c9525d8e06 regenerate go protos after breaking change
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 17:00:52 -07:00
Ahmet Alp Balkan
dfb0ae215f test-cli: minor fix
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 16:56:39 -07:00
Ahmet Alp Balkan
626342e9bb test-cli: add smoke test for currencyservice
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 16:55:43 -07:00
Ahmet Alp Balkan
52cc8faef9 test-cli: add smoke test for emailservice
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 16:24:22 -07:00
Simon Zeltser
572c02f588 Merge branch 'master' of sso://user/ahmetb/microservices-demo into createCartService 2018-06-20 15:53:12 -07:00
Simon Zeltser
2df80b14c9 Initial commit of cart service using .net core 2.0. Working prototype without cache implementation (yet) 2018-06-20 15:40:07 -07:00
Ahmet Alp Balkan
f3efae6203 test-cli: add smoke test for payment service
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 15:16:32 -07:00
Ahmet Alp Balkan
2316e25504 change Product.id to string
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 12:20:39 -07:00
Ahmet Alp Balkan
cc8ef35006 test-cli: add smoke tests for recommendation service
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-20 10:20:51 -07:00
Ahmet Alp Balkan
2d4f4f884a shippingservice: minify dockerfile, unify genproto
also fixed a bug causing non-letter chars in tracking ID.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-19 23:04:53 -07:00
Ahmet Alp Balkan
44e6671727 test-cli: add smoke test for shippingservice
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-19 23:04:39 -07:00
Ahmet Alp Balkan
810a74a463 productcatalogservice: add Dockerfile
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-19 23:04:28 -07:00
Ahmet Alp Balkan
0cb633c4df add a test-cli to run smoke tests manually
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-19 21:40:07 -07:00
michaelawyu
5da1f85b76 Added email service 2018-06-18 16:02:00 -07:00
Jonathan Amsterdam
9c1d009e39 remove .gitgkeep 2018-06-16 09:39:49 -04:00
Jonathan Amsterdam
d94ba7a752 Merge branch 'master' of sso://user/ahmetb/microservices-demo 2018-06-16 09:37:37 -04:00
Jonathan Amsterdam
914f07f307 productcatalogservice: implementation 2018-06-16 09:37:11 -04:00
adamross
1b3cbff698 Add shipping service. 2018-06-15 15:11:53 -07:00
Jonathan Amsterdam
9af0ca0eda add productcatalogservice dir 2018-06-15 07:53:47 -04:00
Dan Sanche
0cf418df99 recommender now returns ids instead of products 2018-06-14 16:10:11 -07:00
Dan Sanche
fd6b66faeb removed pyc files 2018-06-14 15:59:59 -07:00
Dan Sanche
8375b4b1e2 added ports to script arguments 2018-06-14 15:52:41 -07:00
Dan Sanche
62153ef88e added client 2018-06-14 15:31:06 -07:00
Dan Sanche
9c6f36c605 added implementation of server 2018-06-14 12:45:44 -07:00
Dan Sanche
0844d37872 added protobuffs 2018-06-14 12:30:50 -07:00
Dan Sanche
11eed708b6 added basic Dockerfile and python script 2018-06-14 11:03:02 -07:00
Dan Sanche
671602879e added directory for recommendation service 2018-06-14 10:42:24 -07:00
Adam Ross
2f22da40f4 Add directory for shippingservice. 2018-06-13 15:09:57 -07:00
Jonathan Lui
c4c7799f25 create src/paymentservice dir 2018-06-13 15:00:54 -07:00
Ahmet Alp Balkan
bdd32edae6 Add src dirs
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-06-13 14:26:55 -07:00