Commits · cdec8ee353a38951588b1756a1a9efed26df9ca5 · Ascend / promotions-service

10 May, 2021 1 commit

Merge branch 'dev' into 'AFP-59' · cdec8ee3

Sumaiyya Burney authored May 10, 2021

# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java
#   src/main/java/com/nisum/ascend/promotions/exception/RestWebExceptionHandler.java
#   src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

cdec8ee3

07 May, 2021 1 commit
- Created DOckerfile · b7b0fe12
  Ben Anderson authored May 07, 2021
  
  b7b0fe12
06 May, 2021 9 commits
- Merge branch 'AFP-61' into dev · c2cc691d
  John Lam authored May 06, 2021
  
  c2cc691d
- Merge branch 'dev' of https://gitlab.mynisum.com/ascend/promotions-backend into dev · d7e70e39
  John Lam authored May 06, 2021
  
  d7e70e39
- Merge remote-tracking branch 'origin/dev' into AFP-61 · f9d0c96d
  Julius Wu authored May 06, 2021
```
# Conflicts:
#	src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java
```
  f9d0c96d
- Merge branch 'AFP-65' into 'dev' · 0f54d0d0
  Julius Wu authored May 06, 2021
```
Implements getting promotions by product SKU + tests

See merge request !3
```
  0f54d0d0
- Changed return type of getPromotionById · 969bcf97
  Ben Anderson authored May 06, 2021
  
  969bcf97
- post route completed · 4796cd95
  Julius Wu authored May 06, 2021
  
  4796cd95
- Created test for getPromotionByPromoId · 69a4a442
  Ben Anderson authored May 06, 2021
  
  69a4a442
- Added error message to error response · ae8d9aba
  Ben Anderson authored May 06, 2021
  
  ae8d9aba
- Added the GET /api/promos/{id} route with validations · 1e87cd4f
  Ben Anderson authored May 06, 2021
  
  1e87cd4f
05 May, 2021 10 commits
- Tests gettingPromosByProductSku · 20d28bcb
  Sumaiyya Burney authored May 05, 2021
  
  20d28bcb
- Merge branch 'AFP-64' into 'dev' · b02db479
  John Lam authored May 05, 2021
```
Gets all promotions + tested

See merge request !1
```
  b02db479
- Merge branch 'AFP-64' into dev · cd29ffe2
  John Lam authored May 05, 2021
  
  cd29ffe2
- Merge branch 'AFP-64' into 'AFP-65' · 539f7d85
  Sumaiyya Burney authored May 05, 2021
```
Tests getAllPromos

See merge request !2
```
  539f7d85
- Merge branch 'AFP-65' into 'AFP-64' · cf3f015f
  Sumaiyya Burney authored May 05, 2021
```
# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java
```
  cf3f015f
- Tests getAllPromos · a6e4dd25
  Sumaiyya Burney authored May 05, 2021
  
  a6e4dd25
- Adds query param to find promo by prod SKU · 680db9db
  Sumaiyya Burney authored May 05, 2021
  
  680db9db
- Specifies collection name in Promotion.java · 929f95a1
  Sumaiyya Burney authored May 05, 2021
  
  929f95a1
- Adds get all promos endpt · a363227b
  Sumaiyya Burney authored May 05, 2021
  
  a363227b
- Links application.properties and secret.properties · 3f0fbb6d
  Sumaiyya Burney authored May 05, 2021
  
  3f0fbb6d
04 May, 2021 5 commits
- Adds endpoint skeletons · f30e23dd
  Sumaiyya Burney authored May 05, 2021
  
  f30e23dd
- Adds DB connection + Swagger UI, changes to port 8081 · f27e4b90
  Sumaiyya Burney authored May 04, 2021
  
  f27e4b90
- Creates PromotionDto · 06da550a
  Sumaiyya Burney authored May 04, 2021
  
  06da550a
- Add Promotion repository/controller/Service skeleton · 8034f326
  John Lam authored May 04, 2021
  
  8034f326
- First Commit · 4bd427cb
  Khai Yuan Liew authored May 04, 2021
  
  4bd427cb