This PR introduces multiple enhancements and refactorings in the expense module:

.gitignore

@@ -31,3 +31,8 @@ build/
 
 ### VS Code ###
 .vscode/
+
+# Ignore .env file
+.env
+
+uploads/

Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:17-alpine
+WORKDIR /app
+COPY target/enterpriseexpensemanagementsystem-0.0.1-SNAPSHOT.jar trex-app.jar
+EXPOSE 8080
+CMD [ "java", "-jar", "trex-app.jar"]

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.4</version>
+		<version>3.3.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.team7</groupId>
@@ -34,7 +34,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -46,26 +45,20 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.mysql</groupId>
-			<artifactId>mysql-connector-j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<scope>annotationProcessor</scope>
+			<version>1.18.32</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>
 			<artifactId>modelmapper</artifactId>
-			<version>2.4.4</version> <!-- Check for the latest version -->
+			<version>2.4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -93,6 +86,29 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-mail</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.github.librepdf</groupId>
+			<artifactId>openpdf</artifactId>
+			<version>1.3.30</version>
+		</dependency>
+		<dependency>
+			<groupId>com.cloudinary</groupId>
+			<artifactId>cloudinary-http5</artifactId>
+			<version>2.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -101,7 +117,19 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>1.18.32</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
-
 </project>

src/main/java/com/team7/enterpriseexpensemanagementsystem/EnterpriseExpenseManagementSystemApplication.java

@@ -1,5 +1,6 @@
 package com.team7.enterpriseexpensemanagementsystem;
 
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

src/main/java/com/team7/enterpriseexpensemanagementsystem/cloudinary/CloudinaryConfig.java

@@ -0,0 +1,29 @@
+package com.team7.enterpriseexpensemanagementsystem.cloudinary;
+
+import com.cloudinary.Cloudinary;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Map;
+
+@Configuration
+@EnableConfigurationProperties(CloudinaryProperties.class)
+public class CloudinaryConfig {
+
+    private final CloudinaryProperties cloudinaryProperties;
+
+    public CloudinaryConfig(CloudinaryProperties cloudinaryProperties) {
+        this.cloudinaryProperties = cloudinaryProperties;
+    }
+
+    @Bean
+    public Cloudinary cloudinary() {
+        Map<String, Object> config = Map.of(
+                "cloud_name", cloudinaryProperties.cloudName(),
+                "api_key", cloudinaryProperties.apiKey(),
+                "api_secret", cloudinaryProperties.apiSecret(),
+                "secure", true);
+        return new Cloudinary(config);
+    }
+}

src/main/java/com/team7/enterpriseexpensemanagementsystem/cloudinary/CloudinaryProperties.java

@@ -0,0 +1,7 @@
+package com.team7.enterpriseexpensemanagementsystem.cloudinary;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "cloudinary")
+public record CloudinaryProperties(String cloudName, String apiKey, String apiSecret) {
+}

src/main/java/com/team7/enterpriseexpensemanagementsystem/config/AppConfig.java

@@ -1,13 +1,79 @@
 package com.team7.enterpriseexpensemanagementsystem.config;
 
+import com.team7.enterpriseexpensemanagementsystem.entity.Role;
+import com.team7.enterpriseexpensemanagementsystem.entity.Roles;
+import com.team7.enterpriseexpensemanagementsystem.entity.User;
+import com.team7.enterpriseexpensemanagementsystem.repository.RoleRepository;
+import com.team7.enterpriseexpensemanagementsystem.repository.UserRepository;
+import com.team7.enterpriseexpensemanagementsystem.service.UserService;
+import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+import java.util.Set;
 
 @Configuration
 public class AppConfig {
     @Bean
     public ModelMapper modelMapper() {
         return new ModelMapper();
     }
+    @Bean
+    public CommandLineRunner commandLineRunner(RoleRepository roleRepository,
+                                               UserRepository userRepository,
+                                               PasswordEncoder passwordEncoder) {
+        return args -> {
+
+            Role roleAdmin = roleRepository.findByRoleName(Roles.ROLE_ADMIN)
+                    .orElseGet(() -> {
+                        Role newUserRole = new Role(Roles.ROLE_ADMIN);
+                        return roleRepository.save(newUserRole);
+                    });
+            Role roleManager = roleRepository.findByRoleName(Roles.ROLE_MANAGER)
+                    .orElseGet(() -> {
+                        Role newUserRole = new Role(Roles.ROLE_MANAGER);
+                        return roleRepository.save(newUserRole);
+                    });
+            Role roleEmployee = roleRepository.findByRoleName(Roles.ROLE_EMPLOYEE)
+                    .orElseGet(() -> {
+                        Role newUserRole = new Role(Roles.ROLE_EMPLOYEE);
+                        return roleRepository.save(newUserRole);
+                    });
+
+            Set<Role> adminRoles = Set.of(roleAdmin, roleManager, roleEmployee);
+            Set<Role> managerRoles = Set.of(roleManager, roleEmployee);
+            Set<Role> employeeRoles = Set.of(roleEmployee);
+
+            if (!userRepository.existsByEmail("admin@gmail.com")) {
+                User admin = new User("admin", "admin@gmail.com", passwordEncoder.encode("admin"));
+                userRepository.save(admin);
+            }
+            if (!userRepository.existsByEmail("manager@gmail.com")) {
+                User admin = new User("manager", "manager@gmail.com", passwordEncoder.encode("manager"));
+                userRepository.save(admin);
+            }
+            if (!userRepository.existsByEmail("user@gmail.com")) {
+                User admin = new User("user", "user@gmail.com", passwordEncoder.encode("user"));
+                userRepository.save(admin);
+            }
+
+            userRepository.findByEmail("admin@gmail.com").ifPresent(admin -> {
+                admin.setRoles(adminRoles);
+                userRepository.save(admin);
+            });
+            userRepository.findByEmail("manager@gmail.com").ifPresent(manager -> {
+                manager.setRoles(managerRoles);
+                userRepository.save(manager);
+            });
+            userRepository.findByEmail("user@gmail.com").ifPresent(user -> {
+                user.setRoles(employeeRoles);
+                userRepository.save(user);
+            });
+        };
+    }
 }

src/main/java/com/team7/enterpriseexpensemanagementsystem/config/AppConstants.java

@@ -2,8 +2,9 @@
 
 public class AppConstants {
     public static final String PAGE_NUMBER = "0";
-    public static final String PAGE_SIZE = "5";
+    public static final String PAGE_SIZE = "10";
     public static final String DEFAULT_SORT_BY_CATEGORY = "id";
     public static final String DEFAULT_SORT_BY_EXPENSES = "id";
+    public static final String DEFAULT_SORT_BY_INVOICE = "id";
     public static final String SORT_DIR = "asc";
 }

src/main/java/com/team7/enterpriseexpensemanagementsystem/controller/AdminController.java

@@ -0,0 +1,77 @@
+package com.team7.enterpriseexpensemanagementsystem.controller;
+
+import com.team7.enterpriseexpensemanagementsystem.config.AppConstants;
+import com.team7.enterpriseexpensemanagementsystem.dto.InvoiceDTO;
+import com.team7.enterpriseexpensemanagementsystem.entity.AuditLog;
+import com.team7.enterpriseexpensemanagementsystem.payload.response.PagedResponse;
+import com.team7.enterpriseexpensemanagementsystem.service.AuditLogService;
+import com.team7.enterpriseexpensemanagementsystem.service.InvoiceService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+
+@RestController
+@RequestMapping("/api/admin")
+@RequiredArgsConstructor
+public class AdminController {
+    private final AuditLogService auditLogService;
+    private final InvoiceService invoiceService;
+
+    @GetMapping("/audit-log")
+    public ResponseEntity<PagedResponse<AuditLog>> getAuditLogs(
+            @RequestParam(name = "auditId", required = false) Long auditId,
+            @RequestParam(name = "entityName", required = false) String entityName,
+            @RequestParam(name = "entityId", required = false) Long entityId,
+            @RequestParam(name = "deviceIp", required = false) String deviceIp,
+            @RequestParam(name = "action", required = false) String action,
+            @RequestParam(name = "performedBy", required = false) String performedBy,
+            @RequestParam(name = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
+            @RequestParam(name = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
+            @RequestParam(name = "pageNumber", defaultValue = AppConstants.PAGE_NUMBER, required = false) Integer pageNumber,
+            @RequestParam(name = "pageSize", defaultValue = AppConstants.PAGE_SIZE, required = false) Integer pageSize,
+            @RequestParam(name = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY_EXPENSES, required = false) String sortBy,
+            @RequestParam(name = "sortOrder", defaultValue = AppConstants.SORT_DIR, required = false) String sortOrder
+    ){
+        return ResponseEntity.ok(auditLogService.findAll(auditId, entityName, entityId, deviceIp, action, performedBy,
+                startDate, endDate, pageNumber, pageSize, sortBy, sortOrder));
+    }
+
+    @GetMapping("/users/invoice")
+    public ResponseEntity<PagedResponse<InvoiceDTO>> getAllInvoices(
+            @RequestParam(name = "userId", required = false) Long userId,
+            @RequestParam(name = "email",  required = false) String email,
+            @RequestParam(name = "invoiceNumber",  required = false) String invoiceNumber,
+            @RequestParam(name = "status",  required = false) String status,
+            @RequestParam(name = "pageNumber", defaultValue = AppConstants.PAGE_NUMBER, required = false) Integer pageNumber,
+            @RequestParam(name = "pageSize", defaultValue = AppConstants.PAGE_SIZE, required = false) Integer pageSize,
+            @RequestParam(name = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY_INVOICE, required = false) String sortBy,
+            @RequestParam(name = "sortOrder", defaultValue = AppConstants.SORT_DIR, required = false) String sortOrder
+
+    ) {
+        return ResponseEntity.ok(invoiceService
+                .findAllInvoices(userId, email, invoiceNumber,status, pageNumber, pageSize, sortBy, sortOrder));
+    }
+
+    @GetMapping("/invoice/mail")
+    public ResponseEntity<String> sendInvoice(@RequestParam(required = false) Long userId,
+                                              @RequestParam Long invoiceId) {
+        invoiceService.sendInvoice(userId, invoiceId);
+        return ResponseEntity.ok("Mail Sent!");
+    }
+
+    @GetMapping("/invoice/generate/{userId}")
+    public ResponseEntity<Void> generateInvoice(@PathVariable Long userId) {
+        invoiceService.generateInvoice(userId);
+        return ResponseEntity.noContent().build();
+    }
+
+    @DeleteMapping("/invoice/delete/{invoiceId}")
+    public ResponseEntity<String> deleteInvoice(@PathVariable Long invoiceId) {
+        invoiceService.deleteInvoice(invoiceId);
+        return ResponseEntity.ok("Invoice Deleted!");
+    }
+
+}

src/main/java/com/team7/enterpriseexpensemanagementsystem/controller/AnalyticsController.java

@@ -0,0 +1,55 @@
+package com.team7.enterpriseexpensemanagementsystem.controller;
+
+import com.team7.enterpriseexpensemanagementsystem.dto.*;
+import com.team7.enterpriseexpensemanagementsystem.service.ExpenseService;
+import com.team7.enterpriseexpensemanagementsystem.utils.AuthUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/analytics")
+@RequiredArgsConstructor
+public class AnalyticsController {
+    private final AuthUtils authUtils;
+    private final ExpenseService expenseService;
+
+    @GetMapping("/monthly")
+    public ResponseEntity<List<MonthlyExpenseDTO>> getMonthlyExpenses(
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate
+    ) {
+        return ResponseEntity.ok(expenseService.getMonthlyAnalytics(authUtils.loggedInUser().getId(), startDate, endDate));
+    }
+
+    @GetMapping("/weekly")
+    public ResponseEntity<List<WeeklyExpenseDTO>> getMonthlyExpenses() {
+        return ResponseEntity.ok(expenseService.getWeeklyAnalytics());
+    }
+
+    @GetMapping("/category")
+    public ResponseEntity<List<CategoryExpenseDTO>> getCategoryExpenses(
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) {
+        return ResponseEntity.ok(expenseService.getCategoryAnalytics(authUtils.loggedInUser().getId(), startDate, endDate));
+    }
+
+    @GetMapping("/status")
+    public ResponseEntity<List<StatusExpenseDTO>> getStatusExpenses(
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
+            @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) {
+        return ResponseEntity.ok(expenseService.getStatusAnalytics(authUtils.loggedInUser().getId(), startDate, endDate));
+    }
+    @GetMapping("/summary")
+    public ResponseEntity<SummaryDTO> getSummary() {
+        SummaryDTO summary = expenseService.getSummary(authUtils.loggedInUser().getId());
+        return ResponseEntity.ok(summary);
+    }
+}