Merge branch 'search' into 'dev' (b6cf2052) · Commits · Nadezhda Zakopailo / FlashCards

Commit b6cf2052 authored 6 days ago by Nadezhda Zakopailo

Merge branch 'search' into 'dev'

Search

See merge request !1

parents 7837321d 72ee5111

Branches dev

No related tags found

1 merge request!1Search

Hide whitespace changes

Inline Side-by-side

Showing

CardsMicroservice/pom.xml 5 additions, 0 deletions

CardsMicroservice/pom.xml
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/controller/CardBoxController.java 22 additions, 3 deletions

...cards/CardsMicroservice/controller/CardBoxController.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/controller/TagController.java 10 additions, 2 deletions

...lashcards/CardsMicroservice/controller/TagController.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/entity/Card.java 3 additions, 1 deletion

...cz/cvut/fel/flashcards/CardsMicroservice/entity/Card.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/entity/CardBox.java 14 additions, 5 deletions

...cvut/fel/flashcards/CardsMicroservice/entity/CardBox.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/entity/Tag.java 10 additions, 3 deletions

.../cz/cvut/fel/flashcards/CardsMicroservice/entity/Tag.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/repository/CardBoxRepository.java 19 additions, 0 deletions

...cards/CardsMicroservice/repository/CardBoxRepository.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/repository/TagRepository.java 11 additions, 0 deletions

...lashcards/CardsMicroservice/repository/TagRepository.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/service/CardBoxService.java 21 additions, 6 deletions

.../flashcards/CardsMicroservice/service/CardBoxService.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/service/CardService.java 2 additions, 1 deletion

...fel/flashcards/CardsMicroservice/service/CardService.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/service/TagService.java 19 additions, 5 deletions

.../fel/flashcards/CardsMicroservice/service/TagService.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/CardBoxMapper.java 15 additions, 0 deletions

.../fel/flashcards/CardsMicroservice/util/CardBoxMapper.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/CardBoxPostDTO.java 22 additions, 0 deletions

...fel/flashcards/CardsMicroservice/util/CardBoxPostDTO.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/TagMapper.java 15 additions, 0 deletions

...cvut/fel/flashcards/CardsMicroservice/util/TagMapper.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/TagPostDTO.java 14 additions, 0 deletions

...vut/fel/flashcards/CardsMicroservice/util/TagPostDTO.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/exception/DuplicateTagException.java 7 additions, 0 deletions

...rdsMicroservice/util/exception/DuplicateTagException.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/exception/ErrorResponse.java 10 additions, 0 deletions

...cards/CardsMicroservice/util/exception/ErrorResponse.java
CardsMicroservice/src/main/java/cz/cvut/fel/flashcards/CardsMicroservice/util/exception/GlobalExceptionHandler.java 48 additions, 0 deletions

...dsMicroservice/util/exception/GlobalExceptionHandler.java
CardsMicroservice/src/main/resources/application.yml 1 addition, 0 deletions

CardsMicroservice/src/main/resources/application.yml
UserMicroservice/pom.xml 6 additions, 0 deletions

UserMicroservice/pom.xml

with 274 additions and 26 deletions

Please register or to comment