Commits · master · Ascend / promotions-service

14 May, 2021 1 commit
- Merge branch 'dev' into 'master' · 4fe5b34f
  Sumaiyya Burney authored May 14, 2021
```
Done!

See merge request !12
```
  4fe5b34f
13 May, 2021 1 commit
- integration demo · 40d6b69a
  Christopher Cottier authored May 14, 2021
  
  40d6b69a
12 May, 2021 4 commits
- Merge branch 'fix-tests' into 'dev' · ad8a6c83
  Sumaiyya Burney authored May 12, 2021
```
Fixes create and get tests

See merge request !11
```
  ad8a6c83
- Fixes create and get tests · 99aa8537
  Sumaiyya Burney authored May 12, 2021
  
  99aa8537
- Added deployment file · 5adc9113
  Ben Anderson authored May 12, 2021
  
  5adc9113
- Removed DTO · 90afae02
  Ben Anderson authored May 12, 2021
  
  90afae02
11 May, 2021 4 commits
- Resolved merge conflicts · 2164ca44
  Ben Anderson authored May 11, 2021
  
  2164ca44
- Changed Dockerfile to work with Jenkins · 903c7818
  Ben Anderson authored May 11, 2021
  
  903c7818
- Adds CORS · 3f3e032a
  Sumaiyya Burney authored May 11, 2021
  
  3f3e032a
- Changed post route to return a response entity instead of a Mono · 7db4c98f
  Ben Anderson authored May 11, 2021
  
  7db4c98f
10 May, 2021 11 commits
- Moved db.password from config file to environment variable setting · 934097a6
  Ben Anderson authored May 10, 2021
  
  934097a6
- Moved db.password from config file to environment variable setting · a2c4a416
  Ben Anderson authored May 10, 2021
  
  a2c4a416
- Merge branch 'AFP-63' into 'dev' · 08e090cd
  Sumaiyya Burney authored May 10, 2021
```
Afp 63

See merge request !10
```
  08e090cd
- Updates test · 48d05f8a
  Sumaiyya Burney authored May 10, 2021
  
  48d05f8a
- Merge branch 'dev' into 'AFP-63' · 0a90ae18
  Sumaiyya Burney authored May 10, 2021
```
# Conflicts:
#   src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java
```
  0a90ae18
- Merge branch 'AFP-62' into 'dev' · 4b7f1cf5
  Sumaiyya Burney authored May 10, 2021
```
edit promo is completed

See merge request !9
```
  4b7f1cf5
- Fixes some typos/merge conflict errors · 297582f7
  Sumaiyya Burney authored May 10, 2021
  
  297582f7
- Merge branch 'dev' into 'AFP-62' · d7bab1e6
  Sumaiyya Burney authored May 10, 2021
```
# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/repository/PromotionRepository.java
#   src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java
```
  d7bab1e6
- Merge branch 'AFP-60' into 'dev' · f80b22ac
  Sumaiyya Burney authored May 10, 2021
```
AFP-60

See merge request !7
```
  f80b22ac
- Merge branch 'AFP-59' into 'dev' · f3212ca7
  Sumaiyya Burney authored May 10, 2021
```
Afp 59

See merge request !4
```
  f3212ca7
- 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
09 May, 2021 1 commit
- delete route · 2d930609
  Julius Wu authored May 10, 2021
  
  2d930609
07 May, 2021 6 commits
- delete is complete need to do testing · 302aa8ae
  Julius Wu authored May 08, 2021
  
  302aa8ae
- Created DOckerfile · b7b0fe12
  Ben Anderson authored May 07, 2021
  
  b7b0fe12
- edit promo is completed · 3132ce08
  Julius Wu authored May 07, 2021
  
  3132ce08
- [AFP-60] Fixed merge conflict · 057c3619
  Khai Yuan Liew authored May 07, 2021
  
  057c3619
- [AFP-60] Renamed bulkSearch methods · 5d69c51e
  Khai Yuan Liew authored May 07, 2021
  
  5d69c51e
- [AFP-60] Finish work on bulkSearchSKU endpoint + test · 30c2d8ad
  Khai Yuan Liew authored May 07, 2021
  
  30c2d8ad
06 May, 2021 10 commits
- [AFP-60] Start work on bulkSearchSKU endpoint · 11f308f3
  Khai Yuan Liew authored May 07, 2021
  
  11f308f3
- 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 2 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