User story#3, 4

src/main/java/com/provedcode/annotations/UrlList.java

@@ -0,0 +1,21 @@
+package com.provedcode.annotations;
+
+import com.provedcode.annotations.impl.UrlListValidator;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = UrlListValidator.class)
+public @interface UrlList {
+    String message() default "The list should contain only URLs";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

src/main/java/com/provedcode/annotations/impl/UrlListValidator.java

@@ -0,0 +1,32 @@
+package com.provedcode.annotations.impl;
+
+import com.provedcode.annotations.UrlList;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+import java.net.URL;
+import java.util.List;
+
+public class UrlListValidator implements ConstraintValidator<UrlList, List<String>> {
+    @Override
+    public boolean isValid(List<String> value, ConstraintValidatorContext context) {
+        if (value == null) {
+            return true;
+        }
+        for (String url : value) {
+            if (!isUrl(url)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isUrl(String url) {
+        try {
+            new URL(url).toURI();
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}

src/main/java/com/provedcode/talent/TalentController.java

@@ -3,19 +3,23 @@
 import com.provedcode.talent.model.dto.FullTalentDTO;
 import com.provedcode.talent.model.dto.ShortTalentDTO;
 import com.provedcode.talent.service.TalentService;
+import com.provedcode.user.model.dto.SessionInfoDTO;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Optional;
 
 @Slf4j
 @RestController
 @AllArgsConstructor
-@CrossOrigin(origins = "*", allowedHeaders = "*", methods = {RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE})
+@CrossOrigin(origins = "*", allowedHeaders = "*", methods = {RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT,
+                                                             RequestMethod.DELETE})
 @RequestMapping("/api")
 public class TalentController {
     TalentService talentService;
@@ -33,4 +37,18 @@ Page<ShortTalentDTO> getTalents(@RequestParam(value = "page") Optional<Integer>
         return talentService.getTalentsPage(page, size);
     }
 
+    @PreAuthorize("hasRole('TALENT')")
+    @PatchMapping("/talents/{talent-id}")
+    FullTalentDTO editTalent(@PathVariable("talent-id") long id,
+                             @RequestBody @Valid FullTalentDTO fullTalent,
+                             Authentication authentication) {
+        return talentService.editTalent(id, fullTalent, authentication);
+    }
+
+    @PreAuthorize("hasRole('TALENT')")
+    @DeleteMapping("/talents/{id}")
+    SessionInfoDTO deleteTalent(@PathVariable("id") long id, Authentication authentication) {
+        return talentService.deleteTalentById(id, authentication);
+    }
+
 }

src/main/java/com/provedcode/talent/model/dto/FullTalentDTO.java

@@ -1,20 +1,35 @@
 package com.provedcode.talent.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.provedcode.annotations.UrlList;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
+import org.hibernate.validator.constraints.URL;
 
 import java.util.List;
 
 @Builder
-public record FullTalentDTO (
-    Long id,
-    String firstName,
-    String lastName,
-    String image,
-    String specialization,
-    String additionalInfo,
-    String bio,
-    List<String> skills,
-    List<String> links,
-    List<String> contacts,
-    List<String> attachedFiles
-) {}
+public record FullTalentDTO(
+        Long id,
+        @NotEmpty
+        @JsonProperty("first_name")
+        String firstName,
+        @NotEmpty
+        @JsonProperty("last_name")
+        String lastName,
+        String image,
+        @NotEmpty
+        String specialization,
+        @JsonProperty("additional_info")
+        String additionalInfo,
+        String bio,
+        List<String> skills,
+        @UrlList
+        List<String> links,
+        List<String> contacts,
+        @UrlList
+        @JsonProperty("attached_files")
+        List<String> attachedFiles
+) {
+}

src/main/java/com/provedcode/talent/model/entity/Talent.java

@@ -4,12 +4,14 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
+import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.URL;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Builder
+@Accessors(chain = true)
 @AllArgsConstructor
 @NoArgsConstructor
 @Getter
@@ -22,28 +24,33 @@ public class Talent {
     @Column(nullable = false, insertable = false, updatable = false)
     private Long id;
     @NotEmpty
-    @NotNull
     @Column(name = "first_name", length = 20)
     private String firstName;
     @NotEmpty
-    @NotNull
     @Column(name = "last_name", length = 20)
     private String lastName;
     @NotEmpty
-    @NotNull
     @Column(name = "specialization", length = 30)
     private String specialization;
     @URL
     @Column(name = "image", length = 100)
     private String image;
-    @OneToOne(mappedBy = "talent", orphanRemoval = true)
+    @OneToOne(mappedBy = "talent", cascade = CascadeType.ALL, orphanRemoval = true)
     private TalentDescription talentDescription;
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", orphanRemoval = true)
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TalentLink> talentLinks = new ArrayList<>();
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", orphanRemoval = true)
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TalentSkill> talentSkills = new ArrayList<>();
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", orphanRemoval = true)
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TalentContact> talentContacts = new ArrayList<>();
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", orphanRemoval = true)
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "talent", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TalentAttachedFile> talentAttachedFiles = new ArrayList<>();
+
+    public void addTalentSkill(TalentSkill talentSkill) {
+        talentSkills.add(talentSkill);
+    }
+
+    public void removeTalentSkill(TalentSkill talentSkill) {
+        talentSkills.remove(talentSkill);
+    }
 }

src/main/java/com/provedcode/talent/model/entity/TalentAttachedFile.java

@@ -2,10 +2,11 @@
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import org.hibernate.validator.constraints.URL;
-
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Getter
 @Setter
 @Entity

src/main/java/com/provedcode/talent/model/entity/TalentContact.java

@@ -2,9 +2,11 @@
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Getter
 @Setter
 @Entity

src/main/java/com/provedcode/talent/model/entity/TalentDescription.java

@@ -3,8 +3,10 @@
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
+import lombok.experimental.Accessors;
 
 @Builder
+@Accessors(chain = true)
 @AllArgsConstructor
 @NoArgsConstructor
 @Getter

src/main/java/com/provedcode/talent/model/entity/TalentLink.java

@@ -2,10 +2,11 @@
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import org.hibernate.validator.constraints.URL;
-
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Getter
 @Setter
 @Entity

src/main/java/com/provedcode/talent/model/entity/TalentSkill.java

@@ -2,9 +2,11 @@
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Getter
 @Setter
 @Entity

src/main/java/com/provedcode/talent/repo/TalentRepository.java

@@ -1,14 +1,16 @@
 package com.provedcode.talent.repo;
 
 import com.provedcode.talent.model.entity.Talent;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import com.provedcode.talent.model.entity.TalentSkill;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
-public interface TalentRepository {
-
-    Page<Talent> findAll(Pageable pageable);
-
-    Optional<Talent> findById(Long aLong);
+public interface TalentRepository extends
+                                  JpaRepository<Talent, Long> {
+    @Transactional
+    @Modifying
+    @Query("update Talent t set t.talentSkills = ?1")
+    int updateTalentSkillsBy(TalentSkill talentSkills);
 }

src/main/java/com/provedcode/talent/repo/TalentSkillRepository.java

@@ -0,0 +1,11 @@
+package com.provedcode.talent.repo;
+
+import com.provedcode.talent.model.entity.Talent;
+import com.provedcode.talent.model.entity.TalentSkill;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface TalentSkillRepository extends JpaRepository<TalentSkill, Long> {
+    List<TalentSkill> deleteByTalent(Talent talent);
+}

src/main/java/com/provedcode/talent/service/TalentService.java

@@ -2,14 +2,19 @@
 
 import com.provedcode.talent.model.dto.FullTalentDTO;
 import com.provedcode.talent.model.dto.ShortTalentDTO;
+import com.provedcode.user.model.dto.SessionInfoDTO;
+import org.springframework.security.core.Authentication;
 import org.springframework.data.domain.Page;
 
-import java.util.List;
 import java.util.Optional;
 
 
 public interface TalentService {
     Page<ShortTalentDTO> getTalentsPage(Optional<Integer> page, Optional<Integer> size);
 
     FullTalentDTO getTalentById(long id);
+
+    FullTalentDTO editTalent(long id, FullTalentDTO fullTalent, Authentication authentication);
+
+    SessionInfoDTO deleteTalentById(long id, Authentication authentication);
 }