Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

e171dd85

Commit e171dd85 authored 2 years ago by Pedro Pablo Cardona Arroyave

Downloads
- Plain Diff

Merge branch 'feature/fixFridgeProduct' into 'main'

Feature/fix fridge product

See merge request idatt2106-v23-03/backend!138

parents c4f19b73 1736328b

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java 11 additions, 26 deletions

...2016/v233/SmartMat/controller/group/FridgeController.java
src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FridgeProductRequest.java 1 addition, 1 deletion

...t2016/v233/SmartMat/dto/request/FridgeProductRequest.java
src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java 14 additions, 11 deletions

...v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java
src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductId.java 0 additions, 28 deletions

...6/v233/SmartMat/entity/fridgeProduct/FridgeProductId.java
src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/FridgeProductAssoRepository.java 4 additions, 2 deletions

...martMat/repository/group/FridgeProductAssoRepository.java
src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeProductAssoService.java 8 additions, 11 deletions

...v233/SmartMat/service/group/FridgeProductAssoService.java
src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java 18 additions, 22 deletions

.../idatt2016/v233/SmartMat/service/group/FridgeService.java
src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeProductAssoServiceTest.java 2 additions, 7 deletions

.../SmartMat/service/group/FridgeProductAssoServiceTest.java
src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeServiceTest.java 2 additions, 1 deletion

...tt2016/v233/SmartMat/service/group/FridgeServiceTest.java

with 60 additions and 109 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment