Merged
Conversation
* chore: create base structure for models, services, repositories, and controllers * chore: fix docker and docker compose files * feat: added courier analytics endpoints * refactor: add parameter names to @RequestParam * refactor: restructure code with projections, updated service logic
* chore: create base structure for models, services, repositories, and controllers * chore: fix docker and docker compose files * fix: correct endpoint paths --------- Co-authored-by: Abdulrahman Fahmy <abdulrhmanabotor@gmail.com>
* chore: create base structure for models, services, repositories, and controllers * chore: fix docker and docker compose files * feat: added courier analytics endpoints * refactor: add parameter names to @RequestParam * refactor: restructure code with projections, updated service logic * feat: add DateRangeRequest DTO with cross-field validation * chore: add swagger api docs * chore: add swagger docs for courier endpoints
* chore: fix code style issues * fix: uncommented and restored SQL query in CourierRepository * fix: remove final from run method in datasbase seeder
* feat: added order reports * fix: fix lint issues * fix: fix order linter errors * fix: fix lint issues * fix: fix lint issues remaining some problematic issues * fix: fix lint issues * refactor: adhering to conventions
* feat: add customer and inventory endpoints - /customers/top-spenders for customer spending analysis - /inventory/low-stock for threshold monitoring - /inventory/value/by-category for category-wise valuation * feat: add validation on the dtos featL add swagger docs * fix: check style
* feat: Implement fulfillment time reports API * fix: Resolve lint errors * Fix: FulfillmentAnalyticsService and repository integration * refactor: update FulfillmentReportController to use FulfillmentRequestDTO and improve error handling for groupBy values * refactor: created seperate request dtos for fulfillment endpoints --------- Co-authored-by: Mohamed <mohamedkhaled3082@gmail.com>
* chore: setup & eventhandler * chore: setup & eventhandler * chore: models * chore(setup):docker * feat: revenue summary * feat: revenue/by-category & products/top-sellers * fix: naming convention fix and validation util * chore: pom.xml * chore: merge with dev * test: getTopSellers, getRevenueSummary, getRevenueByCategory * tests(RevenueReportServiceIntegrationTest): integration test * tests(RevenueReportServiceIntegrationTest): integration test * tests(ProductAnalyticsServiceIntegrationTest): still 3 fails * tests(ProductAnalyticsServiceIntegrationTest): all pass * fix: dtos validation and docs * fix: remove shema.sql * fix: sql query error in findRevenueSummary * fix: use dto in ProductReportController * style: clean up code formatting and remove redundant comments - Remove trailing whitespace and ensure consistent newline endings - Remove redundant comments in RevenueSummaryRequest and ErrorResponse * Update pom.xml * Update pom.xml * refactor: clean up code formatting and remove unused files Removed unused repositories, models, and utility files. Cleaned up code formatting in multiple files, including fixing indentation, removing redundant imports, and ensuring consistent spacing. Commented out test file for future reference. These changes improve code maintainability and readability without altering functionality. * style: fix char count Adjust indentation in RevenueReportService and OrderRepository to maintain consistent code style * style(repository): standardize SQL keyword case in OrderRepository Ensure consistent use of uppercase for SQL keywords (e.g., SELECT, FROM, WHERE) to improve code readability and maintainability. * refactor(repositories): convert multi-line SQL queries to single-line format * chore: apply @ValidDateRange and pass attributes directly to service * chore: clean up and deduplicate Maven dependencies --------- Co-authored-by: Mohamed <mohamedkhaled3082@gmail.com>
* test: add unit and integration tests for courier analytics * test: Configure in-memory H2 for integration tests * chore: merge latest changes from dev branch
* feat: Implement profit by category report endpoint * refactor: Update controller annotations and enhance Order model with JPA annotations * refactor: update imports for consistency * refactor: update ProfitReportController to use ProfitByCategory with DateRangeRequest * refactor: enhance FulfillmentReportController with improved error handling and validation for request parameters * refactor: enhance ProfitReportController with request validation and error handling for profit data retrieval and add integration tests * refactor: simplify FulfillmentReportController and ProfitReportController by removing redundant error handling and enhancing request validation * chore: add H2 database dependency for testing and refactor FulfillmentReportControllerTest and ProfitReportControllerTest to use TestRestTemplate for HTTP requests --------- Co-authored-by: Mohamed <mohamedkhaled3082@gmail.com>
* refactor: added manual builder Required * added builder manually to all models Required * feat: added configuration for rabbit listeners employed command design pattern * refactor: changes ids from long to uuid added first command, fixed validation issues, and tests need fixing * feat: added listeners for users and inventory events * refactor: update entity IDs to UUID and enhance database seeding * WIP: Save progress before merge * fix: fix lint issue * feat: added order placed event * feat: added update order events --------- Co-authored-by: Mohamed Hassan <mohamedhassan2082002@hotmail.com> Co-authored-by: Mohamed <mohamedkhaled3082@gmail.com>
* refactor: added manual builder Required * added builder manually to all models Required * feat: added configuration for rabbit listeners employed command design pattern * refactor: changes ids from long to uuid added first command, fixed validation issues, and tests need fixing * feat: added listeners for users and inventory events * refactor: update entity IDs to UUID and enhance database seeding * WIP: Save progress before merge * fix: fix lint issue * feat: added order placed event * fix: use Local date time instead of local date in revenue queries --------- Co-authored-by: AhmadHoseiny <ahmadshahhat9898@gmail.com> Co-authored-by: Mohamed Hassan <mohamedhassan2082002@hotmail.com>
* refactor: added manual builder Required * added builder manually to all models Required * feat: added configuration for rabbit listeners employed command design pattern * refactor: changes ids from long to uuid added first command, fixed validation issues, and tests need fixing * feat: added listeners for users and inventory events * refactor: update entity IDs to UUID and enhance database seeding * WIP: Save progress before merge * fix: fix lint issue * chore: add logging for controller and services * fix: fix some queries --------- Co-authored-by: AhmadHoseiny <ahmadshahhat9898@gmail.com> Co-authored-by: Mohamed Hassan <mohamedhassan2082002@hotmail.com>
* test: create the controller tests for the inventory-analytics & customer-analytics endpoints * test: create the services tests for the inventory-analytics & customer-analytics endpoints * fix: lint * fix: query syntax
* feat: add the cron jobs to remove the orders monthly * feat: add the cron jobs to remove the orders monthly
abdulrhman500
approved these changes
May 21, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.