Skip to content

S2US6-7#70

Merged
LordRenDS merged 24 commits intodevfrom
S2US6-7
Apr 9, 2023
Merged

S2US6-7#70
LordRenDS merged 24 commits intodevfrom
S2US6-7

Conversation

@LordRenDS
Copy link

No description provided.

Denis973 and others added 21 commits April 7, 2023 15:12
# Conflicts:
#	src/main/java/com/provedcode/talent/controller/TalentProofController.java
#	src/main/java/com/provedcode/talent/service/TalentProofService.java
Add to TalentProofService method - "editTalentProof"

Little optimize and cleanup code
# Conflicts:
#	src/main/java/com/provedcode/talent/service/TalentProofService.java
# Conflicts:
#	src/main/java/com/provedcode/talent/controller/TalentProofController.java
#	src/main/java/com/provedcode/talent/service/TalentProofService.java
#	src/main/java/com/provedcode/talent/service/impl/TalentServiceImpl.java
#	src/main/resources/application-dev.properties
* add @GetMapping("/{talent-id}/proofs/{proof-id}")

* add some error processing
# Conflicts:
#	src/main/java/com/provedcode/talent/controller/TalentProofController.java
#	src/main/java/com/provedcode/talent/model/dto/ProofDTO.java
#	src/main/java/com/provedcode/talent/service/TalentProofService.java
#	src/main/java/com/provedcode/talent/service/impl/TalentServiceImpl.java
# Conflicts:
#	src/main/java/com/provedcode/talent/controller/TalentProofController.java
#	src/main/java/com/provedcode/talent/model/dto/ProofDTO.java
#	src/main/java/com/provedcode/talent/service/TalentProofService.java
#	src/main/java/com/provedcode/talent/service/impl/TalentServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-prod.properties
@LordRenDS LordRenDS added user story #6 Tasks for 6th user story user story #7 Tasks for 7th user story labels Apr 9, 2023
@LordRenDS LordRenDS added this to the Sprint 2 milestone Apr 9, 2023
@LordRenDS LordRenDS self-assigned this Apr 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🐸 backend Tasks for backend team user story #6 Tasks for 6th user story user story #7 Tasks for 7th user story

Projects

None yet

3 participants