Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pom.xml
#	src/test/java/com/example/tasklist/config/TestConfig.java
#	src/test/java/com/example/tasklist/service/impl/TaskServiceImplTest.java
#	src/test/java/com/example/tasklist/service/impl/UserServiceImplTest.java

Author: IlyaLisov

pom.xml

@@ -30,7 +30,8 @@
         <xml-format.version>3.2.2</xml-format.version>
         <checkstyle.version>3.2.2</checkstyle.version>
         <graphql-java-kickstart.version>15.0.0</graphql-java-kickstart.version>
-        <graphql-scalars.version>20.2</graphql-scalars.version>
+        <graphql-java-extended-scalars.version>20.2</graphql-java-extended-scalars.version>
+        <junit-jupiter.version>5.10.0</junit-jupiter.version>
         <mockito.version>5.4.0</mockito.version>
         <jacoco.version>0.8.8</jacoco.version>
     </properties>
@@ -67,6 +68,22 @@
             <artifactId>spring-boot-starter-graphql</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+          
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.graphql-java-kickstart</groupId>
             <artifactId>graphql-java-kickstart</artifactId>
@@ -76,7 +93,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java-extended-scalars</artifactId>
-            <version>${graphql-scalars.version}</version>
+            <version>${graphql-java-extended-scalars.version}</version>
         </dependency>
 
         <dependency>
@@ -167,21 +184,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -238,7 +250,7 @@
                             <goal>check</goal>
                         </goals>
                         <configuration>
-                            <suppressionsFileExpression>checkstyle-suppressions.xml</suppressionsFileExpression>
+                            <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
                             <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
                         </configuration>
                     </execution>

src/main/java/com/example/tasklist/TasklistApplication.java

@@ -3,11 +3,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableCaching
+@EnableScheduling
 public class TasklistApplication {
 
     public static void main(final String[] args) {

src/main/java/com/example/tasklist/config/MailConfig.java

@@ -0,0 +1,27 @@
+package com.example.tasklist.config;
+
+import com.example.tasklist.service.props.MailProperties;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+
+@Configuration
+@RequiredArgsConstructor
+public class MailConfig {
+
+    private final MailProperties mailProperties;
+
+    @Bean
+    public JavaMailSender mailSender() {
+        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
+        mailSender.setHost(mailProperties.getHost());
+        mailSender.setPort(mailProperties.getPort());
+        mailSender.setUsername(mailProperties.getUsername());
+        mailSender.setPassword(mailProperties.getPassword());
+        mailSender.setJavaMailProperties(mailProperties.getProperties());
+        return mailSender;
+    }
+
+}

src/main/java/com/example/tasklist/domain/MailType.java

@@ -0,0 +1,8 @@
+package com.example.tasklist.domain;
+
+public enum MailType {
+
+    REGISTRATION,
+    REMINDER
+
+}

src/main/java/com/example/tasklist/repository/TaskRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 public interface TaskRepository extends JpaRepository<Task, Long> {
@@ -17,6 +18,14 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
             """, nativeQuery = true)
     List<Task> findAllByUserId(@Param("userId") Long userId);
 
+    @Query(value = """
+            SELECT * FROM tasks t
+            WHERE t.expiration_date is not null
+            AND t.expiration_date between :start and :end
+            """, nativeQuery = true)
+    List<Task> findAllSoonTasks(@Param("start") Timestamp start,
+                                @Param("end") Timestamp end);
+
     @Modifying
     @Query(value = """
             INSERT INTO users_tasks (user_id, task_id)

src/main/java/com/example/tasklist/repository/UserRepository.java

@@ -11,6 +11,17 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByUsername(String username);
 
+    @Query(value = """
+            SELECT u.id as id,
+            u.name as name,
+            u.username as username,
+            u.password as password
+            FROM users_tasks ut
+            JOIN users u ON ut.user_id = u.id
+            WHERE ut.task_id = :taskId
+            """, nativeQuery = true)
+    Optional<User> findTaskAuthor(@Param("taskId") Long taskId);
+
     @Query(value = """
              SELECT exists(
                            SELECT 1

src/main/java/com/example/tasklist/service/MailService.java

@@ -0,0 +1,12 @@
+package com.example.tasklist.service;
+
+import com.example.tasklist.domain.MailType;
+import com.example.tasklist.domain.user.User;
+
+import java.util.Properties;
+
+public interface MailService {
+
+    void sendEmail(User user, MailType type, Properties params);
+
+}

src/main/java/com/example/tasklist/service/Reminder.java

@@ -0,0 +1,7 @@
+package com.example.tasklist.service;
+
+public interface Reminder {
+
+    void remindForTask();
+
+}

src/main/java/com/example/tasklist/service/TaskService.java

@@ -3,6 +3,7 @@
 import com.example.tasklist.domain.task.Task;
 import com.example.tasklist.domain.task.TaskImage;
 
+import java.time.Duration;
 import java.util.List;
 
 public interface TaskService {
@@ -11,6 +12,8 @@ public interface TaskService {
 
     List<Task> getAllByUserId(Long id);
 
+    List<Task> getAllSoonTasks(Duration duration);
+
     Task update(Task task);
 
     Task create(Task task, Long userId);

src/main/java/com/example/tasklist/service/UserService.java

@@ -14,6 +14,8 @@ public interface UserService {
 
     boolean isTaskOwner(Long userId, Long taskId);
 
+    User getTaskAuthor(Long taskId);
+
     void delete(Long id);
 
 }