Skip to content

Group1 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mohamed-Khaled308 merged 30 commits into from
May 15, 2025
Merged

Group1 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4ff51b0
chore: setup & eventhandler
abdulrhman500 May 2, 2025
980a3c6
chore: setup & eventhandler
abdulrhman500 May 2, 2025
38a7831
chore: models
abdulrhman500 May 2, 2025
9b32eb0
chore(setup):docker
abdulrhman500 May 2, 2025
565b7e6
Merge branch 'dev' of https://github.com/Podzilla/erp into dev
abdulrhman500 May 3, 2025
b5c4784
feat: revenue summary
abdulrhman500 May 3, 2025
ddc54ae
feat: revenue/by-category & products/top-sellers
abdulrhman500 May 3, 2025
2ba847d
fix: naming convention fix and validation util
abdulrhman500 May 3, 2025
ac9ff42
chore: pom.xml
abdulrhman500 May 10, 2025
5e61acd
chore: merge with dev to keep up
abdulrhman500 May 10, 2025
a465876
chore: merge with dev
abdulrhman500 May 10, 2025
001b26d
test: getTopSellers, getRevenueSummary, getRevenueByCategory
abdulrhman500 May 10, 2025
e34ea98
tests(RevenueReportServiceIntegrationTest): integration test
abdulrhman500 May 10, 2025
22cc53a
tests(RevenueReportServiceIntegrationTest): integration test
abdulrhman500 May 10, 2025
3b9e169
tests(ProductAnalyticsServiceIntegrationTest): still 3 fails
abdulrhman500 May 10, 2025
0111e27
tests(ProductAnalyticsServiceIntegrationTest): all pass
abdulrhman500 May 10, 2025
ae8d8e1
fix: dtos validation and docs
abdulrhman500 May 14, 2025
c8abd0b
fix: remove shema.sql
abdulrhman500 May 14, 2025
626eaad
fix: sql query error in findRevenueSummary
abdulrhman500 May 14, 2025
3877db1
fix: use dto in ProductReportController
abdulrhman500 May 14, 2025
f5e689f
style: clean up code formatting and remove redundant comments
abdulrhman500 May 14, 2025
18444c6
Merge branch 'dev' into group1
abdulrhman500 May 14, 2025
8a0e626
Update pom.xml
abdulrhman500 May 14, 2025
4544778
Update pom.xml
abdulrhman500 May 14, 2025
f38175f
refactor: clean up code formatting and remove unused files
abdulrhman500 May 14, 2025
0b77490
style: fix char count
abdulrhman500 May 14, 2025
79db849
style(repository): standardize SQL keyword case in OrderRepository
abdulrhman500 May 14, 2025
ada0d5c
refactor(repositories): convert multi-line SQL queries to single-line…
abdulrhman500 May 14, 2025
7000463
chore: apply @ValidDateRange and pass attributes directly to service
Mohamed-Khaled308 May 15, 2025
8f9c468
chore: clean up and deduplicate Maven dependencies
Mohamed-Khaled308 May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
363 changes: 363 additions & 0 deletions eclipse-java-formatter.xml
View file
Open in desktop

Large diffs are not rendered by default.

312 changes: 176 additions & 136 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,152 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.Podzilla</groupId>
<artifactId>analytics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>analytics</name>
<description>The Operational Analytics Service is an event-driven application designed to capture, process, and expose key operational data and derived insights from various upstream microservices (e.g., Warehouse, Courier, Order services). It acts as a centralized source of truth for historical operational events and their derived state, providing valuable analytics through a dedicated API</description>
<url/>
<licenses>
<license/>
</licenses>
<developers>
<developer/>
</developers>
<scm>
<connection/>
<developerConnection/>
<tag/>
<url/>
</scm>
<properties>
<java.version>23</java.version>
</properties>
<dependencies>
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>java-dotenv</artifactId>
<version>5.2.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
</dependency>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<groupId>com.Podzilla</groupId>
<artifactId>analytics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>analytics</name>
<description>The Operational Analytics Service is an event-driven application designed to capture, process, and expose key operational data and derived insights from various upstream microservices (e.g., Warehouse, Courier, Order services). It acts as a centralized source of truth for historical operational events and their derived state, providing valuable analytics through a dedicated API</description>

<properties>
<java.version>21</java.version>
</properties>

<dependencies>
<!-- Environment configuration -->
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>java-dotenv</artifactId>
<version>5.2.2</version>
</dependency>

<!-- Spring Boot Starters -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<!-- DevTools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>

<!-- PostgreSQL -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>

<!-- OpenAPI / Swagger -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
</dependency>

<!-- Internal Shared Utils -->
<dependency>
<groupId>com.github.Podzilla</groupId>
<artifactId>podzilla-utils-lib</artifactId>
<version>v1.1.5</version>
<version>v1.1.6</version>
</dependency>

<!-- Validation API & Implementation -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>8.0.1.Final</version>
<version>8.0.1.Final</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>


<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.0</version> <configuration>
<configLocation>config/checkstyle/sun_checks.xml</configLocation>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<configLocation>config/checkstyle/sun_checks.xml</configLocation>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
24 changes: 24 additions & 0 deletions src/main/java/com/Podzilla/analytics/api/controllers/ProductReportController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,38 @@
package com.Podzilla.analytics.api.controllers;

import java.util.List;

import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.Podzilla.analytics.api.dtos.product.TopSellerRequest;
import com.Podzilla.analytics.api.dtos.product.TopSellerResponse;
import com.Podzilla.analytics.services.ProductAnalyticsService;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
@RestController

@RequestMapping("/product-analytics")
public class ProductReportController {

private final ProductAnalyticsService productAnalyticsService;

@GetMapping("/top-sellers")
public ResponseEntity<List<TopSellerResponse>> getTopSellers(
@Valid @ModelAttribute final TopSellerRequest requestDTO) {

List<TopSellerResponse> topSellersList = productAnalyticsService
.getTopSellers(requestDTO.getStartDate(),
requestDTO.getEndDate(),
requestDTO.getLimit(),
requestDTO.getSortBy());

return ResponseEntity.ok(topSellersList);
}
}
Loading