diff --git a/backend/.gitignore b/backend/.gitignore index 51b063a..eb83c5c 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -34,6 +34,7 @@ build/ ### Logs ### *.log +logs/* ### maven ### -.mvn/ \ No newline at end of file +.mvn/ diff --git a/backend/Makefile b/backend/Makefile index 2058ca8..1e5071d 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,5 +1,19 @@ -start: +.PHONY: run start_db reset_db clean_db clean + +# I would put db as a target prereq but the script assumes the database does not exist +run: + # NOTE: Requires DB to be initialized (start_db). mvn spring-boot:run -reset: - sudo mariadb -e "DROP DATABASE casa;"; sudo mariadb -e "CREATE DATABASE casa;" +start_db: + # Run the postStartCommand.sh script which initializes/starts mariadb + bash ../.devcontainer/postStartCommand.sh + +reset_db: clean_db + sudo mariadb -e "CREATE DATABASE casa;" + +clean_db: + sudo mariadb -e "DROP DATABASE casa;" + +clean: clean_db + rm -rf logs diff --git a/backend/pom.xml b/backend/pom.xml index 278d7b8..6444691 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -68,7 +68,8 @@ org.projectlombok lombok - true + 1.18.34 + provided io.jsonwebtoken @@ -101,11 +102,6 @@ org.springframework.boot spring-boot-starter-validation - - org.projectlombok - lombok - true - org.springframework.boot spring-boot-starter-mail diff --git a/backend/src/main/java/com/example/casa/CasaApplication.java b/backend/src/main/java/com/casa/CasaApplication.java similarity index 76% rename from backend/src/main/java/com/example/casa/CasaApplication.java rename to backend/src/main/java/com/casa/CasaApplication.java index 3f85d4b..bfa7a22 100644 --- a/backend/src/main/java/com/example/casa/CasaApplication.java +++ b/backend/src/main/java/com/casa/CasaApplication.java @@ -1,4 +1,4 @@ -package com.example.casa; +package com.casa; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,12 +6,15 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import com.example.casa.Config.AppProperties; +import com.casa.Config.AppProperties; + +import lombok.extern.slf4j.Slf4j; @SpringBootApplication -@EntityScan("com.example.casa.Model") -@EnableJpaRepositories("com.example.casa.Repository") +@EntityScan("com.casa.Model") +@EnableJpaRepositories("com.casa.Repository") @EnableConfigurationProperties(AppProperties.class) +@Slf4j public class CasaApplication { public static void main(String[] args) { diff --git a/backend/src/main/java/com/example/casa/Config/AppProperties.java b/backend/src/main/java/com/casa/Config/AppProperties.java similarity index 97% rename from backend/src/main/java/com/example/casa/Config/AppProperties.java rename to backend/src/main/java/com/casa/Config/AppProperties.java index 6f938a0..102dad0 100644 --- a/backend/src/main/java/com/example/casa/Config/AppProperties.java +++ b/backend/src/main/java/com/casa/Config/AppProperties.java @@ -1,4 +1,4 @@ -package com.example.casa.Config; +package com.casa.Config; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/com/example/casa/Config/CorsConfig.java b/backend/src/main/java/com/casa/Config/CorsConfig.java similarity index 97% rename from backend/src/main/java/com/example/casa/Config/CorsConfig.java rename to backend/src/main/java/com/casa/Config/CorsConfig.java index 746dd8a..60a7947 100644 --- a/backend/src/main/java/com/example/casa/Config/CorsConfig.java +++ b/backend/src/main/java/com/casa/Config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.example.casa.Config; +package com.casa.Config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/com/example/casa/Config/EmailConfig.java b/backend/src/main/java/com/casa/Config/EmailConfig.java similarity index 92% rename from backend/src/main/java/com/example/casa/Config/EmailConfig.java rename to backend/src/main/java/com/casa/Config/EmailConfig.java index afb1008..773f20a 100644 --- a/backend/src/main/java/com/example/casa/Config/EmailConfig.java +++ b/backend/src/main/java/com/casa/Config/EmailConfig.java @@ -1,4 +1,4 @@ -package com.example.casa.Config; +package com.casa.Config; import java.util.Properties; @@ -7,7 +7,7 @@ import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSenderImpl; -import com.example.casa.Payload.EmailDetails; +import com.casa.Payload.EmailDetails; @Configuration diff --git a/backend/src/main/java/com/example/casa/Config/SecurityConfig.java b/backend/src/main/java/com/casa/Config/SecurityConfig.java similarity index 93% rename from backend/src/main/java/com/example/casa/Config/SecurityConfig.java rename to backend/src/main/java/com/casa/Config/SecurityConfig.java index a36cead..14d923f 100644 --- a/backend/src/main/java/com/example/casa/Config/SecurityConfig.java +++ b/backend/src/main/java/com/casa/Config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.example.casa.Config; +package com.casa.Config; import java.util.Arrays; import java.util.Collections; @@ -23,11 +23,11 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import com.example.casa.Security.OAuth.CustomOAuth2UserService; -import com.example.casa.Security.OAuth.HttpCookieOAuth2AuthorizationRequestRepository; -import com.example.casa.Security.OAuth.OAuth2AuthenticationFailureHandler; -import com.example.casa.Security.OAuth.OAuth2AuthenticationSuccessHandler; -import com.example.casa.Security.TokenAuthenticationFilter; +import com.casa.Security.OAuth.CustomOAuth2UserService; +import com.casa.Security.OAuth.HttpCookieOAuth2AuthorizationRequestRepository; +import com.casa.Security.OAuth.OAuth2AuthenticationFailureHandler; +import com.casa.Security.OAuth.OAuth2AuthenticationSuccessHandler; +import com.casa.Security.TokenAuthenticationFilter; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/com/example/casa/Controller/AuthController.java b/backend/src/main/java/com/casa/Controller/AuthController.java similarity index 91% rename from backend/src/main/java/com/example/casa/Controller/AuthController.java rename to backend/src/main/java/com/casa/Controller/AuthController.java index 7ce8f66..330ad63 100644 --- a/backend/src/main/java/com/example/casa/Controller/AuthController.java +++ b/backend/src/main/java/com/casa/Controller/AuthController.java @@ -1,4 +1,4 @@ -package com.example.casa.Controller; +package com.casa.Controller; import java.net.URI; @@ -21,14 +21,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import com.example.casa.Model.AuthProvider; -import com.example.casa.Model.User; -import com.example.casa.Payload.ApiResponse; -import com.example.casa.Payload.User.AuthResponse; -import com.example.casa.Payload.User.LoginRequest; -import com.example.casa.Payload.User.SignUpRequest; -import com.example.casa.Repository.UserRepository; -import com.example.casa.Security.TokenProvider; +import com.casa.Model.AuthProvider; +import com.casa.Model.User; +import com.casa.Payload.ApiResponse; +import com.casa.Payload.User.AuthResponse; +import com.casa.Payload.User.LoginRequest; +import com.casa.Payload.User.SignUpRequest; +import com.casa.Repository.UserRepository; +import com.casa.Security.TokenProvider; import jakarta.validation.Valid; diff --git a/backend/src/main/java/com/example/casa/Controller/EventController.java b/backend/src/main/java/com/casa/Controller/EventController.java similarity index 91% rename from backend/src/main/java/com/example/casa/Controller/EventController.java rename to backend/src/main/java/com/casa/Controller/EventController.java index 8c19a8c..9f2282c 100644 --- a/backend/src/main/java/com/example/casa/Controller/EventController.java +++ b/backend/src/main/java/com/casa/Controller/EventController.java @@ -1,4 +1,4 @@ -package com.example.casa.Controller; +package com.casa.Controller; import java.util.Calendar; import java.util.Date; @@ -15,17 +15,17 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.example.casa.Exception.BadRequestException; -import com.example.casa.Model.Event; -import com.example.casa.Model.Organization; -import com.example.casa.Model.User; -import com.example.casa.Payload.ApiResponse; -import com.example.casa.Payload.Event.CalendarResponse; -import com.example.casa.Payload.Event.EventDto; -import com.example.casa.Repository.EventRepository; -import com.example.casa.Repository.OrganizationRepository; -import com.example.casa.Repository.UserRepository; -import com.example.casa.Util.DateConverter; +import com.casa.Exception.BadRequestException; +import com.casa.Model.Event; +import com.casa.Model.Organization; +import com.casa.Model.User; +import com.casa.Payload.ApiResponse; +import com.casa.Payload.Event.CalendarResponse; +import com.casa.Payload.Event.EventDto; +import com.casa.Repository.EventRepository; +import com.casa.Repository.OrganizationRepository; +import com.casa.Repository.UserRepository; +import com.casa.Util.DateConverter; @RestController public class EventController { diff --git a/backend/src/main/java/com/example/casa/Controller/OrganizationController.java b/backend/src/main/java/com/casa/Controller/OrganizationController.java similarity index 92% rename from backend/src/main/java/com/example/casa/Controller/OrganizationController.java rename to backend/src/main/java/com/casa/Controller/OrganizationController.java index 2cc2560..cd68684 100644 --- a/backend/src/main/java/com/example/casa/Controller/OrganizationController.java +++ b/backend/src/main/java/com/casa/Controller/OrganizationController.java @@ -1,4 +1,4 @@ -package com.example.casa.Controller; +package com.casa.Controller; import java.util.HashSet; import java.util.Set; @@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.example.casa.Model.Organization; -import com.example.casa.Model.Role; -import com.example.casa.Model.User; -import com.example.casa.Payload.ApiResponse; -import com.example.casa.Payload.Organization.OrganizationDto; -import com.example.casa.Payload.Organization.OrganizationWithRoles; -import com.example.casa.Repository.EventRepository; -import com.example.casa.Repository.OrganizationRepository; -import com.example.casa.Repository.UserRepository; +import com.casa.Model.Organization; +import com.casa.Model.Role; +import com.casa.Model.User; +import com.casa.Payload.ApiResponse; +import com.casa.Payload.Organization.OrganizationDto; +import com.casa.Payload.Organization.OrganizationWithRoles; +import com.casa.Repository.EventRepository; +import com.casa.Repository.OrganizationRepository; +import com.casa.Repository.UserRepository; @RestController public class OrganizationController { diff --git a/backend/src/main/java/com/example/casa/Controller/RoleController.java b/backend/src/main/java/com/casa/Controller/RoleController.java similarity index 94% rename from backend/src/main/java/com/example/casa/Controller/RoleController.java rename to backend/src/main/java/com/casa/Controller/RoleController.java index 5f448bc..d9f0191 100644 --- a/backend/src/main/java/com/example/casa/Controller/RoleController.java +++ b/backend/src/main/java/com/casa/Controller/RoleController.java @@ -1,4 +1,4 @@ -package com.example.casa.Controller; +package com.casa.Controller; import java.util.Set; @@ -9,13 +9,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.example.casa.Model.Organization; -import com.example.casa.Model.Role; -import com.example.casa.Model.User; -import com.example.casa.Payload.Role.RoleDto; -import com.example.casa.Repository.OrganizationRepository; -import com.example.casa.Repository.RoleRepository; -import com.example.casa.Repository.UserRepository; +import com.casa.Model.Organization; +import com.casa.Model.Role; +import com.casa.Model.User; +import com.casa.Payload.Role.RoleDto; +import com.casa.Repository.OrganizationRepository; +import com.casa.Repository.RoleRepository; +import com.casa.Repository.UserRepository; @RestController public class RoleController { diff --git a/backend/src/main/java/com/example/casa/Controller/UserController.java b/backend/src/main/java/com/casa/Controller/UserController.java similarity index 69% rename from backend/src/main/java/com/example/casa/Controller/UserController.java rename to backend/src/main/java/com/casa/Controller/UserController.java index 44ad99b..cec6344 100644 --- a/backend/src/main/java/com/example/casa/Controller/UserController.java +++ b/backend/src/main/java/com/casa/Controller/UserController.java @@ -1,15 +1,15 @@ -package com.example.casa.Controller; +package com.casa.Controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; -import com.example.casa.Exception.ResourceNotFoundException; -import com.example.casa.Model.User; -import com.example.casa.Repository.UserRepository; -import com.example.casa.Security.CurrentUser; -import com.example.casa.Security.UserPrincipal; +import com.casa.Exception.ResourceNotFoundException; +import com.casa.Model.User; +import com.casa.Repository.UserRepository; +import com.casa.Security.CurrentUser; +import com.casa.Security.UserPrincipal; @RestController public class UserController { diff --git a/backend/src/main/java/com/example/casa/Exception/BadRequestException.java b/backend/src/main/java/com/casa/Exception/BadRequestException.java similarity index 92% rename from backend/src/main/java/com/example/casa/Exception/BadRequestException.java rename to backend/src/main/java/com/casa/Exception/BadRequestException.java index 97eebad..45e8d8e 100644 --- a/backend/src/main/java/com/example/casa/Exception/BadRequestException.java +++ b/backend/src/main/java/com/casa/Exception/BadRequestException.java @@ -1,4 +1,4 @@ -package com.example.casa.Exception; +package com.casa.Exception; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/backend/src/main/java/com/example/casa/Exception/OAuth2AuthenticationProcessingException.java b/backend/src/main/java/com/casa/Exception/OAuth2AuthenticationProcessingException.java similarity index 90% rename from backend/src/main/java/com/example/casa/Exception/OAuth2AuthenticationProcessingException.java rename to backend/src/main/java/com/casa/Exception/OAuth2AuthenticationProcessingException.java index 6f2b22a..50f567f 100644 --- a/backend/src/main/java/com/example/casa/Exception/OAuth2AuthenticationProcessingException.java +++ b/backend/src/main/java/com/casa/Exception/OAuth2AuthenticationProcessingException.java @@ -1,4 +1,4 @@ -package com.example.casa.Exception; +package com.casa.Exception; import org.springframework.security.core.AuthenticationException; diff --git a/backend/src/main/java/com/example/casa/Exception/ResourceNotFoundException.java b/backend/src/main/java/com/casa/Exception/ResourceNotFoundException.java similarity index 94% rename from backend/src/main/java/com/example/casa/Exception/ResourceNotFoundException.java rename to backend/src/main/java/com/casa/Exception/ResourceNotFoundException.java index 49bbed0..0006106 100644 --- a/backend/src/main/java/com/example/casa/Exception/ResourceNotFoundException.java +++ b/backend/src/main/java/com/casa/Exception/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package com.example.casa.Exception; +package com.casa.Exception; import lombok.Data; import org.springframework.http.HttpStatus; diff --git a/backend/src/main/java/com/example/casa/Model/AuthProvider.java b/backend/src/main/java/com/casa/Model/AuthProvider.java similarity index 58% rename from backend/src/main/java/com/example/casa/Model/AuthProvider.java rename to backend/src/main/java/com/casa/Model/AuthProvider.java index f318610..cf459c0 100644 --- a/backend/src/main/java/com/example/casa/Model/AuthProvider.java +++ b/backend/src/main/java/com/casa/Model/AuthProvider.java @@ -1,4 +1,4 @@ -package com.example.casa.Model; +package com.casa.Model; public enum AuthProvider { google, local diff --git a/backend/src/main/java/com/example/casa/Model/Event.java b/backend/src/main/java/com/casa/Model/Event.java similarity index 99% rename from backend/src/main/java/com/example/casa/Model/Event.java rename to backend/src/main/java/com/casa/Model/Event.java index 2684ead..8f3b7af 100644 --- a/backend/src/main/java/com/example/casa/Model/Event.java +++ b/backend/src/main/java/com/casa/Model/Event.java @@ -1,4 +1,4 @@ -package com.example.casa.Model; +package com.casa.Model; import java.util.Date; import java.util.HashSet; diff --git a/backend/src/main/java/com/example/casa/Model/Organization.java b/backend/src/main/java/com/casa/Model/Organization.java similarity index 98% rename from backend/src/main/java/com/example/casa/Model/Organization.java rename to backend/src/main/java/com/casa/Model/Organization.java index 3d57f1a..2e5665e 100644 --- a/backend/src/main/java/com/example/casa/Model/Organization.java +++ b/backend/src/main/java/com/casa/Model/Organization.java @@ -1,4 +1,4 @@ -package com.example.casa.Model; +package com.casa.Model; import java.util.HashSet; import java.util.Set; diff --git a/backend/src/main/java/com/example/casa/Model/Role.java b/backend/src/main/java/com/casa/Model/Role.java similarity index 98% rename from backend/src/main/java/com/example/casa/Model/Role.java rename to backend/src/main/java/com/casa/Model/Role.java index a09cfd8..021581e 100644 --- a/backend/src/main/java/com/example/casa/Model/Role.java +++ b/backend/src/main/java/com/casa/Model/Role.java @@ -1,4 +1,4 @@ -package com.example.casa.Model; +package com.casa.Model; import java.util.HashSet; import java.util.Set; diff --git a/backend/src/main/java/com/example/casa/Model/User.java b/backend/src/main/java/com/casa/Model/User.java similarity index 99% rename from backend/src/main/java/com/example/casa/Model/User.java rename to backend/src/main/java/com/casa/Model/User.java index c4d6761..1894955 100644 --- a/backend/src/main/java/com/example/casa/Model/User.java +++ b/backend/src/main/java/com/casa/Model/User.java @@ -1,4 +1,4 @@ -package com.example.casa.Model; +package com.casa.Model; import java.util.HashSet; import java.util.Set; diff --git a/backend/src/main/java/com/example/casa/Payload/ApiResponse.java b/backend/src/main/java/com/casa/Payload/ApiResponse.java similarity index 92% rename from backend/src/main/java/com/example/casa/Payload/ApiResponse.java rename to backend/src/main/java/com/casa/Payload/ApiResponse.java index 9be884c..2491c06 100644 --- a/backend/src/main/java/com/example/casa/Payload/ApiResponse.java +++ b/backend/src/main/java/com/casa/Payload/ApiResponse.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload; +package com.casa.Payload; public class ApiResponse { diff --git a/backend/src/main/java/com/example/casa/Payload/EmailDetails.java b/backend/src/main/java/com/casa/Payload/EmailDetails.java similarity index 97% rename from backend/src/main/java/com/example/casa/Payload/EmailDetails.java rename to backend/src/main/java/com/casa/Payload/EmailDetails.java index 4f81f5a..4b4e750 100644 --- a/backend/src/main/java/com/example/casa/Payload/EmailDetails.java +++ b/backend/src/main/java/com/casa/Payload/EmailDetails.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload; +package com.casa.Payload; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/com/example/casa/Payload/Event/CalendarResponse.java b/backend/src/main/java/com/casa/Payload/Event/CalendarResponse.java similarity index 80% rename from backend/src/main/java/com/example/casa/Payload/Event/CalendarResponse.java rename to backend/src/main/java/com/casa/Payload/Event/CalendarResponse.java index b3e6e48..900e6da 100644 --- a/backend/src/main/java/com/example/casa/Payload/Event/CalendarResponse.java +++ b/backend/src/main/java/com/casa/Payload/Event/CalendarResponse.java @@ -1,8 +1,8 @@ -package com.example.casa.Payload.Event; +package com.casa.Payload.Event; import java.util.Set; -import com.example.casa.Model.Event; +import com.casa.Model.Event; public class CalendarResponse { diff --git a/backend/src/main/java/com/example/casa/Payload/Event/EventDto.java b/backend/src/main/java/com/casa/Payload/Event/EventDto.java similarity index 97% rename from backend/src/main/java/com/example/casa/Payload/Event/EventDto.java rename to backend/src/main/java/com/casa/Payload/Event/EventDto.java index 03d5441..b0c50bd 100644 --- a/backend/src/main/java/com/example/casa/Payload/Event/EventDto.java +++ b/backend/src/main/java/com/casa/Payload/Event/EventDto.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload.Event; +package com.casa.Payload.Event; public class EventDto { diff --git a/backend/src/main/java/com/example/casa/Payload/Organization/OrganizationDto.java b/backend/src/main/java/com/casa/Payload/Organization/OrganizationDto.java similarity index 92% rename from backend/src/main/java/com/example/casa/Payload/Organization/OrganizationDto.java rename to backend/src/main/java/com/casa/Payload/Organization/OrganizationDto.java index de8537c..e543329 100644 --- a/backend/src/main/java/com/example/casa/Payload/Organization/OrganizationDto.java +++ b/backend/src/main/java/com/casa/Payload/Organization/OrganizationDto.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload.Organization; +package com.casa.Payload.Organization; public class OrganizationDto { diff --git a/backend/src/main/java/com/example/casa/Payload/Organization/OrganizationWithRoles.java b/backend/src/main/java/com/casa/Payload/Organization/OrganizationWithRoles.java similarity index 82% rename from backend/src/main/java/com/example/casa/Payload/Organization/OrganizationWithRoles.java rename to backend/src/main/java/com/casa/Payload/Organization/OrganizationWithRoles.java index 4f3149d..b9300db 100644 --- a/backend/src/main/java/com/example/casa/Payload/Organization/OrganizationWithRoles.java +++ b/backend/src/main/java/com/casa/Payload/Organization/OrganizationWithRoles.java @@ -1,11 +1,11 @@ -package com.example.casa.Payload.Organization; +package com.casa.Payload.Organization; import java.util.HashSet; import java.util.Set; -import com.example.casa.Model.Organization; -import com.example.casa.Model.Role; -import com.example.casa.Model.User; +import com.casa.Model.Organization; +import com.casa.Model.Role; +import com.casa.Model.User; public class OrganizationWithRoles extends Organization { diff --git a/backend/src/main/java/com/example/casa/Payload/Role/RoleDto.java b/backend/src/main/java/com/casa/Payload/Role/RoleDto.java similarity index 95% rename from backend/src/main/java/com/example/casa/Payload/Role/RoleDto.java rename to backend/src/main/java/com/casa/Payload/Role/RoleDto.java index 6d71583..2503f57 100644 --- a/backend/src/main/java/com/example/casa/Payload/Role/RoleDto.java +++ b/backend/src/main/java/com/casa/Payload/Role/RoleDto.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload.Role; +package com.casa.Payload.Role; import java.util.Set; diff --git a/backend/src/main/java/com/example/casa/Payload/User/AuthResponse.java b/backend/src/main/java/com/casa/Payload/User/AuthResponse.java similarity index 93% rename from backend/src/main/java/com/example/casa/Payload/User/AuthResponse.java rename to backend/src/main/java/com/casa/Payload/User/AuthResponse.java index ed11bce..26ac3ba 100644 --- a/backend/src/main/java/com/example/casa/Payload/User/AuthResponse.java +++ b/backend/src/main/java/com/casa/Payload/User/AuthResponse.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload.User; +package com.casa.Payload.User; public class AuthResponse { diff --git a/backend/src/main/java/com/example/casa/Payload/User/LoginRequest.java b/backend/src/main/java/com/casa/Payload/User/LoginRequest.java similarity index 91% rename from backend/src/main/java/com/example/casa/Payload/User/LoginRequest.java rename to backend/src/main/java/com/casa/Payload/User/LoginRequest.java index 9b6ec75..501d8ea 100644 --- a/backend/src/main/java/com/example/casa/Payload/User/LoginRequest.java +++ b/backend/src/main/java/com/casa/Payload/User/LoginRequest.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload.User; +package com.casa.Payload.User; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/com/example/casa/Payload/User/SignUpRequest.java b/backend/src/main/java/com/casa/Payload/User/SignUpRequest.java similarity index 95% rename from backend/src/main/java/com/example/casa/Payload/User/SignUpRequest.java rename to backend/src/main/java/com/casa/Payload/User/SignUpRequest.java index 6582650..58cab96 100644 --- a/backend/src/main/java/com/example/casa/Payload/User/SignUpRequest.java +++ b/backend/src/main/java/com/casa/Payload/User/SignUpRequest.java @@ -1,4 +1,4 @@ -package com.example.casa.Payload.User; +package com.casa.Payload.User; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/com/example/casa/Repository/EventRepository.java b/backend/src/main/java/com/casa/Repository/EventRepository.java similarity index 82% rename from backend/src/main/java/com/example/casa/Repository/EventRepository.java rename to backend/src/main/java/com/casa/Repository/EventRepository.java index 0d85d76..305a672 100644 --- a/backend/src/main/java/com/example/casa/Repository/EventRepository.java +++ b/backend/src/main/java/com/casa/Repository/EventRepository.java @@ -1,4 +1,4 @@ -package com.example.casa.Repository; +package com.casa.Repository; import java.util.Date; import java.util.Set; @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.example.casa.Model.Event; -import com.example.casa.Model.Organization; -import com.example.casa.Model.User; +import com.casa.Model.Event; +import com.casa.Model.Organization; +import com.casa.Model.User; public interface EventRepository extends JpaRepository { diff --git a/backend/src/main/java/com/example/casa/Repository/OrganizationRepository.java b/backend/src/main/java/com/casa/Repository/OrganizationRepository.java similarity index 82% rename from backend/src/main/java/com/example/casa/Repository/OrganizationRepository.java rename to backend/src/main/java/com/casa/Repository/OrganizationRepository.java index 1bfde6d..8b07cb3 100644 --- a/backend/src/main/java/com/example/casa/Repository/OrganizationRepository.java +++ b/backend/src/main/java/com/casa/Repository/OrganizationRepository.java @@ -1,10 +1,10 @@ -package com.example.casa.Repository; +package com.casa.Repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import com.example.casa.Model.Organization; +import com.casa.Model.Organization; public interface OrganizationRepository extends JpaRepository { diff --git a/backend/src/main/java/com/example/casa/Repository/RoleRepository.java b/backend/src/main/java/com/casa/Repository/RoleRepository.java similarity index 71% rename from backend/src/main/java/com/example/casa/Repository/RoleRepository.java rename to backend/src/main/java/com/casa/Repository/RoleRepository.java index 3a24227..4c843e9 100644 --- a/backend/src/main/java/com/example/casa/Repository/RoleRepository.java +++ b/backend/src/main/java/com/casa/Repository/RoleRepository.java @@ -1,8 +1,8 @@ -package com.example.casa.Repository; +package com.casa.Repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.example.casa.Model.Role; +import com.casa.Model.Role; public interface RoleRepository extends JpaRepository { diff --git a/backend/src/main/java/com/example/casa/Repository/UserRepository.java b/backend/src/main/java/com/casa/Repository/UserRepository.java similarity index 82% rename from backend/src/main/java/com/example/casa/Repository/UserRepository.java rename to backend/src/main/java/com/casa/Repository/UserRepository.java index 57468ef..f4efe71 100644 --- a/backend/src/main/java/com/example/casa/Repository/UserRepository.java +++ b/backend/src/main/java/com/casa/Repository/UserRepository.java @@ -1,11 +1,11 @@ -package com.example.casa.Repository; +package com.casa.Repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.casa.Model.User; +import com.casa.Model.User; @Repository public interface UserRepository extends JpaRepository { diff --git a/backend/src/main/java/com/example/casa/Security/CurrentUser.java b/backend/src/main/java/com/casa/Security/CurrentUser.java similarity index 92% rename from backend/src/main/java/com/example/casa/Security/CurrentUser.java rename to backend/src/main/java/com/casa/Security/CurrentUser.java index a0e30d6..8aaa97d 100644 --- a/backend/src/main/java/com/example/casa/Security/CurrentUser.java +++ b/backend/src/main/java/com/casa/Security/CurrentUser.java @@ -1,4 +1,4 @@ -package com.example.casa.Security; +package com.casa.Security; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/backend/src/main/java/com/example/casa/Security/CustomUserDetailsService.java b/backend/src/main/java/com/casa/Security/CustomUserDetailsService.java similarity index 89% rename from backend/src/main/java/com/example/casa/Security/CustomUserDetailsService.java rename to backend/src/main/java/com/casa/Security/CustomUserDetailsService.java index fc5cbf3..efaa1d7 100644 --- a/backend/src/main/java/com/example/casa/Security/CustomUserDetailsService.java +++ b/backend/src/main/java/com/casa/Security/CustomUserDetailsService.java @@ -1,4 +1,4 @@ -package com.example.casa.Security; +package com.casa.Security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; @@ -7,8 +7,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.example.casa.Model.User; -import com.example.casa.Repository.UserRepository; +import com.casa.Model.User; +import com.casa.Repository.UserRepository; @Service public class CustomUserDetailsService implements UserDetailsService { diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/CustomOAuth2UserService.java b/backend/src/main/java/com/casa/Security/OAuth/CustomOAuth2UserService.java similarity index 88% rename from backend/src/main/java/com/example/casa/Security/OAuth/CustomOAuth2UserService.java rename to backend/src/main/java/com/casa/Security/OAuth/CustomOAuth2UserService.java index 73bc766..361b9fa 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/CustomOAuth2UserService.java +++ b/backend/src/main/java/com/casa/Security/OAuth/CustomOAuth2UserService.java @@ -1,4 +1,4 @@ -package com.example.casa.Security.OAuth; +package com.casa.Security.OAuth; import java.util.Optional; @@ -12,13 +12,13 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.example.casa.Exception.OAuth2AuthenticationProcessingException; -import com.example.casa.Model.AuthProvider; -import com.example.casa.Model.User; -import com.example.casa.Repository.UserRepository; -import com.example.casa.Security.OAuth.UserOAuth.OAuth2UserInfo; -import com.example.casa.Security.OAuth.UserOAuth.OAuth2UserInfoFactory; -import com.example.casa.Security.UserPrincipal; +import com.casa.Exception.OAuth2AuthenticationProcessingException; +import com.casa.Model.AuthProvider; +import com.casa.Model.User; +import com.casa.Repository.UserRepository; +import com.casa.Security.OAuth.UserOAuth.OAuth2UserInfo; +import com.casa.Security.OAuth.UserOAuth.OAuth2UserInfoFactory; +import com.casa.Security.UserPrincipal; @Service public class CustomOAuth2UserService extends DefaultOAuth2UserService { diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/HttpCookieOAuth2AuthorizationRequestRepository.java b/backend/src/main/java/com/casa/Security/OAuth/HttpCookieOAuth2AuthorizationRequestRepository.java similarity index 96% rename from backend/src/main/java/com/example/casa/Security/OAuth/HttpCookieOAuth2AuthorizationRequestRepository.java rename to backend/src/main/java/com/casa/Security/OAuth/HttpCookieOAuth2AuthorizationRequestRepository.java index 97fbac2..653a651 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/HttpCookieOAuth2AuthorizationRequestRepository.java +++ b/backend/src/main/java/com/casa/Security/OAuth/HttpCookieOAuth2AuthorizationRequestRepository.java @@ -1,10 +1,10 @@ -package com.example.casa.Security.OAuth; +package com.casa.Security.OAuth; import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository; import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; import org.springframework.stereotype.Component; -import com.example.casa.Util.CookieUtils; +import com.casa.Util.CookieUtils; import com.nimbusds.oauth2.sdk.util.StringUtils; import jakarta.servlet.http.HttpServletRequest; diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/OAuth2AuthenticationFailureHandler.java b/backend/src/main/java/com/casa/Security/OAuth/OAuth2AuthenticationFailureHandler.java similarity index 87% rename from backend/src/main/java/com/example/casa/Security/OAuth/OAuth2AuthenticationFailureHandler.java rename to backend/src/main/java/com/casa/Security/OAuth/OAuth2AuthenticationFailureHandler.java index 32def70..8d76253 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/OAuth2AuthenticationFailureHandler.java +++ b/backend/src/main/java/com/casa/Security/OAuth/OAuth2AuthenticationFailureHandler.java @@ -1,4 +1,4 @@ -package com.example.casa.Security.OAuth; +package com.casa.Security.OAuth; import java.io.IOException; @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; -import static com.example.casa.Security.OAuth.HttpCookieOAuth2AuthorizationRequestRepository.REDIRECT_URI_PARAM_COOKIE_NAME; -import com.example.casa.Util.CookieUtils; +import static com.casa.Security.OAuth.HttpCookieOAuth2AuthorizationRequestRepository.REDIRECT_URI_PARAM_COOKIE_NAME; +import com.casa.Util.CookieUtils; import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/OAuth2AuthenticationSuccessHandler.java b/backend/src/main/java/com/casa/Security/OAuth/OAuth2AuthenticationSuccessHandler.java similarity index 90% rename from backend/src/main/java/com/example/casa/Security/OAuth/OAuth2AuthenticationSuccessHandler.java rename to backend/src/main/java/com/casa/Security/OAuth/OAuth2AuthenticationSuccessHandler.java index 06ea942..40d60e7 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/OAuth2AuthenticationSuccessHandler.java +++ b/backend/src/main/java/com/casa/Security/OAuth/OAuth2AuthenticationSuccessHandler.java @@ -1,4 +1,4 @@ -package com.example.casa.Security.OAuth; +package com.casa.Security.OAuth; import java.io.IOException; import java.net.URI; @@ -9,11 +9,11 @@ import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; -import com.example.casa.Config.AppProperties; -import com.example.casa.Exception.BadRequestException; -import static com.example.casa.Security.OAuth.HttpCookieOAuth2AuthorizationRequestRepository.REDIRECT_URI_PARAM_COOKIE_NAME; -import com.example.casa.Security.TokenProvider; -import com.example.casa.Util.CookieUtils; +import com.casa.Config.AppProperties; +import com.casa.Exception.BadRequestException; +import static com.casa.Security.OAuth.HttpCookieOAuth2AuthorizationRequestRepository.REDIRECT_URI_PARAM_COOKIE_NAME; +import com.casa.Security.TokenProvider; +import com.casa.Util.CookieUtils; import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/GoogleOAuth2UserInfo.java b/backend/src/main/java/com/casa/Security/OAuth/UserOAuth/GoogleOAuth2UserInfo.java similarity index 92% rename from backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/GoogleOAuth2UserInfo.java rename to backend/src/main/java/com/casa/Security/OAuth/UserOAuth/GoogleOAuth2UserInfo.java index 8a24b86..475d24c 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/GoogleOAuth2UserInfo.java +++ b/backend/src/main/java/com/casa/Security/OAuth/UserOAuth/GoogleOAuth2UserInfo.java @@ -1,4 +1,4 @@ -package com.example.casa.Security.OAuth.UserOAuth; +package com.casa.Security.OAuth.UserOAuth; import java.util.Map; diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/OAuth2UserInfo.java b/backend/src/main/java/com/casa/Security/OAuth/UserOAuth/OAuth2UserInfo.java similarity index 90% rename from backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/OAuth2UserInfo.java rename to backend/src/main/java/com/casa/Security/OAuth/UserOAuth/OAuth2UserInfo.java index 510b88d..0ea66fb 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/OAuth2UserInfo.java +++ b/backend/src/main/java/com/casa/Security/OAuth/UserOAuth/OAuth2UserInfo.java @@ -1,4 +1,4 @@ -package com.example.casa.Security.OAuth.UserOAuth; +package com.casa.Security.OAuth.UserOAuth; import java.util.Map; diff --git a/backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/OAuth2UserInfoFactory.java b/backend/src/main/java/com/casa/Security/OAuth/UserOAuth/OAuth2UserInfoFactory.java similarity index 71% rename from backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/OAuth2UserInfoFactory.java rename to backend/src/main/java/com/casa/Security/OAuth/UserOAuth/OAuth2UserInfoFactory.java index 0308c87..8e20773 100644 --- a/backend/src/main/java/com/example/casa/Security/OAuth/UserOAuth/OAuth2UserInfoFactory.java +++ b/backend/src/main/java/com/casa/Security/OAuth/UserOAuth/OAuth2UserInfoFactory.java @@ -1,9 +1,9 @@ -package com.example.casa.Security.OAuth.UserOAuth; +package com.casa.Security.OAuth.UserOAuth; import java.util.Map; -import com.example.casa.Exception.OAuth2AuthenticationProcessingException; -import com.example.casa.Model.AuthProvider; +import com.casa.Exception.OAuth2AuthenticationProcessingException; +import com.casa.Model.AuthProvider; public class OAuth2UserInfoFactory { diff --git a/backend/src/main/java/com/example/casa/Security/RestAuthenticationEntryPoint.java b/backend/src/main/java/com/casa/Security/RestAuthenticationEntryPoint.java similarity index 96% rename from backend/src/main/java/com/example/casa/Security/RestAuthenticationEntryPoint.java rename to backend/src/main/java/com/casa/Security/RestAuthenticationEntryPoint.java index d4c9a8c..07ef7a3 100644 --- a/backend/src/main/java/com/example/casa/Security/RestAuthenticationEntryPoint.java +++ b/backend/src/main/java/com/casa/Security/RestAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.example.casa.Security; +package com.casa.Security; import java.io.IOException; diff --git a/backend/src/main/java/com/example/casa/Security/TokenAuthenticationFilter.java b/backend/src/main/java/com/casa/Security/TokenAuthenticationFilter.java similarity index 98% rename from backend/src/main/java/com/example/casa/Security/TokenAuthenticationFilter.java rename to backend/src/main/java/com/casa/Security/TokenAuthenticationFilter.java index c2aa0b7..aa93df6 100644 --- a/backend/src/main/java/com/example/casa/Security/TokenAuthenticationFilter.java +++ b/backend/src/main/java/com/casa/Security/TokenAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.example.casa.Security; +package com.casa.Security; import java.io.IOException; import java.util.UUID; diff --git a/backend/src/main/java/com/example/casa/Security/TokenProvider.java b/backend/src/main/java/com/casa/Security/TokenProvider.java similarity index 96% rename from backend/src/main/java/com/example/casa/Security/TokenProvider.java rename to backend/src/main/java/com/casa/Security/TokenProvider.java index df29b13..4234465 100644 --- a/backend/src/main/java/com/example/casa/Security/TokenProvider.java +++ b/backend/src/main/java/com/casa/Security/TokenProvider.java @@ -1,4 +1,4 @@ -package com.example.casa.Security; +package com.casa.Security; import java.util.Date; import java.util.UUID; @@ -8,7 +8,7 @@ import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; -import com.example.casa.Config.AppProperties; +import com.casa.Config.AppProperties; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; diff --git a/backend/src/main/java/com/example/casa/Security/UserPrincipal.java b/backend/src/main/java/com/casa/Security/UserPrincipal.java similarity index 96% rename from backend/src/main/java/com/example/casa/Security/UserPrincipal.java rename to backend/src/main/java/com/casa/Security/UserPrincipal.java index ccb9cde..919bbff 100644 --- a/backend/src/main/java/com/example/casa/Security/UserPrincipal.java +++ b/backend/src/main/java/com/casa/Security/UserPrincipal.java @@ -1,4 +1,4 @@ -package com.example.casa.Security; +package com.casa.Security; import java.util.Collection; import java.util.Collections; @@ -10,7 +10,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.oauth2.core.user.OAuth2User; -import com.example.casa.Model.User; +import com.casa.Model.User; public class UserPrincipal implements OAuth2User, UserDetails { diff --git a/backend/src/main/java/com/example/casa/Service/EmailService.java b/backend/src/main/java/com/casa/Service/EmailService.java similarity index 94% rename from backend/src/main/java/com/example/casa/Service/EmailService.java rename to backend/src/main/java/com/casa/Service/EmailService.java index d8fe7d5..691f399 100644 --- a/backend/src/main/java/com/example/casa/Service/EmailService.java +++ b/backend/src/main/java/com/casa/Service/EmailService.java @@ -1,4 +1,4 @@ -package com.example.casa.Service; +package com.casa.Service; import java.util.logging.Logger; @@ -11,8 +11,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; -import com.example.casa.Payload.EmailDetails; -import com.example.casa.Repository.UserRepository; +import com.casa.Payload.EmailDetails; +import com.casa.Repository.UserRepository; import jakarta.mail.internet.MimeMessage; diff --git a/backend/src/main/java/com/example/casa/Util/CookieUtils.java b/backend/src/main/java/com/casa/Util/CookieUtils.java similarity index 98% rename from backend/src/main/java/com/example/casa/Util/CookieUtils.java rename to backend/src/main/java/com/casa/Util/CookieUtils.java index 87f7811..f1691e4 100644 --- a/backend/src/main/java/com/example/casa/Util/CookieUtils.java +++ b/backend/src/main/java/com/casa/Util/CookieUtils.java @@ -1,4 +1,4 @@ -package com.example.casa.Util; +package com.casa.Util; import java.util.Base64; import java.util.Optional; diff --git a/backend/src/main/java/com/example/casa/Util/DateConverter.java b/backend/src/main/java/com/casa/Util/DateConverter.java similarity index 97% rename from backend/src/main/java/com/example/casa/Util/DateConverter.java rename to backend/src/main/java/com/casa/Util/DateConverter.java index c86fdb4..4cfcd96 100644 --- a/backend/src/main/java/com/example/casa/Util/DateConverter.java +++ b/backend/src/main/java/com/casa/Util/DateConverter.java @@ -1,4 +1,4 @@ -package com.example.casa.Util; +package com.casa.Util; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 79dea8a..8ae4ab6 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -21,3 +21,7 @@ spring.output.ansi.enabled=DETECT app.auth.tokenSecret=04ca023b39512e46d0c2cf4b48d5aac61d34302994c87ed4eff225dcf3b0a218739f3897051a057f9b846a69ea2927a587044164b7bae5e1306219d50b588cb1 app.auth.tokenExpirationMsec=3600000 +logging.file.name=logs/logging.file + +logging.level.root=warn +logging.level.com.casa=debug diff --git a/backend/src/test/java/com/example/casa/API/AuthControllerIntegrationTest.java b/backend/src/test/java/com/casa/API/AuthControllerIntegrationTest.java similarity index 95% rename from backend/src/test/java/com/example/casa/API/AuthControllerIntegrationTest.java rename to backend/src/test/java/com/casa/API/AuthControllerIntegrationTest.java index f2a45ba..568263f 100644 --- a/backend/src/test/java/com/example/casa/API/AuthControllerIntegrationTest.java +++ b/backend/src/test/java/com/casa/API/AuthControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package com.example.casa.API; +package com.casa.API; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -16,9 +16,9 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.transaction.annotation.Transactional; -import com.example.casa.Payload.User.AuthResponse; -import com.example.casa.Payload.User.LoginRequest; -import com.example.casa.Payload.User.SignUpRequest; +import com.casa.Payload.User.AuthResponse; +import com.casa.Payload.User.LoginRequest; +import com.casa.Payload.User.SignUpRequest; import com.fasterxml.jackson.databind.ObjectMapper; @SpringBootTest diff --git a/backend/src/test/java/com/example/casa/API/EventTests.java b/backend/src/test/java/com/casa/API/EventTests.java similarity index 98% rename from backend/src/test/java/com/example/casa/API/EventTests.java rename to backend/src/test/java/com/casa/API/EventTests.java index 3de444e..f8eca56 100644 --- a/backend/src/test/java/com/example/casa/API/EventTests.java +++ b/backend/src/test/java/com/casa/API/EventTests.java @@ -1,4 +1,4 @@ -package com.example.casa.API; +package com.casa.API; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.hasSize; @@ -22,14 +22,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.springframework.transaction.annotation.Transactional; -import com.example.casa.Model.User; -import com.example.casa.Payload.Event.EventDto; -import com.example.casa.Payload.Organization.OrganizationDto; -import com.example.casa.Payload.User.AuthResponse; -import com.example.casa.Payload.User.LoginRequest; -import com.example.casa.Payload.User.SignUpRequest; -import com.example.casa.Repository.UserRepository; -import com.example.casa.Util.DateConverter; +import com.casa.Model.User; +import com.casa.Payload.Event.EventDto; +import com.casa.Payload.Organization.OrganizationDto; +import com.casa.Payload.User.AuthResponse; +import com.casa.Payload.User.LoginRequest; +import com.casa.Payload.User.SignUpRequest; +import com.casa.Repository.UserRepository; +import com.casa.Util.DateConverter; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletException; diff --git a/backend/src/test/java/com/example/casa/API/OrganizationTests.java b/backend/src/test/java/com/casa/API/OrganizationTests.java similarity index 97% rename from backend/src/test/java/com/example/casa/API/OrganizationTests.java rename to backend/src/test/java/com/casa/API/OrganizationTests.java index ce23ef8..eddf9af 100644 --- a/backend/src/test/java/com/example/casa/API/OrganizationTests.java +++ b/backend/src/test/java/com/casa/API/OrganizationTests.java @@ -1,4 +1,4 @@ -package com.example.casa.API; +package com.casa.API; import static org.hamcrest.Matchers.hasItems; import org.junit.jupiter.api.AfterAll; @@ -20,12 +20,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.springframework.transaction.annotation.Transactional; -import com.example.casa.Model.User; -import com.example.casa.Payload.Organization.OrganizationDto; -import com.example.casa.Payload.User.AuthResponse; -import com.example.casa.Payload.User.LoginRequest; -import com.example.casa.Payload.User.SignUpRequest; -import com.example.casa.Repository.UserRepository; +import com.casa.Model.User; +import com.casa.Payload.Organization.OrganizationDto; +import com.casa.Payload.User.AuthResponse; +import com.casa.Payload.User.LoginRequest; +import com.casa.Payload.User.SignUpRequest; +import com.casa.Repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletException; diff --git a/backend/src/test/java/com/example/casa/API/RoleTests.java b/backend/src/test/java/com/casa/API/RoleTests.java similarity index 97% rename from backend/src/test/java/com/example/casa/API/RoleTests.java rename to backend/src/test/java/com/casa/API/RoleTests.java index d79cea0..e55012e 100644 --- a/backend/src/test/java/com/example/casa/API/RoleTests.java +++ b/backend/src/test/java/com/casa/API/RoleTests.java @@ -1,4 +1,4 @@ -package com.example.casa.API; +package com.casa.API; import java.util.HashSet; @@ -23,16 +23,16 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.springframework.transaction.annotation.Transactional; -import com.example.casa.Model.Role; -import com.example.casa.Model.User; -import com.example.casa.Payload.Organization.OrganizationDto; -import com.example.casa.Payload.Role.RoleDto; -import com.example.casa.Payload.User.AuthResponse; -import com.example.casa.Payload.User.LoginRequest; -import com.example.casa.Payload.User.SignUpRequest; -import com.example.casa.Repository.RoleRepository; -import com.example.casa.Repository.UserRepository; -import com.example.casa.Repository.OrganizationRepository; +import com.casa.Model.Role; +import com.casa.Model.User; +import com.casa.Payload.Organization.OrganizationDto; +import com.casa.Payload.Role.RoleDto; +import com.casa.Payload.User.AuthResponse; +import com.casa.Payload.User.LoginRequest; +import com.casa.Payload.User.SignUpRequest; +import com.casa.Repository.RoleRepository; +import com.casa.Repository.UserRepository; +import com.casa.Repository.OrganizationRepository; import com.fasterxml.jackson.databind.ObjectMapper; @SpringBootTest diff --git a/backend/src/test/java/com/example/casa/API/UserTests.java b/backend/src/test/java/com/casa/API/UserTests.java similarity index 92% rename from backend/src/test/java/com/example/casa/API/UserTests.java rename to backend/src/test/java/com/casa/API/UserTests.java index a79d746..e874d13 100644 --- a/backend/src/test/java/com/example/casa/API/UserTests.java +++ b/backend/src/test/java/com/casa/API/UserTests.java @@ -1,4 +1,4 @@ -package com.example.casa.API; +package com.casa.API; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -17,11 +17,11 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.transaction.annotation.Transactional; -import com.example.casa.Model.User; -import com.example.casa.Payload.User.AuthResponse; -import com.example.casa.Payload.User.LoginRequest; -import com.example.casa.Payload.User.SignUpRequest; -import com.example.casa.Repository.UserRepository; +import com.casa.Model.User; +import com.casa.Payload.User.AuthResponse; +import com.casa.Payload.User.LoginRequest; +import com.casa.Payload.User.SignUpRequest; +import com.casa.Repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; @SpringBootTest diff --git a/backend/src/test/java/com/example/casa/CasaApplicationTests.java b/backend/src/test/java/com/casa/CasaApplicationTests.java similarity index 87% rename from backend/src/test/java/com/example/casa/CasaApplicationTests.java rename to backend/src/test/java/com/casa/CasaApplicationTests.java index 0e7e970..ce18835 100644 --- a/backend/src/test/java/com/example/casa/CasaApplicationTests.java +++ b/backend/src/test/java/com/casa/CasaApplicationTests.java @@ -1,4 +1,4 @@ -package com.example.casa; +package com.casa; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;