Clean up cruft and basic file logging setup

backend/.gitignore

@@ -34,6 +34,7 @@ build/
 
 ### Logs ###
 *.log
+logs/*
 
 ### maven ###
-.mvn/
+.mvn/

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

backend/pom.xml

@@ -68,7 +68,8 @@
  <dependency>
  <groupId>org.projectlombok</groupId>
  <artifactId>lombok</artifactId>
- <optional>true</optional>
+ <version>1.18.34</version>
+ <scope>provided</scope>
  </dependency>
  <dependency>
  <groupId>io.jsonwebtoken</groupId>
@@ -101,11 +102,6 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-validation</artifactId>
  </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <optional>true</optional>
- </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-mail</artifactId>

backend/src/main/java/com/example/casa/CasaApplication.java → backend/src/main/java/com/casa/CasaApplication.java

@@ -1,17 +1,20 @@
-package com.example.casa;
+package com.casa;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 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) {

backend/src/main/java/com/example/casa/Config/AppProperties.java → 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;

backend/src/main/java/com/example/casa/Config/CorsConfig.java → 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;

backend/src/main/java/com/example/casa/Config/EmailConfig.java → 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

backend/src/main/java/com/example/casa/Config/SecurityConfig.java → 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;
 

backend/src/main/java/com/example/casa/Controller/AuthController.java → 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;
 

backend/src/main/java/com/example/casa/Controller/EventController.java → 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 {

backend/src/main/java/com/example/casa/Controller/OrganizationController.java → 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 {

backend/src/main/java/com/example/casa/Controller/RoleController.java → 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 {

backend/src/main/java/com/example/casa/Controller/UserController.java → 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 {

backend/src/main/java/com/example/casa/Exception/BadRequestException.java → 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;

backend/src/main/java/com/example/casa/Exception/OAuth2AuthenticationProcessingException.java → 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;
 

backend/src/main/java/com/example/casa/Exception/ResourceNotFoundException.java → 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;

backend/src/main/java/com/example/casa/Model/AuthProvider.java → 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

backend/src/main/java/com/example/casa/Model/Event.java → 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;

backend/src/main/java/com/example/casa/Model/Organization.java → 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;

backend/src/main/java/com/example/casa/Model/Role.java → 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;

backend/src/main/java/com/example/casa/Model/User.java → 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;

backend/src/main/java/com/example/casa/Payload/ApiResponse.java → 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 {
 

backend/src/main/java/com/example/casa/Payload/EmailDetails.java → 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;
 

backend/src/main/java/com/example/casa/Payload/Event/CalendarResponse.java → 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 {
 

backend/src/main/java/com/example/casa/Payload/Event/EventDto.java → 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 {
 

backend/src/main/java/com/example/casa/Payload/Organization/OrganizationDto.java → 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 {
 

backend/src/main/java/com/example/casa/Payload/Organization/OrganizationWithRoles.java → 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 {
 

backend/src/main/java/com/example/casa/Payload/Role/RoleDto.java → 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;
 

backend/src/main/java/com/example/casa/Payload/User/AuthResponse.java → 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 {
 

backend/src/main/java/com/example/casa/Payload/User/LoginRequest.java → 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;

backend/src/main/java/com/example/casa/Payload/User/SignUpRequest.java → 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;