Demon

pom.xml

@@ -26,18 +26,7 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId> org.springframework.security </groupId>
-			<artifactId> spring-security-web </artifactId>
-		</dependency>
-		<dependency>
-			<groupId> org.springframework.security </groupId>
-			<artifactId> spring-security-core </artifactId>
-		</dependency>
-		<dependency>
-			<groupId> org.springframework.security </groupId>
-			<artifactId> spring-security-config </artifactId>
-		</dependency>
+
 		<dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
@@ -98,18 +87,6 @@
         </dependency>
     </dependencies>
 
-	<dependencyManagement>
-		<dependencies>
-			<!--<dependency>-->
-				<!--<groupId>de.codecentric</groupId>-->
-				<!--<artifactId>spring-boot-admin-dependencies</artifactId>-->
-				<!--<version>${spring-boot-admin.version}</version>-->
-				<!--<type>pom</type>-->
-				<!--<scope>import</scope>-->
-			<!--</dependency>-->
-		</dependencies>
-	</dependencyManagement>
-
 	<build>
 		<plugins>
 			<plugin>

src/main/java/hebron/app/controller/ContributerController.java

@@ -0,0 +1,32 @@
+package hebron.app.controller;
+
+import hebron.app.models.request_dto.RequestContributorDTO;
+import hebron.app.models.request_dto.RequestDonationDTO;
+import hebron.app.service.ContributorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ContributerController {
+
+    @Autowired
+    private ContributorService contributorService;
+
+    @PostMapping("/create/")
+    public ResponseEntity createContributor(RequestDonationDTO requestDonationDTO){
+        contributorService.createContributor(requestDonationDTO);
+        return ResponseEntity.ok().build();
+    }
+    @GetMapping("/get/list")
+    public ResponseEntity getListContributor(){
+        return ResponseEntity.ok(contributorService.listContributor());
+    }
+
+    @GetMapping("/getById")
+    public ResponseEntity getById(Long id){
+        return ResponseEntity.ok(contributorService.getById(id));
+    }
+}

src/main/java/hebron/app/models/Contributor.java

@@ -22,5 +22,4 @@ public class Contributor {
     private String email;
 
     private String image;
-
 }

src/main/java/hebron/app/models/Donation.java

@@ -2,11 +2,11 @@
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Id;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import java.util.Date;
 
 @Entity
@@ -25,4 +25,4 @@ public class Donation {
     private Long projectId;
 
     private Long contributorId;
-}
+}

src/main/java/hebron/app/models/dto/ContributorDTO.java

@@ -0,0 +1,16 @@
+package hebron.app.models.dto;
+
+import lombok.Data;
+
+@Data
+public class ContributorDTO {
+
+    private Long id;
+
+    private String fullName;
+
+    private String email;
+
+    private String image;
+
+}

src/main/java/hebron/app/models/dto/DonationDTO.java

@@ -0,0 +1,18 @@
+package hebron.app.models.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DonationDTO {
+
+    private Double sum;
+
+    private Date date;
+
+    private Long projectId;
+
+    private Long contributorId;
+
+}

src/main/java/hebron/app/models/request_dto/RequestContributorDTO.java

@@ -0,0 +1,13 @@
+package hebron.app.models.request_dto;
+
+import lombok.Data;
+
+@Data
+public class RequestContributorDTO {
+
+    private String fullName;
+
+    private String email;
+
+    private String image;
+}

src/main/java/hebron/app/models/request_dto/RequestDonationDTO.java

@@ -0,0 +1,13 @@
+package hebron.app.models.request_dto;
+
+import lombok.Data;
+
+@Data
+public class RequestDonationDTO {
+
+    private RequestContributorDTO requestContributorDTO;
+
+    private Double sum;
+
+    private Long projectId;
+}

src/main/java/hebron/app/repositry/ContributorRepository.java

@@ -0,0 +1,12 @@
+package hebron.app.repositry;
+
+import hebron.app.models.Contributor;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ContributorRepository extends JpaRepository<Contributor, Long> {
+    List<Contributor> findByEmail(String email);
+}

src/main/java/hebron/app/repositry/DonationRepository.java

@@ -0,0 +1,12 @@
+package hebron.app.repositry;
+
+import hebron.app.models.Donation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface DonationRepository extends JpaRepository<Donation, Long> {
+    List<Donation> findByProjectIdAndContributorId(Long projectId, Long contributeId);
+}

src/main/java/hebron/app/service/ContributorService.java

@@ -0,0 +1,97 @@
+package hebron.app.service;
+
+import hebron.app.models.Contributor;
+import hebron.app.models.Donation;
+import hebron.app.models.dto.ContributorDTO;
+import hebron.app.models.request_dto.RequestContributorDTO;
+import hebron.app.models.request_dto.RequestDonationDTO;
+import hebron.app.repositry.ContributorRepository;
+import hebron.app.repositry.DonationRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ContributorService {
+
+    @Autowired
+    private ConvertService convertService;
+
+    @Autowired
+    private ContributorRepository contributorRepository;
+
+    @Autowired
+    private DonationRepository donationRepository;
+
+
+    public ContributorDTO createContributor(RequestDonationDTO requestDonationDTO) {
+        RequestContributorDTO requestContributorDTO = requestDonationDTO.getRequestContributorDTO();
+
+        if (existContributorByEmail(requestContributorDTO.getEmail())) {
+            List<Contributor> contributors = contributorRepository
+                    .findByEmail(requestDonationDTO.getRequestContributorDTO().getEmail());
+            if (!donationRepository.findByProjectIdAndContributorId(
+                    requestDonationDTO.getProjectId(), contributors.get(0).getId()).isEmpty()
+                    ) {
+                List<Donation> listDonation = donationRepository.findByProjectIdAndContributorId(
+                        requestDonationDTO.getProjectId(), contributors.get(0).getId());
+                Donation donation = listDonation.get(0);
+                donation.setSum(donation.getSum() + requestDonationDTO.getSum());
+                donationRepository.save(donation);
+            }else {
+                Donation donation = new Donation();
+                donation.setContributorId(contributors.get(0).getId());
+                donation.setSum(requestDonationDTO.getSum());
+                donation.setProjectId(requestDonationDTO.getProjectId());
+                try {
+                    donation.setDate(convertService.formatDate());
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                donationRepository.save(donation);
+            }
+
+        }
+
+        Contributor contributor = convertService
+                .convertToContributor(requestDonationDTO.getRequestContributorDTO());
+        Contributor saveContributor = contributorRepository.save(contributor);
+        Donation donation = new Donation();
+        donation.setContributorId(saveContributor.getId());
+        donation.setSum(requestDonationDTO.getSum());
+        donation.setProjectId(requestDonationDTO.getProjectId());
+        try {
+            donation.setDate(convertService.formatDate());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        donationRepository.save(donation);
+
+        return convertService.convertContributorToDTO(saveContributor);
+    }
+
+    public ContributorDTO getById(Long lastId) {
+        Contributor contributor = contributorRepository.getOne(lastId);
+        return convertService.convertContributorToDTO(contributor);
+    }
+
+    public List<ContributorDTO> listContributor() {
+        List<Contributor> contributors = contributorRepository.findAll();
+
+        return contributors.stream()
+                .map(contributor -> convertService.convertContributorToDTO(contributor))
+                .collect(Collectors.toList());
+    }
+
+    public Boolean existContributorByEmail(String email) {
+        List<Contributor> contributors = contributorRepository.findByEmail(email);
+        if (contributors.isEmpty()) {
+            return false;
+        }
+        return true;
+    }
+
+}

src/main/java/hebron/app/service/ConvertService.java

@@ -1,18 +1,28 @@
 package hebron.app.service;
 
+import hebron.app.models.Contributor;
+import hebron.app.models.Donation;
 import hebron.app.models.History;
 import hebron.app.models.Project;
+import hebron.app.models.dto.ContributorDTO;
 import hebron.app.models.dto.HistoryDTO;
 import hebron.app.models.dto.ProjectDTO;
+import hebron.app.models.request_dto.RequestContributorDTO;
+import hebron.app.models.request_dto.RequestDonationDTO;
 import hebron.app.models.request_dto.RequestProjectDTO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Service
 public class ConvertService {
 
+
     public Project convertToProject(RequestProjectDTO requestProjectDTO) {
         Project project = new Project();
         project.setTitle(requestProjectDTO.getTitle());
@@ -22,6 +32,27 @@ public Project convertToProject(RequestProjectDTO requestProjectDTO) {
         project.setGoal(requestProjectDTO.getGoal());
         return project;
     }
+    public Date formatDate() throws ParseException {
+        SimpleDateFormat dateFormat = new SimpleDateFormat();
+        return dateFormat.parse(String.valueOf(new Date()));
+    }
+
+    public Contributor convertToContributor(RequestContributorDTO requestContributorDTO) {
+        Contributor contributor = new Contributor();
+        contributor.setFullName(requestContributorDTO.getFullName());
+        contributor.setEmail(requestContributorDTO.getEmail());
+        contributor.setImage(requestContributorDTO.getImage());
+        return contributor;
+    }
+
+    public ContributorDTO convertContributorToDTO(Contributor contributor) {
+        ContributorDTO dto = new ContributorDTO();
+        dto.setId(contributor.getId());
+        dto.setEmail(contributor.getEmail());
+        dto.setFullName(contributor.getFullName());
+        dto.setImage(contributor.getImage());
+        return dto;
+    }
 
     public ProjectDTO convertProjectToDTO(Project project) {
         ProjectDTO dto = new ProjectDTO();
@@ -37,7 +68,8 @@ public ProjectDTO convertProjectToDTO(Project project) {
         dto.setGoal(project.getGoal());
         if (project.getHistory() != null) dto.setHistory(convertHistoryToDTO(project.getHistory()));
         dto.setCurrentSum(0.0);
-        dto.setParticipantsCount(0);return dto;
+        dto.setParticipantsCount(0);
+        return dto;
     }
 
     public String convertFileToMD5(byte[] bytes) {