diff --git a/backend/finboostplus_server/pom.xml b/backend/finboostplus_server/pom.xml index 70cd1842..06ee70aa 100644 --- a/backend/finboostplus_server/pom.xml +++ b/backend/finboostplus_server/pom.xml @@ -1,123 +1,83 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.5.4 - - - com.finboostplus - com.fimboostplus - 0.0.1-SNAPSHOT - demo - Demo project for Spring Boot - - - - Mozilla Public License 2.0 - https://www.mozilla.org/MPL/2.0/ - repo - - - - - - - - - - - - - 21 - 2.7.0 - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.postgresql - postgresql - runtime - - - - com.h2database - h2 - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-docker-compose - test - - - org.projectlombok - lombok - true - - - jakarta.validation - jakarta.validation-api - - - org.hibernate.validator - hibernate-validator - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.security - spring-security-test - test - - - org.springframework.security - spring-security-oauth2-authorization-server - - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - - - org.springframework.boot - spring-boot-starter-mail - 4.0.0-M3 - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc.version} - - - org.springdoc - springdoc-openapi-starter-common - ${springdoc.version} - + + 4.0.0 + + + com.finboostplus + finboostplus-project + 1.0.0 + ../../pom.xml + + + finboostplus-server + jar + + FinBoostPlus Server + Servidor principal FinBoostPlus + + + + + Mozilla Public License 2.0 + https://www.mozilla.org/MPL/2.0/ + repo + + + + + + + + + + + + + + 21 + 2.7.0 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + + + org.postgresql + postgresql + runtime + + + + com.h2database + h2 + runtime + + + org.flywaydb flyway-core @@ -129,14 +89,99 @@ 11.15.0 runtime - - - - - org.springframework.boot - spring-boot-maven-plugin - + + + org.springframework.security + spring-security-oauth2-authorization-server + + + org.springframework.boot + spring-boot-starter-oauth2-resource-server + + + + + org.springframework.kafka + spring-kafka + + + + + org.springframework.boot + spring-boot-starter-mail + + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.version} + + + org.springdoc + springdoc-openapi-starter-common + ${springdoc.version} + + + + + com.finboostplus + util + ${project.version} + + + + + org.projectlombok + lombok + true + + + jakarta.validation + jakarta.validation-api + + + org.hibernate.validator + hibernate-validator + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.security + spring-security-test + test + + + + + org.springframework.boot + spring-boot-docker-compose + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 16 + 16 + + org.apache.maven.plugins @@ -153,9 +198,8 @@ checkstyle.xml - true - false + false @@ -178,9 +222,7 @@ - - - - + + diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/ExpenseResponseDTO.java b/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/ExpenseResponseDTO.java index 9d279f8b..f330f2c0 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/ExpenseResponseDTO.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/ExpenseResponseDTO.java @@ -18,5 +18,4 @@ public record ExpenseResponseDTO( Instant createAt) { - } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/GroupDTO.java b/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/GroupDTO.java deleted file mode 100644 index 67cda639..00000000 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/GroupDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.finboostplus.DTO; - -import java.time.Instant; -import java.time.LocalDate; - -import org.springframework.beans.factory.annotation.Value; - -public record GroupDTO( - Long id, - - String name, - - String description, - - String icon, - - Instant createdAt) { -} diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/GroupDto.java b/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/GroupDto.java deleted file mode 100644 index 5dd9611a..00000000 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/DTO/GroupDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.finboostplus.DTO; - -import java.util.Set; - -public record GroupDto(Long id, String name, String icon, String description, Set expense) { - -// public Group groupDtoToGroup(){ -// -// Expense e = new Expense(); -// Group group = new Group(); -// group.setId(id); -// group.setName(name); -// group.setDescription(description); -// group.setExpenses(expense); -// -// return group; -// } - -} diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/FinboostplusApplication.java b/backend/finboostplus_server/src/main/java/com/finboostplus/FinboostplusApplication.java index 48be6a5e..815d0f97 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/FinboostplusApplication.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/FinboostplusApplication.java @@ -4,14 +4,16 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import com.finboostplus.repository.GroupMemberRepository; import com.finboostplus.repository.GroupRepository; import com.finboostplus.repository.UserRepository; +import org.springframework.kafka.annotation.EnableKafka; +import org.springframework.scheduling.annotation.EnableScheduling; +@EnableKafka @SpringBootApplication -@EnableJpaAuditing +@EnableScheduling public class FinboostplusApplication implements CommandLineRunner { @Autowired UserRepository userRepository; diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/config/KafkaProducerConfig.java b/backend/finboostplus_server/src/main/java/com/finboostplus/config/KafkaProducerConfig.java new file mode 100644 index 00000000..c83125ac --- /dev/null +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/config/KafkaProducerConfig.java @@ -0,0 +1,46 @@ +package com.finboostplus.config; + +import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.serialization.StringSerializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.core.DefaultKafkaProducerFactory; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.core.ProducerFactory; +import org.springframework.kafka.support.serializer.JsonSerializer; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +import java.util.HashMap; +import java.util.Map; + +@Configuration +public class KafkaProducerConfig { + @Bean + public ProducerFactory producerFactory(ObjectMapper objectMapper) { + Map configProps = new HashMap<>(); + configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092"); + configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); + configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class); + + JsonSerializer jsonSerializer = new JsonSerializer<>(objectMapper); + jsonSerializer.setAddTypeInfo(false); + + return new DefaultKafkaProducerFactory<>(configProps, new StringSerializer(), jsonSerializer); + } + + @Bean + public KafkaTemplate kafkaTemplate(ProducerFactory producerFactory) { + return new KafkaTemplate<>(producerFactory); + } + + @Bean + public ObjectMapper objectMapper() { + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JavaTimeModule()); + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + return mapper; + } +} diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/controller/ExpenseController.java b/backend/finboostplus_server/src/main/java/com/finboostplus/controller/ExpenseController.java index a61a90dc..32de7eba 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/controller/ExpenseController.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/controller/ExpenseController.java @@ -41,15 +41,15 @@ public class ExpenseController { @PostMapping public ResponseEntity createNewExpense(@Valid @RequestBody ExpenseCreateDTO dto, - @PathVariable Long groupId) { + @PathVariable("groupId") Long groupId) { return expenseService.createNewExpense(dto, groupId) ? new ResponseEntity("Despesa criada com sucesso!", HttpStatus.CREATED) : new ResponseEntity("", HttpStatus.BAD_REQUEST); } @GetMapping("{expenseId}") - public ResponseEntity getExpenseDetails(@PathVariable Long groupId, - @PathVariable Long expenseId) { + public ResponseEntity getExpenseDetails(@PathVariable("groupId") Long groupId, + @PathVariable("expenseId") Long expenseId) { UserExpenseDivisionDTO expenseDivDTO = expenseService.getExpenseInfoDetails(groupId, expenseId); if (expenseDivDTO != null) { return ResponseEntity.ok(expenseDivDTO); @@ -59,7 +59,7 @@ public ResponseEntity getExpenseDetails(@PathVariable Long groupId, @GetMapping public ResponseEntity> getAllGroupExpenses( - @PathVariable Long groupId, + @PathVariable("groupId") Long groupId, @RequestParam(required = false) Status status, @RequestParam(defaultValue = "true") boolean allMemberExpenses, @RequestParam(defaultValue = "false") boolean allGroupMembersExpenses, @@ -76,7 +76,7 @@ public ResponseEntity> getAllGroupExpenses( @PutMapping("{expenseId}") public ResponseEntity updateExpense(@Valid @RequestBody ExpenseUpdateDTO dto, - @PathVariable Long groupId, @PathVariable Long expenseId) { + @PathVariable("groupId") Long groupId, @PathVariable("expenseId") Long expenseId) { return expenseService.updateExpense(dto, groupId, expenseId) ? new ResponseEntity("Despesa atualizada com sucesso!", HttpStatus.OK) : new ResponseEntity("", HttpStatus.BAD_REQUEST); @@ -84,10 +84,10 @@ public ResponseEntity updateExpense(@Valid @RequestBody ExpenseUpdateDTO @PatchMapping("/{expenseId}/member/{memberId}") public ResponseEntity updateMemberExpenseStatus( - @PathVariable Long memberId, - @PathVariable Long groupId, - @PathVariable Long expenseId, - ExpenseUpdateDTO dto) { + @PathVariable("memberId") Long memberId, + @PathVariable("groupId") Long groupId, + @PathVariable("expenseId") Long expenseId, + @RequestBody ExpenseUpdateDTO dto) { boolean isUpdated = expenseService.updateExpenseStatus(memberId, groupId, expenseId, dto); if (isUpdated) { @@ -97,7 +97,7 @@ public ResponseEntity updateMemberExpenseStatus( } @DeleteMapping("{expenseId}") - public ResponseEntity deleteExpense(@PathVariable Long expenseId, @PathVariable Long groupId) { + public ResponseEntity deleteExpense(@PathVariable("expenseId") Long expenseId, @PathVariable("groupId") Long groupId) { expenseService.deleteExpense(expenseId, groupId); return ResponseEntity.noContent().build(); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/controller/GroupController.java b/backend/finboostplus_server/src/main/java/com/finboostplus/controller/GroupController.java index f0adff04..bc8ff236 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/controller/GroupController.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/controller/GroupController.java @@ -77,7 +77,7 @@ public ResponseEntity> listUserGroupsPaged( } @GetMapping("/{groupId}/members") - public ResponseEntity> findAllMembersByGroupId(@PathVariable Long groupId, + public ResponseEntity> findAllMembersByGroupId(@PathVariable("groupId") Long groupId, @RequestParam(name = "page", defaultValue = "0") Integer page, @RequestParam(name = "size", defaultValue = "10") Integer size, @RequestParam(name = "search", defaultValue = "") String search) { @@ -87,13 +87,13 @@ public ResponseEntity> findAllMembersByGroupId(@Pat } @GetMapping("/{groupId}") - public ResponseEntity getGroupDetails(@PathVariable Long groupId) { + public ResponseEntity getGroupDetails(@PathVariable("groupId") Long groupId) { GroupDetailsDTO dto = groupService.getGroupDetails(groupId); return new ResponseEntity<>(dto, HttpStatus.OK); } @GetMapping("/{groupId}/members/{memberId}/authority") - public ResponseEntity getMemberAuthority(@PathVariable Long groupId, @PathVariable Long memberId) { + public ResponseEntity getMemberAuthority(@PathVariable("groupId") Long groupId, @PathVariable("memberId") Long memberId) { GroupMemberAuthorityDTO authority = groupService.getMemberAuthority(groupId, memberId); return ResponseEntity.ok(authority); } @@ -107,16 +107,18 @@ public ResponseEntity createGroup(@Valid @RequestBody GroupCreateDTO dto return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } - @PostMapping("/{groupId}/members") - public ResponseEntity addGroupMember(@PathVariable Long groupId, - @RequestBody GroupMemberDTO groupMemberDTO) { - groupMemberService.addGroupMember(groupId, groupMemberDTO); - return new ResponseEntity<>("Membro adicionado com sucesso!", HttpStatus.OK); - } + @PostMapping("/{groupId}/members") + public ResponseEntity addGroupMember( + @PathVariable("groupId") Long groupId, + @RequestBody GroupMemberDTO groupMemberDTO + ) { + groupMemberService.addGroupMember(groupId, groupMemberDTO); + return ResponseEntity.ok("Membro adicionado com sucesso!"); + } @PutMapping("/{groupId}/members/{newAuthId}/transfer-ownership") - public ResponseEntity switchAuthority(@PathVariable Long groupId, - @PathVariable Long newAuthId, + public ResponseEntity switchAuthority(@PathVariable("groupId") Long groupId, + @PathVariable("newAuthId") Long newAuthId, @RequestBody SwitchAuthorityRequestDTO authDTO) { if (userService.switchAuthority(newAuthId, groupId, authDTO)) { return ResponseEntity.ok("Autoridade transferida com sucesso"); @@ -125,7 +127,7 @@ public ResponseEntity switchAuthority(@PathVariable Long groupId, } @PutMapping("/{id}") - public ResponseEntity updateGroup(@PathVariable Long id, @RequestBody GroupUpdateDTO groupUpdateDTO) { + public ResponseEntity updateGroup(@PathVariable("id") Long id, @RequestBody GroupUpdateDTO groupUpdateDTO) { Optional group = groupService.updateGroup(id, groupUpdateDTO); if (group.isEmpty()) { return new ResponseEntity<>(HttpStatus.NOT_FOUND); @@ -134,22 +136,22 @@ public ResponseEntity updateGroup(@PathVariable Long id, @RequestBody Gr } @DeleteMapping("/{groupId}/members") - public ResponseEntity leaveGroup(@PathVariable Long groupId) { + public ResponseEntity leaveGroup(@PathVariable("groupId") Long groupId) { groupService.leaveGroup(groupId); return ResponseEntity.noContent().build(); } @DeleteMapping("/{groupId}/members/{memberId}") public ResponseEntity removeGroupMember( - @PathVariable Long groupId, - @PathVariable Long memberId) { + @PathVariable("groupId") Long groupId, + @PathVariable("memberId") Long memberId) { groupService.removeGroupMember(groupId, memberId); return ResponseEntity.noContent().build(); } @DeleteMapping("/{groupId}") public ResponseEntity deleteGroup( - @PathVariable Long groupId) { + @PathVariable("groupId") Long groupId) { groupService.deleteGroup(groupId); return ResponseEntity.noContent().build(); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/controller/UserController.java b/backend/finboostplus_server/src/main/java/com/finboostplus/controller/UserController.java index 1e1f86e6..61cf0574 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/controller/UserController.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/controller/UserController.java @@ -188,7 +188,7 @@ public ResponseEntity deleteProfile() { @PostMapping("/forgot-password") public ResponseEntity forgotPassword(@RequestBody String userName) { - userService.forgotPassword(userName); + userService.forgotPassword(userName); return ResponseEntity.noContent().build(); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/ExpenseRepository.java b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/ExpenseRepository.java index 76e3be5f..3ed1e111 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/ExpenseRepository.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/ExpenseRepository.java @@ -1,9 +1,9 @@ package com.finboostplus.repository; -import java.time.Instant; import java.time.LocalDate; import java.util.List; +import com.finboostplus.enums.Status; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -42,7 +42,7 @@ public interface ExpenseRepository extends JpaRepository { WHERE UED.USER_ID = :userId """) - Page getAllUserExpenses(Long userId, Pageable pageable); + Page getAllUserExpenses(@Param("userId") Long userId, Pageable pageable); @Query(nativeQuery = true, value = """ WITH MESES AS ( @@ -94,7 +94,7 @@ AND EXTRACT(YEAR FROM E.deadline_date) = EXTRACT(YEAR FROM CURRENT_DATE) ORDER BY QUANTITY DESC """) - List getExpensesByCategory(Long userId); + List getExpensesByCategory(@Param("userId") Long userId); @Query(nativeQuery = true, countQuery = "Select count(*) from user_expense_divisions", value = """ SELECT @@ -125,7 +125,7 @@ WHEN E.DEADLINE_DATE > NOW() THEN 3 END, E.DEADLINE_DATE ASC """) - Page getAllGroupExpenses(Long memberId, Long groupId, Pageable pageable); + Page getAllGroupExpenses(@Param("memberId") Long memberId, @Param("groupId") Long groupId, Pageable pageable); @Query(nativeQuery = true, countQuery = "Select count(*) from user_expense_divisions", value = """ SELECT @@ -156,8 +156,8 @@ WHEN E.DEADLINE_DATE > NOW() THEN 3 ELSE 4 END, E.DEADLINE_DATE ASC - """) - Page getAllGroupExpensesFiltered(Long memberId, Long groupId, String status, + """) + Page getAllGroupExpensesFiltered(@Param("memberId") Long memberId, @Param("groupId") Long groupId, @Param("status") String status, Pageable pageable); @Query(nativeQuery = true, countQuery = "Select count(*) from user_expense_divisions", value = """ @@ -201,8 +201,8 @@ WHEN E.DEADLINE_DATE > NOW() THEN 3 ELSE 4 END, E.DEADLINE_DATE ASC - """) - Page getAllGroupExpensesOfAllMembers(Long userId, Long groupId, + """) + Page getAllGroupExpensesOfAllMembers(@Param("userId") Long userId, @Param("groupId") Long groupId, Pageable pageable); @Query(nativeQuery = true, countQuery = "Select count(*) from user_expense_divisions", value = """ @@ -249,11 +249,13 @@ WHEN E.DEADLINE_DATE > NOW() THEN 3 END, E.DEADLINE_DATE ASC """) - Page getAllGroupExpensesOfAllMembersFiltered(Long memberId, Long groupId, - String status, - Pageable pageable); + Page getAllGroupExpensesOfAllMembersFiltered(@Param("memberId") Long memberId, @Param("groupId") Long groupId, + @Param("status") String status, + Pageable pageable); - @Modifying + List findByDeadlineDateBeforeAndStatus(LocalDate date, Status status); + + @Modifying @Query(value = """ UPDATE user_expense_divisions SET status = :status @@ -270,7 +272,17 @@ Page getAllGroupExpensesOfAllMembersFiltered(Lo """, nativeQuery = true) void setPaidExpense(@Param("expenseId") Long expenseId, @Param("status") String status); - @Query(value = """ + @Modifying + @Query(value = """ + UPDATE expenses + SET status = 'UNPAID' + WHERE id = :expenseId + AND status = 'PENDING' + """, nativeQuery = true) + void markExpenseAsUnpaid(@Param("expenseId") Long expenseId); + + + @Query(value = """ SELECT EXISTS( SELECT 1 FROM user_expense_divisions ued @@ -280,7 +292,7 @@ SELECT EXISTS( AND (ued.status = 'PENDING' OR ued.status = 'UNPAID') ) """, nativeQuery = true) - boolean doesMemberHasPendingExpenses(Long memberId, Long groupId); + boolean doesMemberHasPendingExpenses(@Param("memberId") Long memberId, @Param("groupId") Long groupId); @Query(nativeQuery = true, value = """ SELECT UD.USER_ID AS USERID, @@ -292,7 +304,7 @@ SELECT EXISTS( INNER JOIN USERS U ON U.ID = UD.USER_ID WHERE E.GROUP_ID = :groupId AND e.id = :expenseId """) - List listUsersExpenseDivision(Long groupId, Long expenseId); + List listUsersExpenseDivision(@Param("groupId") Long groupId, @Param("expenseId") Long expenseId); @Query(value = """ SELECT EXISTS( @@ -300,7 +312,7 @@ SELECT EXISTS( FROM expenses e WHERE e.group_id = :groupId AND (e.status = 'PENDING' OR e.status = 'UNPAID') ) """, nativeQuery = true) - boolean groupHasPendingExpenses(Long groupId); + boolean groupHasPendingExpenses(@Param("groupId") Long groupId); @Query(value = """ SELECT EXISTS( @@ -308,7 +320,7 @@ SELECT EXISTS( FROM user_expense_divisions e WHERE e.expense_id = :expenseId AND (e.status = 'PENDING' OR e.status = 'UNPAID') ) """, nativeQuery = true) - boolean isExpensePaid(Long expenseId); + boolean isExpensePaid(@Param("expenseId") Long expenseId); @Modifying @Query(value = """ @@ -319,10 +331,10 @@ SELECT EXISTS( @Query(value = """ SELECT * FROM expenses - WHERE deadline_date BETWEEN :creatAt AND :deadlineDate + WHERE deadline_date BETWEEN :today AND :deadlineDate AND status != 'PAID' """, nativeQuery = true) List findByExpirationDateBetween( - @Param("creatAt") Instant creatAt, + @Param("today") LocalDate today, @Param("deadlineDate") LocalDate deadlineDate); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupMemberRepository.java b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupMemberRepository.java index 773b8ca9..fe77f53e 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupMemberRepository.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupMemberRepository.java @@ -26,7 +26,7 @@ SELECT EXISTS( and gm.auth_level = 'OWNER' ) """) - boolean isUserGroupOwner(long userId, long groupId); + boolean isUserGroupOwner(@Param("userId") long userId, @Param("groupId") long groupId); @Query(nativeQuery = true, value = """ SELECT EXISTS ( @@ -36,7 +36,7 @@ SELECT EXISTS ( AND gm.group_id = :groupId ) """) - boolean isUserMemberOfGroup(long userId, long groupId); + boolean isUserMemberOfGroup(@Param("userId") long userId, @Param("groupId") long groupId); @Query(nativeQuery = true, value = """ SELECT u.id, u.user_name, u.theme_color, gm.auth_level as authority FROM users u @@ -44,7 +44,7 @@ SELECT EXISTS ( on gm.user_id = u.id WHERE gm.group_id = :groupId """) - Page findMembersByGroupId(long groupId, Pageable pageable); + Page findMembersByGroupId(@Param("groupId") long groupId, Pageable pageable); @Query(nativeQuery = true, value = """ SELECT u.id, u.user_name, u.theme_color, gm.auth_level as authority FROM users u @@ -53,7 +53,9 @@ SELECT EXISTS ( WHERE gm.group_id = :groupId AND u.user_name like %:search% """) - Page findMembersByGroupIdFiltered(long groupId, Pageable pageable, String search); + Page findMembersByGroupIdFiltered(@Param("groupId") long groupId, + @Param("search") String search, + Pageable pageable); @Query(nativeQuery = true, value = """ SELECT * @@ -70,7 +72,7 @@ SELECT EXISTS( where auth_level = 'OWNER' and user_id =:memberId ) """) - boolean isUserOwnerOfAnyGroup(long memberId); + boolean isUserOwnerOfAnyGroup(@Param("memberId") long memberId); @Query(nativeQuery = true, value = """ SELECT EXISTS ( @@ -81,7 +83,7 @@ SELECT EXISTS ( AND gm.auth_level IN (:authLevels) ) """) - boolean doesUserHasAnyAuthority(Long userId, Long groupId, List authLevels); + boolean doesUserHasAnyAuthority(@Param("userId") Long userId, @Param("groupId") Long groupId, @Param("authLevels") List authLevels); List findByUser_id(Long userId); @@ -89,7 +91,7 @@ AND gm.auth_level IN (:authLevels) @Modifying @Query(value = "DELETE FROM group_members WHERE user_id = :userId AND group_id = :groupId", nativeQuery = true) - void deleteByUserIdAndGroupId(Long userId, Long groupId); + void deleteByUserIdAndGroupId(@Param("userId") Long userId, @Param("groupId") Long groupId); @Modifying @Query(value = """ diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupRepository.java b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupRepository.java index 856dbe50..5122fdda 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupRepository.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/GroupRepository.java @@ -47,7 +47,7 @@ public interface GroupRepository extends JpaRepository { ORDER BY G.CREATED_AT DESC """) - Page listUserGroupsPaged(Long memberId, Pageable pageable); + Page listUserGroupsPaged(@Param("memberId") Long memberId, Pageable pageable); @Query(nativeQuery = true, value = """ SELECT GM.AUTH_LEVEL AS AUTHORITY @@ -55,7 +55,7 @@ public interface GroupRepository extends JpaRepository { WHERE GM.GROUP_ID = :groupId AND GM.USER_ID = :memberId """) - GroupMemberAuthorityDTO getMemberAuthority(Long groupId, Long memberId); + GroupMemberAuthorityDTO getMemberAuthority(@Param("groupId") Long groupId, @Param("memberId") Long memberId); @Modifying @Query(nativeQuery = true, value = """ @@ -91,6 +91,6 @@ SELECT SUM(E.VALUE) AND GM.USER_ID = :userId WHERE G.ID = :groupId """) - GroupDetailsDTO getGroupDetails(Long groupId, Long userId); + GroupDetailsDTO getGroupDetails(@Param("groupId") Long groupId, @Param("userId") Long userId); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/RoleRepository.java b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/RoleRepository.java index 08ce2958..9b7ac99f 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/RoleRepository.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/RoleRepository.java @@ -1,6 +1,7 @@ package com.finboostplus.repository; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import com.finboostplus.model.Role; diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserExpenseDivisionRepository.java b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserExpenseDivisionRepository.java index 29c7d1f2..d93f6d31 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserExpenseDivisionRepository.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserExpenseDivisionRepository.java @@ -20,19 +20,19 @@ SELECT EXISTS( (status = 'UNPAID' or status = 'PENDING') ) """) - boolean doesUserHasAnyExpense(long memberId); + boolean doesUserHasAnyExpense(@Param("memberId") long memberId); @Query(nativeQuery = true, value = """ SELECT * FROM user_expense_divisions WHERE user_id = :userId AND expense_id = :expenseId """) - UserExpenseDivision findByMemberIdAndExpenseId(Long userId, Long expenseId); + UserExpenseDivision findByMemberIdAndExpenseId(@Param("userId")Long userId, @Param("expenseId") Long expenseId); @Query(nativeQuery = true, value = """ SELECT EXISTS ( SELECT 1 FROM user_expense_divisions u WHERE u.user_id = :userId AND u.expense_id = :expenseId ) """) - boolean existsByUserIdAndExpenseId(Long userId, Long expenseId); + boolean existsByUserIdAndExpenseId(@Param("userId") Long userId, @Param("expenseId") Long expenseId); @Query(nativeQuery = true, value = """ SELECT EXISTS( @@ -40,15 +40,25 @@ SELECT EXISTS( FROM user_expense_divisions e WHERE e.expense_id = :expenseId AND (e.status = 'PENDING' OR e.status = 'UNPAID') ) """) - boolean isExpensePaid(Long expenseId); + boolean isExpensePaid(@Param("expenseId") Long expenseId); @Query(nativeQuery = true, value = """ SELECT * from users WHERE id in ( SELECT user_id from user_expense_divisions WHERE expense_id = :expenseId AND status != 'PAID' ) """) - List findUserByExpenseId(Long expenseId); + List findUserByExpenseId(@Param("expenseId") Long expenseId); @Modifying + @Query(value = """ + UPDATE user_expense_divisions + SET status = 'UNPAID' + WHERE expense_id = :expenseId + AND status = 'PENDING' + """, nativeQuery = true) + void markDivisionAsUnpaid(@Param("expenseId") Long expenseId); + + + @Modifying @Query(nativeQuery = true, value = """ DELETE FROM user_expense_divisions ued WHERE expense_id = :expenseId @@ -60,5 +70,5 @@ SELECT EXISTS( DELETE FROM user_expense_divisions WHERE user_id = :memberId """) - void deleteExpenseRelationByMemberId(@Param("memberId") Long groupId); + void deleteExpenseRelationByMemberId(@Param("memberId") Long memberId); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserRepository.java b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserRepository.java index 2bf4523f..2a3a18ea 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserRepository.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/repository/UserRepository.java @@ -4,6 +4,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import org.springframework.data.repository.query.Param; + import com.finboostplus.DTO.UserDataDTO; import com.finboostplus.model.*; @@ -20,9 +22,9 @@ public interface UserRepository extends JpaRepository { INNER JOIN roles ON roles.id = users_roles.role_id WHERE users.e_mail = :email """) - List searchUserAndRolesByEmail(String email); + List searchUserAndRolesByEmail(@Param("email") String email); - Optional findByEmailIgnoreCase(String email); + Optional findByEmailIgnoreCase(String email); @Query(nativeQuery = true, value = """ SELECT EXISTS( @@ -35,17 +37,17 @@ SELECT EXISTS( AND gm.auth_level IN (:authorities) ); """) - boolean isUserAuthorityValidToGroup(long userId, long groupId, List authorities); + boolean isUserAuthorityValidToGroup(@Param("userId") long userId, @Param("groupId") long groupId, @Param("authorities") List authorities); @Query(nativeQuery = true, value = """ SELECT id, user_name, e_mail, theme_color FROM users WHERE e_mail = :email """) - Optional getUserData(String email); + Optional getUserData(@Param("email") String email); @Query(nativeQuery = true, value = """ SELECT password FROM users WHERE e_mail = :email """) - String doesPasswordMatch(String email); + String doesPasswordMatch(@Param("email") String email); } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/scheduling/ExpenseNotificationScheduler.java b/backend/finboostplus_server/src/main/java/com/finboostplus/scheduling/ExpenseNotificationScheduler.java new file mode 100644 index 00000000..bd84dcca --- /dev/null +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/scheduling/ExpenseNotificationScheduler.java @@ -0,0 +1,56 @@ +package com.finboostplus.scheduling; + +import java.time.LocalDate; +import java.util.List; + +import com.finboostplus.enums.Status; +import com.finboostplus.repository.UserExpenseDivisionRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import com.finboostplus.model.Expense; +import com.finboostplus.repository.ExpenseRepository; +import com.finboostplus.service.NotificationService; + +@Component +public class ExpenseNotificationScheduler { + @Autowired + private ExpenseRepository expenseRepository; + + @Autowired + private NotificationService notificationService; + + @Autowired + private UserExpenseDivisionRepository userExpenseDivisionRepository; + + + @Scheduled(cron = "0 0 9 * * *") //Roda todos os dias às 9h + public void checkExpiringExpenses() { + + LocalDate today = LocalDate.now(); + LocalDate notificationDate = LocalDate.now().plusDays(3); // 3 dias antes + List expiringExpenses = expenseRepository + .findByExpirationDateBetween(today, notificationDate); + for (Expense expense : expiringExpenses) { + notificationService.notifyExpenseExpiring(expense); + } + } + + @Scheduled(cron = "0 0 0 * * *") + public void updateExpiredExpensesStatus() { + + LocalDate today = LocalDate.now(); + + List expiredExpenses = + expenseRepository.findByDeadlineDateBeforeAndStatus( + today, Status.PENDING + ); + + for (Expense expense : expiredExpenses) { + expenseRepository.markExpenseAsUnpaid(expense.getId()); + userExpenseDivisionRepository.markDivisionAsUnpaid(expense.getId()); + } + } + +} diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/EmailProducerService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/EmailProducerService.java new file mode 100644 index 00000000..9c577765 --- /dev/null +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/service/EmailProducerService.java @@ -0,0 +1,65 @@ +package com.finboostplus.service; + +import email.ExpenseCreatedNotificationMessage; +import email.ExpenseDueReminderMessage; +import email.ForgotPasswordMessage; +import email.RegistrationEmailMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Service +public class EmailProducerService { + private static final Logger log = LoggerFactory.getLogger(EmailProducerService.class); + + @Value("${topic.message.producer.signup.email}") + private String registrationEmailTopic; + + @Value("${topic.message.producer.forgot.password.email}") + private String forgotPasswordTopic; + + @Value("${topic.message.producer.expense.due.reminder.email}") + private String expenseDueReminderTopic; + + @Value("${topic.message.producer.expense.created.notification.email}") + private String expenseCreatedNotificationTopic; + + @Autowired + private KafkaTemplate kafkaTemplate; + + public void sendRegisterEmail(final RegistrationEmailMessage registrationEmailMessage) { + try { + kafkaTemplate.send(registrationEmailTopic, registrationEmailMessage); + } catch (Exception e) { + log.error("Erro ao produzir mensagem no Kafka para topico {}: {}", registrationEmailTopic, e.getMessage(), e); + } + } + + public void sendForgotPasswordEmail(final ForgotPasswordMessage forgotPasswordMessage) { + try { + kafkaTemplate.send(forgotPasswordTopic, forgotPasswordMessage); + } catch (Exception e) { + log.error("Erro ao produzir mensagem no Kafka para topico {}: {}", forgotPasswordTopic, e.getMessage(), e); + } + } + + public void sendExpenseNearExpirationMessage(final ExpenseDueReminderMessage expenseDueReminderMessage){ + try { + kafkaTemplate.send(expenseDueReminderTopic, expenseDueReminderMessage); + } catch (Exception e) { + log.error("Erro ao produzir mensagem no Kafka para topico {}: {}", expenseDueReminderTopic, e.getMessage(), e); + } + } + + public void expenseCreatedNotification(final ExpenseCreatedNotificationMessage expenseCreatedNotificationMessage){ + try { + kafkaTemplate.send(expenseCreatedNotificationTopic, expenseCreatedNotificationMessage); + } catch (Exception e) { + log.error("Erro ao produzir mensagem no Kafka para topico {}: {}", expenseCreatedNotificationTopic, e.getMessage(), e); + } + } + +} diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/EmailService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/EmailService.java deleted file mode 100644 index 598ec420..00000000 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/service/EmailService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.finboostplus.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.mail.SimpleMailMessage; -import org.springframework.mail.javamail.JavaMailSender; -import org.springframework.stereotype.Service; - -@Service -public class EmailService { - @Autowired - private JavaMailSender javaMailSender; - - @Value("${spring.mail.username}") - private String remetente; - - public String enviarEmailTexto(String destinatario, String assunto, String mensagem) { - try { - SimpleMailMessage simpleMailMessage = new SimpleMailMessage(); - simpleMailMessage.setFrom(remetente); - simpleMailMessage.setTo(destinatario); - simpleMailMessage.setSubject(assunto); - simpleMailMessage.setText(mensagem); - javaMailSender.send(simpleMailMessage); - return "Email enviado"; - } catch (Exception e) { - return "Erro ao tentar enviar email " + e.getLocalizedMessage(); - } - } -} diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/ExpenseService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/ExpenseService.java index 246860bd..f41a024b 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/service/ExpenseService.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/service/ExpenseService.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Set; +import email.ExpenseCreatedNotificationMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -71,6 +72,9 @@ public class ExpenseService { @Autowired GroupRepository groupRepository; + @Autowired + EmailProducerService emailProducerService; + private final List AUTHLEVELS = List.of("OWNER", "ADMIN"); private void isUserAllowed(Long groupId) { @@ -118,6 +122,7 @@ public boolean createNewExpense(ExpenseCreateDTO expenseDTO, Long groupId) { throw new ForbiddenResourceException("Membro da despesa não pertence ao grupo"); } } + Status status = expenseDTO.deadlineDate().isAfter(LocalDate.now()) ? Status.PENDING : Status.UNPAID; Expense expense = new Expense( expenseDTO.title(), @@ -129,6 +134,7 @@ public boolean createNewExpense(ExpenseCreateDTO expenseDTO, Long groupId) { expenseDTO.deadlineDate(), status); expense = expenseRepository.save(expense); + for (MembersExpenseDivisionCreateDTO member : expenseDTO.expenseDivision()) { UserExpenseDivisionId userExpenseDivisionId = new UserExpenseDivisionId(member.id(), expense.getId()); @@ -140,6 +146,11 @@ public boolean createNewExpense(ExpenseCreateDTO expenseDTO, Long groupId) { member.value(), status); userExpenseDivisionRepository.save(userExpenseDivision); + User userToMsg = userRepository.findById(member.id()).orElseThrow( + () -> new UsernameNotFoundException("Usuário não encontrado!")); + ExpenseCreatedNotificationMessage expenseCreatedNotificationMessage = + new ExpenseCreatedNotificationMessage(userToMsg.getName(), userToMsg.getEmail(), expenseDTO.title(), group.getName(), member.value(), expenseDTO.deadlineDate()); + emailProducerService.expenseCreatedNotification(expenseCreatedNotificationMessage); } return true; } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupMemberService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupMemberService.java index 8ed48fce..181c1718 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupMemberService.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupMemberService.java @@ -42,14 +42,15 @@ public class GroupMemberService { @Transactional public void addGroupMember(Long groupId, GroupMemberDTO groupMemberDTO) { + User user = userRepository.findByEmailIgnoreCase(userService.authenticated()) .orElseThrow(() -> new UserNotFoundException("Usuário logado não encontrado")); User groupNewMember = userRepository.findByEmailIgnoreCase(groupMemberDTO.email()) .orElseThrow(() -> new UserNotFoundException( "Usuário que se deseja inserir não foi encontrado")); - if (!groupNewMember.isEnabled()) { - throw new UserNotFoundException("Usuário não encontrado"); - } + if (!groupNewMember.isEnabled()) { + throw new UserNotFoundException("Usuário não encontrado"); + } Group group = groupRepository.findById(Long.parseLong(String.valueOf(groupId))) .orElseThrow(() -> new GroupNotFoundException("Grupo não encontrado")); boolean isUserGroupMember = groupMemberRepository.isUserMemberOfGroup(groupNewMember.getId(), groupId); @@ -57,8 +58,7 @@ public void addGroupMember(Long groupId, GroupMemberDTO groupMemberDTO) { throw new UserAlreadyRegisteredOnGroupException("Usuário já é membro no grupo"); } if (userRepository.isUserAuthorityValidToGroup(user.getId(), groupId, - this.AUTHORITIES) == true - && (groupMemberDTO.authorization().equals("USER") + this.AUTHORITIES) && (groupMemberDTO.authorization().equals("USER") || groupMemberDTO.authorization().equals("ADMIN"))) { GroupMember member = new GroupMember(); member.setUser(groupNewMember); diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupService.java index 55fab1af..c421c7df 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupService.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/service/GroupService.java @@ -155,7 +155,7 @@ public Page findAllMembersByGroupId(Long groupId, Pageab if (search.isBlank() || search.isEmpty()) { return groupMemberRepository.findMembersByGroupId(groupId, pageable); } - return groupMemberRepository.findMembersByGroupIdFiltered(groupId, pageable, search); + return groupMemberRepository.findMembersByGroupIdFiltered(groupId, search, pageable); } @Transactional diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/NotificationService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/NotificationService.java index 647ace0b..4edc842b 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/service/NotificationService.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/service/NotificationService.java @@ -4,6 +4,7 @@ import java.time.temporal.ChronoUnit; import java.util.List; +import email.ExpenseDueReminderMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,20 +14,22 @@ @Service public class NotificationService { - @Autowired - private EmailService emailService; @Autowired private UserExpenseDivisionRepository userExpenseDivisionRepository; + @Autowired + EmailProducerService emailProducerService; + public void notifyExpenseExpiring(Expense expense) { List users = userExpenseDivisionRepository.findUserByExpenseId(expense.getId()); - long daysUntilExpiration = ChronoUnit.DAYS.between( + Long daysUntilExpiration = ChronoUnit.DAYS.between( LocalDate.now(), expense.getDeadlineDate()); for (User user : users) { - emailService.enviarEmailTexto(user.getEmail(), "Despesa perto de expirar", "Sua despesa " - + expense.getTitle() + " vence em " + daysUntilExpiration + " dias"); + ExpenseDueReminderMessage expenseDueReminderMessage = new + ExpenseDueReminderMessage(user.getName(), user.getEmail(), expense.getTitle(), daysUntilExpiration); + emailProducerService.sendExpenseNearExpirationMessage(expenseDueReminderMessage); } } } diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/service/UserService.java b/backend/finboostplus_server/src/main/java/com/finboostplus/service/UserService.java index 900d1911..0ed9b938 100644 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/service/UserService.java +++ b/backend/finboostplus_server/src/main/java/com/finboostplus/service/UserService.java @@ -7,6 +7,8 @@ import java.util.Set; import java.util.UUID; +import email.ForgotPasswordMessage; +import email.RegistrationEmailMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; @@ -72,19 +74,19 @@ public class UserService implements UserDetailsService { @Lazy GroupMemberService groupMemberService; - @Autowired - private EmailService emailService; - @Autowired ValidateUserRepository validateUserRepository; @Autowired ExpenseRepository expenseRepository; - @Override + @Autowired + EmailProducerService emailProducerService; + + @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { List result = userRepository.searchUserAndRolesByEmail(username); - if (result.size() == 0) { + if (result.isEmpty()) { throw new UsernameNotFoundException("Email não encontrado"); } User user = new User(); @@ -132,16 +134,8 @@ public boolean saveUser(UserCreateDTO dto) { validateUser.setUuid(UUID.randomUUID()); validateUser.setExpirationDate(Instant.now().plusSeconds(900)); validateUserRepository.save(validateUser); - emailService.enviarEmailTexto(userSaved.getEmail(), - "Conta criada com sucesso!", - "Seja bem vindo(a) " + userSaved.getName() + " ao FinboostPlus!\n" + - "Para ativar sua conta, acesse o link: http://localhost:8080/user/userValidate/" // Futuramente: - // https://finboostplus.com.br - // ou - // algo - // assim - + validateUser.getUuid()); - System.out.print(validateUser.getUuid()); // Ajuda para ativar o usuário cadastrado + RegistrationEmailMessage registrationEmailMessage = new RegistrationEmailMessage(userSaved.getEmail(), userSaved.getName(), validateUser.getUuid()); + emailProducerService.sendRegisterEmail(registrationEmailMessage); return userSaved.getId() != null; } @@ -155,7 +149,7 @@ public boolean updateUser(UserUpdateDTO dto) { if (!dto.email().equals(user.getEmail())) { user.setEmail(dto.email()); } - if (!dto.themeColor().equals(user.getThemeColor()) && dto.themeColor() != null) { + if (dto.themeColor() != null && !dto.themeColor().equals(user.getThemeColor())) { user.setThemeColor(dto.themeColor()); } User userUpdated = userRepository.save(user); @@ -214,19 +208,17 @@ public void forgotPassword(String userName) { User user = userRepository.findByEmailIgnoreCase(userName) .orElseThrow(() -> new UserNotFoundException("Usuário nao encontrado")); String newPassword = PasswordGenerator.generateRandomPassword(); - emailService.enviarEmailTexto(user.getEmail(), - "Esqueceu sua senha?", - "Olá " + user.getName() + " sua nova senha é " + newPassword); - PasswordEncoder passwordEncoder = passwordEncoder(); + ForgotPasswordMessage forgotPasswordMessage = new ForgotPasswordMessage(user.getEmail(), user.getName(), newPassword); + emailProducerService.sendForgotPasswordEmail(forgotPasswordMessage); + PasswordEncoder passwordEncoder = passwordEncoder(); user.setPassword(passwordEncoder.encode(newPassword)); } public String validateUser(String uuid) { - Optional validateUser = Optional - .of(validateUserRepository.findByUuid(UUID.fromString(uuid)).get()); + Optional validateUser = validateUserRepository.findByUuid(UUID.fromString(uuid)); if (validateUser.isEmpty()) { return "Token inválido ou expirado"; - } else if (validateUser.isPresent() && validateUser.get().getExpirationDate().isBefore(Instant.now())) { + } else if (validateUser.get().getExpirationDate().isBefore(Instant.now())) { return "Token inválido ou expirado"; } User user = validateUser.get().getUser(); @@ -253,7 +245,7 @@ public boolean switchAuthority(Long newOwnerId, Long groupId, SwitchAuthorityReq Group group = groupService.getGroup(groupId); if (group == null) throw new GroupNotFoundException("Grupo não encontrado"); - if (setAuthority == "OWNER") { + if (setAuthority.equals("OWNER")) { if (!groupMemberRepository.isUserGroupOwner(user.getId(), group.getId())) throw new ForbiddenResourceException("Acesso negado"); diff --git a/backend/finboostplus_server/src/main/java/com/finboostplus/util/ExpenseNotificationScheduler.java b/backend/finboostplus_server/src/main/java/com/finboostplus/util/ExpenseNotificationScheduler.java deleted file mode 100644 index 4b63c21f..00000000 --- a/backend/finboostplus_server/src/main/java/com/finboostplus/util/ExpenseNotificationScheduler.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.finboostplus.util; - -import java.time.Instant; -import java.time.LocalDate; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import com.finboostplus.model.Expense; -import com.finboostplus.repository.ExpenseRepository; -import com.finboostplus.service.NotificationService; - -@Component -@EnableScheduling -public class ExpenseNotificationScheduler { - @Autowired - private ExpenseRepository expenseRepository; - - @Autowired - private NotificationService notificationService; - - @Scheduled(cron = "0 0 9 * * *") - public void checkExpiringExpenses() { - Instant today = Instant.now(); - LocalDate notificationDate = LocalDate.now().plusDays(3); // 3 dias antes - - List expiringExpenses = expenseRepository - .findByExpirationDateBetween(today, notificationDate); - - for (Expense expense : expiringExpenses) { - notificationService.notifyExpenseExpiring(expense); - } - } -} diff --git a/backend/finboostplus_server/src/main/resources/application.properties b/backend/finboostplus_server/src/main/resources/application.properties index ab058c08..d77a21a1 100644 --- a/backend/finboostplus_server/src/main/resources/application.properties +++ b/backend/finboostplus_server/src/main/resources/application.properties @@ -45,3 +45,16 @@ springdoc.swagger-ui.url=/v3/api-docs springdoc.show-actuator=false springdoc.group-configs[0].group=public springdoc.group-configs[0].paths-to-match=/** + +#Configuração dos tópicos de mensageria com Kafka +# Conexão Kafka +spring.kafka.bootstrap-servers=localhost:9092 + +# Serializers (coerente caso utilize auto-config) +spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer +spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer + +topic.message.producer.signup.email=${ACCOUNT_REGISTRATION_TOPIC: default-topic} +topic.message.producer.forgot.password.email=${FORGOT_PASSWORD_TOPIC: default-topic} +topic.message.producer.expense.due.reminder.email=${EXPENSE_DUE_REMINDER_TOPIC: default-topic} +topic.message.producer.expense.created.notification.email=${EXPENSE_CREATED_NOTIFICATION_TOPIC: default-topic} diff --git a/backend/finboostplus_server/src/main/resources/db/migration/V1__create_initial_tables.sql b/backend/finboostplus_server/src/main/resources/db/migration/V1__create_initial_tables.sql index 57118fd8..ec99bfa6 100644 --- a/backend/finboostplus_server/src/main/resources/db/migration/V1__create_initial_tables.sql +++ b/backend/finboostplus_server/src/main/resources/db/migration/V1__create_initial_tables.sql @@ -16,3 +16,21 @@ CREATE TABLE roles ( id BIGSERIAL PRIMARY KEY, authority VARCHAR(255) NOT NULL UNIQUE ); + +CREATE TABLE users ( + id BIGSERIAL PRIMARY KEY, + user_name VARCHAR(255) NOT NULL, + e_mail VARCHAR(255) NOT NULL UNIQUE, + password VARCHAR(255) NOT NULL, + created_at TIMESTAMPTZ NOT NULL, + theme_color VARCHAR(50) NOT NULL, + active BOOLEAN NOT NULL +); + +CREATE TABLE users_roles ( + user_id BIGINT NOT NULL, + role_id BIGINT NOT NULL, + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE, + FOREIGN KEY (role_id) REFERENCES roles(id) ON DELETE CASCADE +); + diff --git a/backend/finboostplus_server/src/main/resources/db/migration/V3__insert_sample_users_and_roles.sql b/backend/finboostplus_server/src/main/resources/db/migration/V3__insert_sample_users_and_roles.sql new file mode 100644 index 00000000..ab591c4d --- /dev/null +++ b/backend/finboostplus_server/src/main/resources/db/migration/V3__insert_sample_users_and_roles.sql @@ -0,0 +1,17 @@ + +INSERT INTO users (id, active, created_at, e_mail, user_name, password, theme_color) +VALUES +(1, true, '2025-11-17 18:36:42.585993-03', 'bruno@gmail.com', 'Bruno', '$2a$10$9w8v.gW8Aq9Z8Kp0DkUHI.2xP3Z/jOCIDWsP3v6lHvfUNNbbxovHW', '#FFF'), +(2, true, '2025-11-17 18:36:42.585993-03', 'joao@gmail.com', 'Joao', '$2a$10$9w8v.gW8Aq9Z8Kp0DkUHI.2xP3Z/jOCIDWsP3v6lHvfUNNbbxovHW', '#FFF'), +(3, true, '2025-11-17 18:36:42.585993-03', 'cristiano@gmail.com', 'Cristiano', '$2a$10$9w8v.gW8Aq9Z8Kp0DkUHI.2xP3Z/jOCIDWsP3v6lHvfUNNbbxovHW', '#FFF'), +(4, true, '2025-11-17 18:36:42.585993-03', 'alan@gmail.com', 'Alan', '$2a$10$9w8v.gW8Aq9Z8Kp0DkUHI.2xP3Z/jOCIDWsP3v6lHvfUNNbbxovHW', '#FFF'), +(5, true, '2025-11-17 18:36:42.585993-03', 'cleyton@gmail.com', 'Cleyton', '$2a$10$9w8v.gW8Aq9Z8Kp0DkUHI.2xP3Z/jOCIDWsP3v6lHvfUNNbbxovHW', '#FFF'); + + +INSERT INTO users_roles (user_id, role_id) +VALUES +(1, 1), +(2, 1), +(3, 1), +(4, 1), +(5, 1); diff --git a/messaging/docker-compose.yaml b/messaging/docker-compose.yaml new file mode 100644 index 00000000..ad39a76b --- /dev/null +++ b/messaging/docker-compose.yaml @@ -0,0 +1,17 @@ +services: + zookeeper: + image: wurstmeister/zookeeper + container_name: zookeeper + ports: + - "2181:2181" + + kafka: + image: wurstmeister/kafka + container_name: kafka + ports: + - "9092:9092" + environment: + KAFKA_ADVERTISED_HOST_NAME: localhost + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + depends_on: + - zookeeper diff --git a/microservices/notification-email/.gitattributes b/microservices/notification-email/.gitattributes new file mode 100644 index 00000000..3b41682a --- /dev/null +++ b/microservices/notification-email/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/microservices/notification-email/.gitignore b/microservices/notification-email/.gitignore new file mode 100644 index 00000000..b9fcd772 --- /dev/null +++ b/microservices/notification-email/.gitignore @@ -0,0 +1,35 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +.env diff --git a/microservices/notification-email/.mvn/wrapper/maven-wrapper.properties b/microservices/notification-email/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..c0bcafe9 --- /dev/null +++ b/microservices/notification-email/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/microservices/notification-email/mvnw b/microservices/notification-email/mvnw new file mode 100644 index 00000000..bd8896bf --- /dev/null +++ b/microservices/notification-email/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/microservices/notification-email/mvnw.cmd b/microservices/notification-email/mvnw.cmd new file mode 100644 index 00000000..92450f93 --- /dev/null +++ b/microservices/notification-email/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/microservices/notification-email/pom.xml b/microservices/notification-email/pom.xml new file mode 100644 index 00000000..309e88ff --- /dev/null +++ b/microservices/notification-email/pom.xml @@ -0,0 +1,97 @@ + + + 4.0.0 + + com.finboostplus + finboostplus-project + 1.0.0 + ../../pom.xml + + + notification-email + jar + + notification-email + Micro servico utilizado pelo projeto Finboostplus + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-mail + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.kafka + spring-kafka + + + + org.projectlombok + lombok + true + + + com.finboostplus + util + ${project.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.kafka + spring-kafka-test + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + diff --git a/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/NotificationEmailApplication.java b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/NotificationEmailApplication.java new file mode 100644 index 00000000..e2252f6b --- /dev/null +++ b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/NotificationEmailApplication.java @@ -0,0 +1,15 @@ +package com.finboostplus.notificationemail; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.kafka.annotation.EnableKafka; + +@EnableKafka +@SpringBootApplication +public class NotificationEmailApplication { + + public static void main(String[] args) { + SpringApplication.run(NotificationEmailApplication.class, args); + } + +} diff --git a/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/config/KafkaConsumerConfig.java b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/config/KafkaConsumerConfig.java new file mode 100644 index 00000000..3d23e52d --- /dev/null +++ b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/config/KafkaConsumerConfig.java @@ -0,0 +1,131 @@ +package com.finboostplus.notificationemail.config; + +import email.ExpenseCreatedNotificationMessage; +import email.ExpenseDueReminderMessage; +import email.ForgotPasswordMessage; +import email.RegistrationEmailMessage; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; +import org.springframework.kafka.core.ConsumerFactory; +import org.springframework.kafka.core.DefaultKafkaConsumerFactory; +import org.springframework.kafka.support.serializer.JsonDeserializer; + +import java.util.HashMap; +import java.util.Map; + +import static org.apache.kafka.clients.consumer.ConsumerConfig.*; + +@Configuration +public class KafkaConsumerConfig { + + @Value("${spring.kafka.bootstrap-servers:localhost:9092}") + private String bootstrapServers; + + @Value("${spring.kafka.consumer.group-id:default-group}") + private String groupId; + + @Bean + public ConsumerFactory registrationConsumerFactory() { + JsonDeserializer deserializer = + new JsonDeserializer<>(RegistrationEmailMessage.class); + deserializer.addTrustedPackages("*"); + deserializer.ignoreTypeHeaders(); + + Map props = new HashMap<>(); + props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + props.put(GROUP_ID_CONFIG, groupId); + props.put(KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + props.put(VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class); + props.put(AUTO_OFFSET_RESET_CONFIG, "earliest"); + + return new DefaultKafkaConsumerFactory<>(props, new StringDeserializer(), deserializer); + } + + @Bean + public ConcurrentKafkaListenerContainerFactory + registrationKafkaListenerContainerFactory() { + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); + factory.setConsumerFactory(registrationConsumerFactory()); + return factory; + } + + @Bean + public ConsumerFactory forgotPasswordConsumerFactory() { + JsonDeserializer deserializer = + new JsonDeserializer<>(ForgotPasswordMessage.class); + deserializer.addTrustedPackages("*"); + deserializer.ignoreTypeHeaders(); + + Map props = new HashMap<>(); + props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + props.put(GROUP_ID_CONFIG, groupId); + props.put(KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + props.put(VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class); + props.put(AUTO_OFFSET_RESET_CONFIG, "earliest"); + + return new DefaultKafkaConsumerFactory<>(props, new StringDeserializer(), deserializer); + } + + @Bean + public ConcurrentKafkaListenerContainerFactory + forgotPasswordKafkaListenerContainerFactory() { + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); + factory.setConsumerFactory(forgotPasswordConsumerFactory()); + return factory; + } + + @Bean + public ConsumerFactory expenseDueReminderConsumerFactory() { + JsonDeserializer deserializer = + new JsonDeserializer<>(ExpenseDueReminderMessage.class); + deserializer.addTrustedPackages("*"); + deserializer.ignoreTypeHeaders(); + + Map props = new HashMap<>(); + props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + props.put(GROUP_ID_CONFIG, groupId); + props.put(KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + props.put(VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class); + props.put(AUTO_OFFSET_RESET_CONFIG, "earliest"); + + return new DefaultKafkaConsumerFactory<>(props, new StringDeserializer(), deserializer); + } + + @Bean + public ConcurrentKafkaListenerContainerFactory expenseDueReminderKafkaListenerContainerFactory() { + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); + factory.setConsumerFactory(expenseDueReminderConsumerFactory()); + return factory; + } + + @Bean + public ConsumerFactory expenseCreatedNotificationConsumerFactory() { + JsonDeserializer deserializer = + new JsonDeserializer<>(ExpenseCreatedNotificationMessage.class); + deserializer.addTrustedPackages("*"); + deserializer.ignoreTypeHeaders(); + + Map props = new HashMap<>(); + props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + props.put(GROUP_ID_CONFIG, groupId); + props.put(KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + props.put(VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class); + props.put(AUTO_OFFSET_RESET_CONFIG, "earliest"); + + return new DefaultKafkaConsumerFactory<>(props, new StringDeserializer(), deserializer); + } + + @Bean + public ConcurrentKafkaListenerContainerFactory expenseCreatedNotificationKafkaListenerContainerFactory() { + ConcurrentKafkaListenerContainerFactory factory = + new ConcurrentKafkaListenerContainerFactory<>(); + factory.setConsumerFactory(expenseCreatedNotificationConsumerFactory()); + return factory; + } +} diff --git a/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/service/EmailSenderConsumerService.java b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/service/EmailSenderConsumerService.java new file mode 100644 index 00000000..f4e3d9a8 --- /dev/null +++ b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/service/EmailSenderConsumerService.java @@ -0,0 +1,102 @@ +package com.finboostplus.notificationemail.service; + +import email.ExpenseCreatedNotificationMessage; +import email.ExpenseDueReminderMessage; +import email.ForgotPasswordMessage; +import email.RegistrationEmailMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.stereotype.Service; +import java.time.format.DateTimeFormatter; + + + +@Service +public class EmailSenderConsumerService { + + @Autowired + private EmailService emailService; + + @KafkaListener( + topics = "${topic.message.consumer.signup.email}", + groupId = "${topic.api.consumer.group-id}", + containerFactory = "registrationKafkaListenerContainerFactory" + ) + public void createRegisterEmail(RegistrationEmailMessage msg) { + String recipient = msg.getEmail(); + String subject = "Conta criada com sucesso!"; + String message = "Olá " + msg.getName() + ",\n\n" + + "Seja bem-vindo(a) ao FinBoostPlus!\n\n" + + "Para ativar sua conta, acesse o link abaixo:\n" + + "http://localhost:8080/user/userValidate/" + msg.getUuid() + "\n\n" + + "Caso você não tenha solicitado este cadastro, por favor desconsidere este e-mail.\n\n" + + "Atenciosamente,\n" + + "Equipe FinBoostPlus"; + + String response = emailService.sendTextEmail(recipient, subject, message); + System.out.println(response + " UUID: "+msg.getUuid()); + } + + @KafkaListener( + topics = "${topic.message.consumer.forgot.password.email}", + groupId = "${topic.api.consumer.group-id}", + containerFactory = "forgotPasswordKafkaListenerContainerFactory" + ) + public void createForgotPasswordEmail(ForgotPasswordMessage msg){ + String recipient = msg.getEmail(); + String subject = "Esqueceu sua senha?"; + String message = "Olá " + msg.getName() + ",\n\n" + + "Conforme solicitado, sua nova senha é: " + msg.getPassword() + "\n\n" + + "Recomendamos que você altere essa senha assim que acessar sua conta.\n\n" + + "Atenciosamente,\n" + + "Equipe FinBoostPlus"; + + String response = emailService.sendTextEmail(recipient, subject, message); + System.out.println("Forgot Password: "+response); + } + + + @KafkaListener( + topics = "${topic.message.consumer.expense.due.reminder.email}", + groupId = "${topic.api.consumer.group-id}", + containerFactory = "expenseDueReminderKafkaListenerContainerFactory" + ) + public void createExpenseDueReminderEmail(ExpenseDueReminderMessage msg) { + String recipient = msg.getEmail(); + String subject = "Despesa próxima ao vencimento"; + + String message = "Olá " + msg.getUserName() + ",\n\n" + + "Gostaríamos de informar que sua despesa intitulada \"" + msg.getExpenseTitle() + "\" " + + "vence em " + msg.getDaysUntilExpiration() + " dia(s).\n\n" + + "Atenciosamente,\n" + + "Equipe FinBoostPlus"; + + String response = emailService.sendTextEmail(recipient, subject, message); + System.out.println("Expense Due Reminder: " + response); + } + + @KafkaListener( + topics = "${topic.message.consumer.expense.created.notification.email}", + groupId = "${topic.api.consumer.group-id}", + containerFactory = "expenseCreatedNotificationKafkaListenerContainerFactory" + ) + public void createExpenseCreatedNotificationEmail(ExpenseCreatedNotificationMessage msg) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy"); + + String recipient = msg.getEmail(); + String subject = "Nova despesa criada"; + + String message = + "Olá " + msg.getUserName() + ",\n\n" + + "Informamos que uma nova despesa intitulada \"" + msg.getExpenseTitle() + "\" " + + "foi criada no grupo \"" + msg.getGroupName() + "\". " + + "O vencimento está previsto para o dia " + msg.getDeadlineDate().format(formatter) + " e " + + "o valor registrado é de R$ " + msg.getValue() + ".\n\n" + + "Esta despesa já está associada ao seu perfil.\n\n" + + "Atenciosamente,\n" + + "Equipe FinBoostPlus"; + + String response = emailService.sendTextEmail(recipient, subject, message); + System.out.println("Expense Created Notification: " + response); + } +} diff --git a/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/service/EmailService.java b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/service/EmailService.java new file mode 100644 index 00000000..72e82dbf --- /dev/null +++ b/microservices/notification-email/src/main/java/com/finboostplus/notificationemail/service/EmailService.java @@ -0,0 +1,46 @@ +package com.finboostplus.notificationemail.service; + +import jakarta.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Service +public class EmailService { + + private static final Logger logger = LoggerFactory.getLogger(EmailService.class); + + @Autowired + private JavaMailSender javaMailSender; + + @Value("${spring.mail.username}") + private String sender; + + /*@PostConstruct + public void testEnv() { + System.out.println("EMAIL ENV = " + System.getenv("MENSAGERIE_EMAIL")); + System.out.println("PASSWORD ENV = " + System.getenv("MENSAGERIE_PASSWORD")); + }*/ + + public String sendTextEmail(String recipient, String subject, String message) { + try { + SimpleMailMessage simpleMailMessage = new SimpleMailMessage(); + simpleMailMessage.setFrom(sender); + simpleMailMessage.setTo(recipient); + simpleMailMessage.setSubject(subject); + simpleMailMessage.setText(message); + + javaMailSender.send(simpleMailMessage); + + return "Email sent successfully"; + + } catch (Exception e) { + return "Error while trying to send email: " + e.getMessage(); + } + } +} + diff --git a/microservices/notification-email/src/main/resources/application.properties b/microservices/notification-email/src/main/resources/application.properties new file mode 100644 index 00000000..4786e152 --- /dev/null +++ b/microservices/notification-email/src/main/resources/application.properties @@ -0,0 +1,30 @@ +spring.application.name=notification-email + +#e-mail settings +spring.mail.host=smtp.gmail.com +spring.mail.port=587 +spring.mail.username=${MENSAGERIE_EMAIL} +spring.mail.password=${MENSAGERIE_PASSWORD} +spring.mail.properties.mail.smtp.auth=true +spring.mail.properties.mail.smtp.starttls.enable=true +spring.mail.properties.mail.smtp.starttls.required=true +spring.mail.properties.mail.smtp.ssl.protocols=TLSv1.2 + + +# consumer application.properties +server.port=8081 +spring.kafka.bootstrap-servers=localhost:9092 + +# consumer-specific settings +spring.kafka.consumer.group-id=${CONSUMER_GROUP_ID:finboostplus} +spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer +spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer +spring.kafka.consumer.auto-offset-reset=earliest + +# tópicos/variáveis +topic.message.consumer.signup.email=${ACCOUNT_REGISTRATION_TOPIC: default-topic} +topic.message.consumer.forgot.password.email=${FORGOT_PASSWORD_TOPIC: default-topic} +topic.message.consumer.expense.due.reminder.email=${EXPENSE_DUE_REMINDER_TOPIC: default-topic} +topic.message.consumer.expense.created.notification.email=${EXPENSE_CREATED_NOTIFICATION_TOPIC: default-topic} +topic.api.consumer.group-id=${CONSUMER_GROUP_ID:finboostplus} + diff --git a/microservices/notification-email/src/test/java/com/finboostplus/notificationemail/NotificationEmailApplicationTests.java b/microservices/notification-email/src/test/java/com/finboostplus/notificationemail/NotificationEmailApplicationTests.java new file mode 100644 index 00000000..71e83677 --- /dev/null +++ b/microservices/notification-email/src/test/java/com/finboostplus/notificationemail/NotificationEmailApplicationTests.java @@ -0,0 +1,13 @@ +package com.finboostplus.notificationemail; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class NotificationEmailApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..03748250 --- /dev/null +++ b/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + com.finboostplus + finboostplus-project + 1.0.0 + pom + + FinBoostPlus Project + Projeto multi-módulo FinBoostPlus + + + util + backend/finboostplus_server + microservices/notification-email + + + + 21 + 3.5.7 + ${java.version} + ${java.version} + ${java.version} + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + ${java.version} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/util/.gitignore b/util/.gitignore new file mode 100644 index 00000000..480bdf52 --- /dev/null +++ b/util/.gitignore @@ -0,0 +1,39 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ +.kotlin + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/util/pom.xml b/util/pom.xml new file mode 100644 index 00000000..a4dff04e --- /dev/null +++ b/util/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + com.finboostplus + finboostplus-project + 1.0.0 + ../pom.xml + + + util + jar + + Util Module + Módulo compartilhado entre Producer e Consumer + + + + org.projectlombok + lombok + true + + + + com.fasterxml.jackson.core + jackson-databind + + + + diff --git a/util/src/main/java/email/ExpenseCreatedNotificationMessage.java b/util/src/main/java/email/ExpenseCreatedNotificationMessage.java new file mode 100644 index 00000000..ac6f6dcb --- /dev/null +++ b/util/src/main/java/email/ExpenseCreatedNotificationMessage.java @@ -0,0 +1,21 @@ +package email; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ExpenseCreatedNotificationMessage implements Serializable { + private String userName; + private String email; + private String expenseTitle; + private String groupName; + private BigDecimal value; + private LocalDate deadlineDate; +} diff --git a/util/src/main/java/email/ExpenseDueReminderMessage.java b/util/src/main/java/email/ExpenseDueReminderMessage.java new file mode 100644 index 00000000..28a1224f --- /dev/null +++ b/util/src/main/java/email/ExpenseDueReminderMessage.java @@ -0,0 +1,18 @@ +package email; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ExpenseDueReminderMessage implements Serializable { + private String userName; + private String email; + private String expenseTitle; + private Long daysUntilExpiration; + +} diff --git a/util/src/main/java/email/ForgotPasswordMessage.java b/util/src/main/java/email/ForgotPasswordMessage.java new file mode 100644 index 00000000..bf1cd457 --- /dev/null +++ b/util/src/main/java/email/ForgotPasswordMessage.java @@ -0,0 +1,16 @@ +package email; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ForgotPasswordMessage implements Serializable { + private String email; + private String name; + private String password; +} diff --git a/util/src/main/java/email/RegistrationEmailMessage.java b/util/src/main/java/email/RegistrationEmailMessage.java new file mode 100644 index 00000000..d3dcbedc --- /dev/null +++ b/util/src/main/java/email/RegistrationEmailMessage.java @@ -0,0 +1,17 @@ +package email; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.UUID; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RegistrationEmailMessage implements Serializable { + private String email; + private String name; + private UUID uuid; +}