Add several repository tests and make existing tests pass

Breus · Breus · commit d926c6cf50c5 · 2025-09-17T18:57:32.000+02:00
diff --git a/src/main/java/net/hackyourfuture/coursehub/SecurityConfig.java b/src/main/java/net/hackyourfuture/coursehub/SecurityConfig.java
@@ -3,6 +3,7 @@
 import net.hackyourfuture.coursehub.service.UserAuthenticationService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
@@ -20,7 +21,9 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         return http.csrf(AbstractHttpConfigurer::disable)
-                .authorizeHttpRequests(auth -> auth.requestMatchers("/", "/login", "/register")
+                .authorizeHttpRequests(auth -> auth.requestMatchers(HttpMethod.POST, "/login", "/register")
+                        .permitAll()
+                        .requestMatchers(HttpMethod.GET, "/courses")
                         .permitAll()
                         .anyRequest()
                         .authenticated())
diff --git a/src/main/java/net/hackyourfuture/coursehub/data/InstructorEntity.java b/src/main/java/net/hackyourfuture/coursehub/data/InstructorEntity.java
@@ -1,9 +1,3 @@
 package net.hackyourfuture.coursehub.data;
 
-public record InstructorEntity(
-        Integer instructorId,
-        String firstName,
-        String lastName,
-        String email
-) {
-}
+public record InstructorEntity(Integer instructorId, String firstName, String lastName, String emailAddress) {}
diff --git a/src/main/java/net/hackyourfuture/coursehub/data/StudentEntity.java b/src/main/java/net/hackyourfuture/coursehub/data/StudentEntity.java
@@ -1,9 +1,3 @@
 package net.hackyourfuture.coursehub.data;
 
-public record StudentEntity(
-        Integer studentId,
-        String firstName,
-        String lastName,
-        String email
-) {
-}
+public record StudentEntity(Integer studentId, String firstName, String lastName, String email) {}
diff --git a/src/main/java/net/hackyourfuture/coursehub/data/UserAccountEntity.java b/src/main/java/net/hackyourfuture/coursehub/data/UserAccountEntity.java
@@ -1,3 +1,3 @@
 package net.hackyourfuture.coursehub.data;
 
-public record UserAccountEntity(Integer userId, String username, String passwordHash, String emailAddress, Role role) {}
+public record UserAccountEntity(Integer userId, String passwordHash, String emailAddress, Role role) {}
diff --git a/src/main/java/net/hackyourfuture/coursehub/repository/InstructorRepository.java b/src/main/java/net/hackyourfuture/coursehub/repository/InstructorRepository.java
@@ -1,9 +1,11 @@
 package net.hackyourfuture.coursehub.repository;
 
 import net.hackyourfuture.coursehub.data.InstructorEntity;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -13,33 +15,69 @@ public class InstructorRepository {
             rs.getInt("instructor_id"),
             rs.getString("first_name"),
             rs.getString("last_name"),
-            rs.getString("email")
-    );
+            rs.getString("email_address"));
     private final NamedParameterJdbcTemplate jdbcTemplate;
+    private final UserAccountRepository userAccountRepository;
 
-    public InstructorRepository(NamedParameterJdbcTemplate jdbcTemplate) {
+    public InstructorRepository(NamedParameterJdbcTemplate jdbcTemplate, UserAccountRepository userAccountRepository) {
         this.jdbcTemplate = jdbcTemplate;
+        this.userAccountRepository = userAccountRepository;
     }
 
     public InstructorEntity findById(Integer instructorId) {
-        String sql = "SELECT * FROM instructor WHERE instructor_id = :instructorId";
-        return jdbcTemplate.queryForObject(sql, Map.of("instructorId", instructorId), INSTRUCTOR_ROW_MAPPER);
+        try {
+            String sql = "SELECT i.instructor_id, i.first_name, i.last_name, ua.email_address "
+                    + "FROM instructor i JOIN user_account ua ON i.instructor_id = ua.user_id "
+                    + "WHERE i.instructor_id = :instructorId";
+            return jdbcTemplate.queryForObject(sql, Map.of("instructorId", instructorId), INSTRUCTOR_ROW_MAPPER);
+        } catch (EmptyResultDataAccessException e) {
+            return null;
+        }
     }
 
-    public InstructorEntity insertInstructor(InstructorEntity instructor) {
-        String sql = """
-                     INSERT INTO instructor (first_name, last_name, email)
-                     VALUES (:firstName, :lastName, :email)
-                     RETURNING *;
-                     """;
-        return jdbcTemplate.queryForObject(
-                sql, Map.of(
-                        "firstName", instructor.firstName(),
-                        "lastName", instructor.lastName(),
-                        "email", instructor.email()
-                ),
-                INSTRUCTOR_ROW_MAPPER
-        );
-
+    @Transactional
+    public InstructorEntity insertInstructor(
+            String firstName, String lastName, String emailAddress, String passwordHash) {
+        if (firstName == null || firstName.isBlank()) {
+            throw new IllegalArgumentException("firstName must not be empty");
+        }
+        if (lastName == null || lastName.isBlank()) {
+            throw new IllegalArgumentException("lastName must not be empty");
+        }
+        if (emailAddress == null || emailAddress.isBlank()) {
+            throw new IllegalArgumentException("emailAddress must not be empty");
+        }
+        if (passwordHash == null || passwordHash.isBlank()) {
+            throw new IllegalArgumentException("passwordHash must not be empty");
+        }
+        Integer userId = userAccountRepository.findUserIdByEmail(emailAddress);
+        if (userId != null) {
+            throw new IllegalArgumentException(
+                    "Another user with the email address '%s' already exists".formatted(emailAddress));
+        }
+        // Insert into user_account first
+        String userSql =
+                "INSERT INTO user_account (email_address, password_hash, role) VALUES (:emailAddress, :passwordHash, :role::role) RETURNING user_id";
+        userId = jdbcTemplate.queryForObject(
+                userSql,
+                Map.of(
+                        "emailAddress", emailAddress,
+                        "passwordHash", passwordHash,
+                        "role", "instructor"),
+                Integer.class);
+        if (userId == null) {
+            throw new IllegalStateException("Something went wrong inserting user account for a new instructor");
+        }
+        // Insert into the instructor table
+        String instructorSql =
+                "INSERT INTO instructor (instructor_id, first_name, last_name) VALUES (:instructorId, :firstName, :lastName)";
+        jdbcTemplate.update(
+                instructorSql,
+                Map.of(
+                        "instructorId", userId,
+                        "firstName", firstName,
+                        "lastName", lastName));
+        // Return the joined entity
+        return findById(userId);
     }
 }
diff --git a/src/main/java/net/hackyourfuture/coursehub/repository/StudentRepository.java b/src/main/java/net/hackyourfuture/coursehub/repository/StudentRepository.java
@@ -1,9 +1,12 @@
 package net.hackyourfuture.coursehub.repository;
 
+import net.hackyourfuture.coursehub.data.Role;
 import net.hackyourfuture.coursehub.data.StudentEntity;
+import net.hackyourfuture.coursehub.data.UserAccountEntity;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -13,30 +16,39 @@ public class StudentRepository {
             rs.getInt("student_id"),
             rs.getString("first_name"),
             rs.getString("last_name"),
-            rs.getString("email")
-    );
+            rs.getString("email_address") // from user_account
+            );
     private final NamedParameterJdbcTemplate jdbcTemplate;
+    private final UserAccountRepository userAccountRepository;
 
-    public StudentRepository(NamedParameterJdbcTemplate jdbcTemplate) {
+    public StudentRepository(NamedParameterJdbcTemplate jdbcTemplate, UserAccountRepository userAccountRepository) {
         this.jdbcTemplate = jdbcTemplate;
+        this.userAccountRepository = userAccountRepository;
     }
 
     public StudentEntity findById(Integer studentId) {
-        String sql = "SELECT * FROM student WHERE student_id = :studentId";
+        String sql = "SELECT s.student_id, s.first_name, s.last_name, ua.email_address "
+                + "FROM student s JOIN user_account ua ON s.student_id = ua.user_id "
+                + "WHERE s.student_id = :studentId";
         return jdbcTemplate.queryForObject(sql, Map.of("studentId", studentId), STUDENT_ROW_MAPPER);
     }
 
-    public void insertStudent(StudentEntity student) {
-        String sql = """
-                     INSERT INTO student (first_name, last_name, email)
-                     VALUES (:firstName, :lastName, :email)
-                     """;
+    @Transactional
+    public StudentEntity insertStudent(String firstName, String lastName, String emailAddress, String passwordHash) {
+        UserAccountEntity userAccountEntity =
+                userAccountRepository.insertUserAccount(emailAddress, passwordHash, Role.student);
+        if (userAccountEntity == null) {
+            throw new IllegalStateException("Something went wrong inserting user account for a new instructor");
+        }
+        String sql =
+                "INSERT INTO student (student_id, first_name, last_name) VALUES (:studentId, :firstName, :lastName)";
         jdbcTemplate.update(
-                sql, Map.of(
-                        "firstName", student.firstName(),
-                        "lastName", student.lastName(),
-                        "email", student.email()
-                )
-        );
+                sql,
+                Map.of(
+                        "studentId", userAccountEntity.userId(),
+                        "firstName", firstName,
+                        "lastName", lastName));
+        // Return the joined entity
+        return findById(userAccountEntity.userId());
     }
 }
diff --git a/src/main/java/net/hackyourfuture/coursehub/repository/UserAccountRepository.java b/src/main/java/net/hackyourfuture/coursehub/repository/UserAccountRepository.java
@@ -1,45 +1,70 @@
 package net.hackyourfuture.coursehub.repository;
 
+import jakarta.annotation.Nullable;
 import net.hackyourfuture.coursehub.data.Role;
 import net.hackyourfuture.coursehub.data.UserAccountEntity;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
 @Repository
 public class UserAccountRepository {
     public static final RowMapper<UserAccountEntity> USER_ACCOUNT_ROW_MAPPER = (rs, rowNum) -> new UserAccountEntity(
             rs.getInt("user_id"),
-            rs.getString("username"),
-            rs.getString("password_hash"),
             rs.getString("email_address"),
-            rs.getObject("role", Role.class));
+            rs.getString("password_hash"),
+            Role.valueOf(rs.getString("role")));
     private final NamedParameterJdbcTemplate jdbcTemplate;
 
     public UserAccountRepository(NamedParameterJdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
     public UserAccountEntity findByUserId(Integer userId) {
-        String sql = "SELECT * FROM user_account WHERE user_id = :useId";
+        String sql = "SELECT * FROM user_account WHERE user_id = :userId";
         return jdbcTemplate.queryForObject(sql, Map.of("userId", userId), USER_ACCOUNT_ROW_MAPPER);
     }
 
+    @Nullable
     public UserAccountEntity findByEmailAddress(String emailAddress) {
         String sql = "SELECT * FROM user_account WHERE email_address = :emailAddress";
-        return jdbcTemplate.queryForObject(sql, Map.of("emailAddress", emailAddress), USER_ACCOUNT_ROW_MAPPER);
+        try {
+            return jdbcTemplate.queryForObject(sql, Map.of("emailAddress", emailAddress), USER_ACCOUNT_ROW_MAPPER);
+        } catch (EmptyResultDataAccessException e) {
+            return null;
+        }
     }
 
-    public void save(UserAccountEntity user) {
-        String sql =
-                "INSERT INTO user_account (password_hash, email_address, role) VALUES (:passwordHash, :emailAddress, :role)";
-        jdbcTemplate.update(
-                sql,
+    @Transactional
+    public UserAccountEntity insertUserAccount(String emailAddress, String passwordHash, Role role) {
+        Integer userId = findUserIdByEmail(emailAddress);
+        if (userId != null) {
+            throw new IllegalArgumentException(
+                    "Another user with the email address '%s' already exists".formatted(emailAddress));
+        }
+        String userSql = "INSERT INTO user_account (email_address, password_hash, role) "
+                + "VALUES (:emailAddress, :passwordHash, :role::role) "
+                + "RETURNING user_id, email_address, password_hash, role";
+        return jdbcTemplate.queryForObject(
+                userSql,
                 Map.of(
-                        "passwordHash", user.passwordHash(),
-                        "emailAddress", user.emailAddress(),
-                        "role", user.role()));
+                        "emailAddress", emailAddress,
+                        "passwordHash", passwordHash,
+                        "role", role.name()),
+                USER_ACCOUNT_ROW_MAPPER);
+    }
+
+    @Nullable
+    public Integer findUserIdByEmail(String emailAddress) {
+        String sql = "SELECT user_id FROM user_account WHERE email_address = :emailAddress";
+        try {
+            return jdbcTemplate.queryForObject(sql, Map.of("emailAddress", emailAddress), Integer.class);
+        } catch (EmptyResultDataAccessException e) {
+            return null;
+        }
     }
 }
diff --git a/src/main/java/net/hackyourfuture/coursehub/service/UserAuthenticationService.java b/src/main/java/net/hackyourfuture/coursehub/service/UserAuthenticationService.java
@@ -21,7 +21,7 @@ public UserAuthenticationService(UserAccountRepository userAccountRepository) {
     public UserDetails loadUserByUsername(String emailAddress) throws UsernameNotFoundException {
         UserAccountEntity user = userAccountRepository.findByEmailAddress(emailAddress);
         if (user == null) {
-            throw new UsernameNotFoundException("No user found for provided email address");
+            throw new UsernameNotFoundException("No user found for provided emailAddress address");
         }
         return new org.springframework.security.core.userdetails.User(
                 user.emailAddress(),
diff --git a/src/main/java/net/hackyourfuture/coursehub/web/UserAuthenticationController.java b/src/main/java/net/hackyourfuture/coursehub/web/UserAuthenticationController.java
@@ -32,6 +32,9 @@ public LoginResponse login(@RequestBody LoginRequest request) {
             Authentication authentication = authenticationManager.authenticate(
                     new UsernamePasswordAuthenticationToken(request.emailAddress(), request.password()));
             UserAccountEntity user = userAccountRepository.findByEmailAddress(request.emailAddress());
+            if (user == null) {
+                return new LoginResponse(null, false, "No user found for provided email address");
+            }
             return new LoginResponse(user.userId(), authentication.isAuthenticated(), null);
         } catch (AuthenticationException e) {
             if (e instanceof BadCredentialsException) {
diff --git a/src/main/java/net/hackyourfuture/coursehub/web/model/CourseDto.java b/src/main/java/net/hackyourfuture/coursehub/web/model/CourseDto.java
@@ -3,4 +3,9 @@
 import java.time.LocalDate;
 
 public record CourseDto(
-        String name, String description, String instructor, LocalDate startDate, LocalDate endDate, Integer maxEnrollments) {}
+        String name,
+        String description,
+        String instructor,
+        LocalDate startDate,
+        LocalDate endDate,
+        Integer maxEnrollments) {}
diff --git a/src/test/java/net/hackyourfuture/coursehub/repository/InstructorRepositoryTest.java b/src/test/java/net/hackyourfuture/coursehub/repository/InstructorRepositoryTest.java
@@ -0,0 +1,52 @@
+package net.hackyourfuture.coursehub.repository;
+
+import net.hackyourfuture.coursehub.data.InstructorEntity;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Transactional
+public class InstructorRepositoryTest {
+    @Autowired
+    private InstructorRepository instructorRepository;
+
+    @Autowired
+    private UserAccountRepository userAccountRepository;
+
+    @Test
+    void insertAndFindInstructorById() {
+        InstructorEntity instructorEntity =
+                instructorRepository.insertInstructor("Alice", "Anderson", "alice@example.com", "password");
+        Assertions.assertThat(instructorEntity).isNotNull();
+        Assertions.assertThat(instructorRepository.findById(instructorEntity.instructorId()))
+                .isEqualTo(instructorEntity);
+    }
+
+    @Test
+    void insertAndFindUserAccountByEmailAddress() {
+        String emailAddress = "bob@example.com";
+        InstructorEntity instructorEntity =
+                instructorRepository.insertInstructor("Bob", "Builder", emailAddress, "password");
+        Assertions.assertThat(instructorEntity).isNotNull();
+        Assertions.assertThat(userAccountRepository.findUserIdByEmail(emailAddress))
+                .isEqualTo(instructorEntity.instructorId());
+    }
+
+    @Test
+    void insertInstructorWithDuplicateEmailThrowsException() {
+        String email = "duplicate@example.com";
+        instructorRepository.insertInstructor("John", "Doe", email, "password");
+        Assertions.assertThatThrownBy(() -> instructorRepository.insertInstructor("Jane", "Smith", email, "password"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("already exists");
+    }
+
+    @Test
+    void findNonExistentInstructorReturnsException() {
+        Integer nonExistentId = -9999;
+        Assertions.assertThat(instructorRepository.findById(nonExistentId)).isNull();
+    }
+}
diff --git a/src/test/java/net/hackyourfuture/coursehub/repository/StudentRepositoryTest.java b/src/test/java/net/hackyourfuture/coursehub/repository/StudentRepositoryTest.java
diff --git a/src/test/java/net/hackyourfuture/coursehub/service/CourseServiceIntegrationTest.java b/src/test/java/net/hackyourfuture/coursehub/service/CourseServiceIntegrationTest.java
diff --git a/src/test/java/net/hackyourfuture/coursehub/service/CourseServiceTest.java b/src/test/java/net/hackyourfuture/coursehub/service/CourseServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package net.hackyourfuture.coursehub.data;`
`2`	`2`
`3`		`-public record UserAccountEntity(Integer userId, String username, String passwordHash, String emailAddress, Role role) {}`
	`3`	`+public record UserAccountEntity(Integer userId, String passwordHash, String emailAddress, Role role) {}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public UserAuthenticationService(UserAccountRepository userAccountRepository) {`
`21`	`21`	`public UserDetails loadUserByUsername(String emailAddress) throws UsernameNotFoundException {`
`22`	`22`	`UserAccountEntity user = userAccountRepository.findByEmailAddress(emailAddress);`
`23`	`23`	`if (user == null) {`
`24`		`- throw new UsernameNotFoundException("No user found for provided email address");`
	`24`	`+ throw new UsernameNotFoundException("No user found for provided emailAddress address");`
`25`	`25`	`}`
`26`	`26`	`return new org.springframework.security.core.userdetails.User(`
`27`	`27`	`user.emailAddress(),`