S5

pom.xml

@@ -10,13 +10,17 @@
     </parent>
     <groupId>com.provedcode</groupId>
     <artifactId>demo</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <name>ProvedCode</name>
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>17</java.version>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-starter-webmvc-ui -->
         <dependency>
             <groupId>org.springdoc</groupId>

src/main/java/com/provedcode/aws/controller/AWSS3BucketController.java

@@ -21,10 +21,11 @@ public class AWSS3BucketController {
 
     @PostSetNewUserImageApiDoc
     @PreAuthorize("hasRole('TALENT')")
-    @PostMapping("/image/upload")
+    @PostMapping("/talents/{talent-id}/image/upload")
     public void setNewUserImage(@RequestParam("file") MultipartFile file,
-                              Authentication authentication) {
-        fileService.setNewUserImage(file, authentication);
+                                @PathVariable("talent-id") Long talentId,
+                                Authentication authentication) {
+        fileService.setNewUserImage(file, talentId, authentication);
     }
 
     @GetAllAWSBucketFilesDevApiDoc

src/main/java/com/provedcode/aws/service/FileService.java

@@ -16,7 +16,7 @@ public interface FileService {
 
     List<String> listAllFiles();
 
-    void setNewUserImage(MultipartFile file, Authentication authentication);
+    void setNewUserImage(MultipartFile file, Long talentId, Authentication authentication);
 
     URL generetePresingedUrlFor7Days(String fileFullPath);
 }

src/main/java/com/provedcode/aws/service/S3Service.java

@@ -6,6 +6,7 @@
 import com.amazonaws.services.s3.model.*;
 import com.amazonaws.util.IOUtils;
 import com.provedcode.config.AWSProperties;
+import com.provedcode.talent.model.entity.Talent;
 import com.provedcode.talent.repo.TalentRepository;
 import com.provedcode.user.model.entity.UserInfo;
 import com.provedcode.user.repo.UserInfoRepository;
@@ -75,7 +76,7 @@ public List<String> listAllFiles() {
     }
 
     @Override
-    public void setNewUserImage(MultipartFile file, Authentication authentication) {
+    public void setNewUserImage(MultipartFile file, Long talentId, Authentication authentication) {
         if (file.isEmpty()) {
             throw new ResponseStatusException(BAD_REQUEST, "file must be not empty, actual file-size: %s".formatted(file.getSize()));
         }
@@ -84,6 +85,11 @@ public void setNewUserImage(MultipartFile file, Authentication authentication) {
         }
         UserInfo user = userInfoRepository.findByLogin(authentication.getName())
                 .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "user with login = {%s} not found".formatted(authentication.getName())));
+        Talent talent = talentRepository.findById(talentId)
+                .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "talent with id = {%s} not found".formatted(talentId)));
+        if (!user.getTalent().equals(talent)) {
+            throw new ResponseStatusException(FORBIDDEN, "You cannot change another talent");
+        }
 
         try {
             String fileType = getFileType(file);

src/main/java/com/provedcode/config/EmailConfig.java

@@ -0,0 +1,15 @@
+package com.provedcode.config;
+
+import lombok.AllArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+@Configuration
+@AllArgsConstructor
+public class EmailConfig {
+    private Environment env;
+
+    public String getDefaultEmail() {
+        return env.getProperty("EMAIL_USER");
+    }
+}

src/main/java/com/provedcode/config/EmailDefaultProps.java

@@ -0,0 +1,19 @@
+package com.provedcode.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.validation.annotation.Validated;
+
+@Validated
+@ConfigurationProperties(prefix = "default-email")
+@Slf4j
+public record EmailDefaultProps(
+        String userDeleted,
+        String userDeletedSubject
+) {
+    @PostConstruct
+    void logging() {
+        log.info("email-default-props = {}", this);
+    }
+}

src/main/java/com/provedcode/config/SecurityConfig.java

@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
@@ -51,14 +52,15 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .requestMatchers("/actuator/health").permitAll() // for DevOps
                 .requestMatchers(antMatcher("/h2/**")).permitAll()
                 .requestMatchers(antMatcher("/api/*/talents/**")).permitAll()
-                .requestMatchers(antMatcher("/api/*/proofs/**")).permitAll()
                 .requestMatchers(antMatcher("/api/*/sponsors/**")).permitAll()
                 .requestMatchers(antMatcher("/api/*/login")).permitAll()
                 .requestMatchers(antMatcher("/api/*/skills")).permitAll()
+                .requestMatchers(antMatcher("/api/*/proofs/**")).permitAll()
                 .requestMatchers(antMatcher("/error")).permitAll()
                 .requestMatchers(antMatcher("/v3/api-docs/**")).permitAll() // for openAPI
                 .requestMatchers(antMatcher("/swagger-ui/**")).permitAll() // for openAPI
                 .requestMatchers(antMatcher("/swagger-ui.html")).permitAll() // for openAPI
+                .requestMatchers(antMatcher(HttpMethod.GET, "/api/v5/activate")).permitAll()// for email account recovery
                 .anyRequest().authenticated()
         );
 

src/main/java/com/provedcode/config/ServerInfoConfig.java

@@ -0,0 +1,29 @@
+package com.provedcode.config;
+
+import lombok.AllArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+@AllArgsConstructor
+@Configuration
+public class ServerInfoConfig {
+    private Environment env;
+
+    public String getServerPort() {
+        return env.getProperty("server.port");
+    }
+    public String getIpAddress() {
+        InetAddress ip = null;
+        try {
+            return ip.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    public String getFullServerAddress() {
+        return getIpAddress() + ":" + getServerPort();
+    }
+}

src/main/java/com/provedcode/handlers/GlobalControllerAdvice.java

@@ -0,0 +1,33 @@
+package com.provedcode.handlers;
+
+import com.provedcode.user.model.entity.UserInfo;
+import com.provedcode.user.repo.UserInfoRepository;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.server.ResponseStatusException;
+
+import static org.springframework.http.HttpStatus.FORBIDDEN;
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+@ControllerAdvice
+@AllArgsConstructor
+@Slf4j
+public class GlobalControllerAdvice {
+    UserInfoRepository userInfoRepository;
+
+    @ModelAttribute
+    public void handleAuthentication(Authentication authentication) {
+        if (authentication != null) {
+            String login = authentication.getName();
+            UserInfo user = userInfoRepository.findByLogin(login)
+                    .orElseThrow(() -> new ResponseStatusException(NOT_FOUND,
+                            "User with login {%s} not found".formatted(login)));
+            if (Boolean.TRUE.equals(user.getIsLocked())) {
+                throw new ResponseStatusException(FORBIDDEN, "your account is blocked");
+            }
+        }
+    }
+}

src/main/java/com/provedcode/handlers/TalentExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.provedcode.handlers;
 
+import com.provedcode.handlers.dto.ErrorDTO;
 import jakarta.validation.ConstraintViolationException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -65,7 +66,7 @@ private ResponseEntity<?> responseStatusExceptionHandler(ResponseStatusException
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     private ResponseEntity<?> responseStatusExceptionHandler(ConstraintViolationException exception) {
         ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, exception.getMessage(), exception.toString());
-        return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+        return new ResponseEntity<>(new ErrorDTO(apiError.getMessage()), new HttpHeaders(), apiError.getStatus());
     }
 
 //    @ExceptionHandler({ Exception.class })

src/main/java/com/provedcode/kudos/controller/KudosController.java

@@ -1,25 +1,30 @@
 package com.provedcode.kudos.controller;
 
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.provedcode.kudos.model.request.SetAmountKudos;
 import com.provedcode.kudos.model.response.KudosAmount;
 import com.provedcode.kudos.model.response.KudosAmountWithSponsor;
 import com.provedcode.kudos.service.KudosService;
 import com.provedcode.util.annotations.doc.controller.kudos.GetAmountOfKudosApiDoc;
 import com.provedcode.util.annotations.doc.controller.kudos.GetKudosForSponsorApiDoc;
 import com.provedcode.util.annotations.doc.controller.kudos.PostAddKudosToProofApiDoc;
+
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Optional;
 
 @RestController
 @AllArgsConstructor
 @Validated
-@RequestMapping("/api/v3/")
+@RequestMapping("/api/v5/")
 public class KudosController {
     KudosService kudosService;
 
@@ -41,8 +46,20 @@ KudosAmountWithSponsor getProofKudos(@PathVariable("proof-id") long proofId, Aut
     @PreAuthorize("hasRole('SPONSOR')")
     @PostMapping("/proofs/{proof-id}/kudos")
     void addKudosToProof(@PathVariable("proof-id") long proofId,
-                         @RequestBody @Valid Optional<SetAmountKudos> amount,
-                         Authentication authentication) {
+            @RequestBody @Valid SetAmountKudos amount,
+            Authentication authentication) {
         kudosService.addKudosToProof(proofId, amount, authentication);
     }
+
+    @PreAuthorize("hasRole('SPONSOR')")
+    @PostMapping("/proofs/{proof-id}/skills/{skill-id}/kudos")
+    void addKudosToSkill(@PathVariable("proof-id") long proofId, @PathVariable("skill-id") long skillId,
+            Authentication authentication, @RequestBody @Valid SetAmountKudos amount) {
+        kudosService.addKudosToSkill(proofId, skillId, amount, authentication);
+    }
+
+    @GetMapping("/proofs/{proof-id}/skills/{skill-id}/kudos")
+    KudosAmount getKudosForSkill(@PathVariable("proof-id") long proofId, @PathVariable("skill-id") long skillId) {
+        return kudosService.getSkillKudos(proofId, skillId);
+    }
 }

src/main/java/com/provedcode/kudos/model/entity/Kudos.java

@@ -1,9 +1,22 @@
 package com.provedcode.kudos.model.entity;
 
 import com.provedcode.sponsor.model.entity.Sponsor;
-import com.provedcode.talent.model.entity.TalentProof;
-import jakarta.persistence.*;
-import lombok.*;
+import com.provedcode.talent.model.entity.ProofSkill;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Positive;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 @Getter
 @Setter
@@ -15,14 +28,15 @@
 public class Kudos {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", nullable = false)
+    @Column(name = "id", nullable = false, updatable = false, insertable = false)
     private Long id;
     @Column(name = "amount")
+    @Positive
     private Long amount;
     @ManyToOne
     @JoinColumn(name = "sponsor_id")
     private Sponsor sponsor;
-    @ManyToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "proof_id")
-    private TalentProof proof;
+    @ManyToOne
+    @JoinColumn(name = "proof_skill_id")
+    private ProofSkill skill;
 }

src/main/java/com/provedcode/kudos/model/response/KudosAmountWithSponsor.java

@@ -8,6 +8,6 @@
 @Builder
 public record KudosAmountWithSponsor(
         Long allKudosOnProof,
-        Map<Long, SponsorDTO> kudosFromSponsor
+        Map<String, Map<Long, SponsorDTO>> kudosFromSponsor
 ) {
 }

src/main/java/com/provedcode/kudos/repository/KudosRepository.java

@@ -1,10 +1,13 @@
 package com.provedcode.kudos.repository;
 
-import com.provedcode.kudos.model.entity.Kudos;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface KudosRepository extends JpaRepository<Kudos, Long> {
-    long countByProofId(Long id);
+import com.provedcode.kudos.model.entity.Kudos;
+import com.provedcode.talent.model.entity.ProofSkill;
+
 
-    boolean existsBySponsorIdAndProofId(Long sponsorId, Long proofId);
+public interface KudosRepository extends JpaRepository<Kudos, Long> {
+    List<Kudos> findBySkill(ProofSkill skill);
 }