feat: Add company to the codebase#24
Merged
Merged
Conversation
added 11 commits
April 10, 2026 18:17
|
Warning Rate limit exceeded
Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 2 minutes and 48 seconds. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (15)
📝 WalkthroughWalkthroughAdds a Company domain (entity, DTOs, mapper, repository, service, controller) with CRUD and join endpoints, connects Company to Driver/Vehicle/User entities, introduces COMPANY_ADMIN role and authorization changes, updates services/controllers to validate/set company associations, and adds related tests and data seeds. Changes
Sequence DiagramsequenceDiagram
actor Client
participant Controller as CompanyController
participant Service as CompanyService
participant CompRepo as CompanyRepository
participant UserRepo as UserRepository
participant DB as Database
Client->>Controller: POST /api/companies/{id}/join
activate Controller
Controller->>Service: joinCompany(id, principalName)
activate Service
Service->>CompRepo: findById(id)
activate CompRepo
CompRepo->>DB: SELECT company WHERE id=?
DB-->>CompRepo: CompanyEntity
CompRepo-->>Service: Optional<CompanyEntity>
deactivate CompRepo
Service->>UserRepo: findByEmail(principalName)
activate UserRepo
UserRepo->>DB: SELECT user WHERE email=?
DB-->>UserRepo: UserEntity
UserRepo-->>Service: Optional<UserEntity>
deactivate UserRepo
alt Company or User missing
Service-->>Controller: false
else Both exist
Service->>Service: user.setCompany(company)
Service->>Service: user.authorities.add(COMPANY_ADMIN)
Service->>UserRepo: save(user)
activate UserRepo
UserRepo->>DB: UPDATE user SET company_id=?, authorities=?
DB-->>UserRepo: OK
deactivate UserRepo
Service-->>Controller: true
end
deactivate Service
Controller-->>Client: 200 OK / 400 Bad Request
deactivate Controller
Estimated Code Review Effort🎯 4 (Complex) | ⏱️ ~60 minutes Possibly Related PRs
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 10
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@backend/src/main/java/com/angel/autonow/company/CompanyController.java`:
- Around line 43-47: The getCompanyById method in CompanyController currently
returns null when companyService.getCompanyById(id) is empty; change it to
return a 400 Bad Request instead by checking the Optional from
companyService.getCompanyById(id) and, if empty, throw a
ResponseStatusException(HttpStatus.BAD_REQUEST) (or change the method to return
ResponseEntity<CompanyResponseDTO> and return
ResponseEntity.badRequest().build()); update the getCompanyById signature and
imports accordingly so a missing company results in HTTP 400 rather than a 200
with null body.
- Around line 55-60: The update endpoint currently allows any user with role
COMPANY_ADMIN to update any company; modify CompanyService.updateCompany(...) to
enforce ownership: retrieve the authenticated principal/authorities (e.g. via
SecurityContextHolder) inside CompanyService.updateCompany(Long id,
CompanyRequestDTO request) and if the caller has role ADMIN allow the operation,
but if the caller has role COMPANY_ADMIN verify the principal's company id
equals the target id before proceeding (throw AccessDeniedException or return
Optional.empty() on mismatch); keep CompanyController.updateCompany(...) as-is
but ensure CompanyService.performing the check uses unique identifiers from the
authenticated user (e.g., getCompanyId or userId on the Principal/UserDetails)
so COMPANY_ADMIN can only update their own company.
In `@backend/src/main/java/com/angel/autonow/company/CompanyRequestDTO.java`:
- Line 27: CompanyRequestDTO is missing URL validation for the logoUrl field, so
invalid URLs are only rejected at persistence; add the same validation used on
CompanyEntity by annotating the logoUrl field in CompanyRequestDTO with the
appropriate `@URL` annotation (importing org.hibernate.validator.constraints.URL)
and any necessary `@Nullable/`@NotBlank per existing DTO semantics to match
CompanyEntity's behavior, ensuring validation occurs during request
binding/validation in methods that accept CompanyRequestDTO.
In `@backend/src/main/java/com/angel/autonow/company/CompanyService.java`:
- Around line 63-70: The deleteCompany method currently calls
companyRepository.deleteById(id) without handling dependent User, Vehicle, or
Driver records and will hit FK constraints or leave dangling refs; update
deleteCompany to first check for dependents (e.g., use
UserRepository.countByCompanyId(id), VehicleRepository.countByCompanyId(id),
DriverRepository.countByCompanyId(id)) and either block deletion (return false
or throw a clear exception) if any counts > 0, or perform safe cleanup (reassign
or nullify company_id via repository update methods) before calling
companyRepository.deleteById(id); ensure you reference deleteCompany,
companyRepository and the User/Vehicle/Driver repository methods when
implementing the chosen strategy.
- Around line 28-42: The joinCompany method updates UserEntity and persists the
new Role.COMPANY_ADMIN but does not update the caller's current JWT so the
session still lacks the new authority; modify the flow in joinCompany to either
(a) generate and return a fresh JWT containing the updated authorities after
userRepository.save(user) (reuse your existing JWT creation code/path used by
SecurityConfig), or (b) return a flag prompting the client to re-authenticate so
the client obtains a new token; ensure the returned response includes the new
token or explicit instruction, and reference joinCompany, UserEntity,
Role.COMPANY_ADMIN, userRepository, and SecurityConfig when wiring the token
re-issuance or re-auth path.
In `@backend/src/main/java/com/angel/autonow/driver/DriverController.java`:
- Line 27: The controller currently authorizes ROLE_COMPANY_ADMIN but does not
enforce that the caller's company owns the target resources; update
DriverController (and corresponding checks in DriverService) to fetch the
caller's company id from the security context (e.g., current principal / JWT)
and, for all endpoints that accept or resolve a companyId or driver id
(createDriver, listDrivers, getDriver/updateDriver/deleteDriver), compare that
caller company id to the target companyId or the driver's persisted companyId
and throw AccessDeniedException (or return 403) if they differ; add the same
guard inside DriverService methods that perform the actual persistence/lookup to
prevent bypass via direct service calls. Ensure you reference and validate
companyId from request body/path or loaded Driver entity before proceeding for
COMPANY_ADMIN callers only, while leaving ADMIN unchanged.
In `@backend/src/main/java/com/angel/autonow/vehicle/VehicleController.java`:
- Line 27: Controller methods in VehicleController (e.g., createVehicle,
listVehicles, updateVehicle, deleteVehicle) currently permit any COMPANY_ADMIN
to operate on arbitrary companyId/vehicle; add enforcement so non-ADMIN callers
can only act on their own company: retrieve the caller's companyId from the
security context (e.g., Authentication/Principal or a UserDetails service), and
before proceeding in each controller method validate that the request's
companyId (or the target vehicle's company owner fetched via VehicleService)
equals the caller's companyId; if not, throw AccessDeniedException (or return
403). Factor the check into a reusable method (e.g., verifyCompanyOwnership or
ensureCallerOwnsCompany) and call it from the controller endpoints and/or in
VehicleService methods that accept companyId or vehicleId so updates/deletes
also validate ownership. Ensure lookups for vehicleId resolve the vehicle's
companyId to validate ownership for update/delete operations.
In `@backend/src/main/java/com/angel/autonow/vehicle/VehicleRequestDTO.java`:
- Line 30: The VehicleRequestDTO currently allows null or non-positive
companyId; annotate the companyId field in class VehicleRequestDTO with
validation constraints (e.g., `@NotNull` and `@Positive` or `@Min`(1)) and add the
corresponding imports from javax.validation.constraints so invalid payloads fail
fast with 400s; also ensure the controller accepts the DTO with `@Valid` (if not
already) so the validation is enforced at the API boundary.
In `@backend/src/main/java/com/angel/autonow/vehicle/VehicleService.java`:
- Around line 20-32: The unit test still treats createVehicle(...) as returning
a VehicleResponseDTO instead of Optional<VehicleResponseDTO>; update the test in
VehicleServiceTest to unwrap the Optional before asserting fields (e.g., call
createVehicle(...), assert that the Optional is present, then use the contained
VehicleResponseDTO for result.id() and result.brand() assertions) or adjust
assertions to match Optional semantics; ensure you're referencing the
createVehicle method and checking Optional.isPresent() (or using
get()/orElseThrow()) before accessing DTO fields.
In `@backend/src/main/resources/data.sql`:
- Around line 39-43: The UPDATE statements currently target vehicle rows by
brand only (UPDATE vehicle ... WHERE brand IN (...) and WHERE brand =
'Mercedes'), which can misassign vehicles; modify these to use a deterministic
key such as brand plus model (e.g., WHERE brand = 'Toyota' AND model =
'Corolla') or the stable vehicle identifier (e.g., vehicle.vin or id) when
setting company_id for the company rows selected by email ('fleet@autonow.com'
and 'info@medtransport.bg'); update both occurrences (the UPDATE vehicle
statements) to use the deterministic predicate (brand+model or id/VIN) so
seeding is integrity-safe.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: c96ced95-ee3e-4282-bc59-7049ae7664a9
📒 Files selected for processing (25)
backend/src/main/java/com/angel/autonow/company/CompanyController.javabackend/src/main/java/com/angel/autonow/company/CompanyEntity.javabackend/src/main/java/com/angel/autonow/company/CompanyMapper.javabackend/src/main/java/com/angel/autonow/company/CompanyRepository.javabackend/src/main/java/com/angel/autonow/company/CompanyRequestDTO.javabackend/src/main/java/com/angel/autonow/company/CompanyResponseDTO.javabackend/src/main/java/com/angel/autonow/company/CompanyService.javabackend/src/main/java/com/angel/autonow/company/CompanyType.javabackend/src/main/java/com/angel/autonow/driver/DriverController.javabackend/src/main/java/com/angel/autonow/driver/DriverEntity.javabackend/src/main/java/com/angel/autonow/driver/DriverMapper.javabackend/src/main/java/com/angel/autonow/driver/DriverRepository.javabackend/src/main/java/com/angel/autonow/driver/DriverRequestDTO.javabackend/src/main/java/com/angel/autonow/driver/DriverResponseDTO.javabackend/src/main/java/com/angel/autonow/driver/DriverService.javabackend/src/main/java/com/angel/autonow/user/UserEntity.javabackend/src/main/java/com/angel/autonow/user/role/Role.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleController.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleEntity.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleMapper.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleRepository.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleRequestDTO.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleResponseDTO.javabackend/src/main/java/com/angel/autonow/vehicle/VehicleService.javabackend/src/main/resources/data.sql
There was a problem hiding this comment.
🧹 Nitpick comments (3)
backend/src/test/java/com/angel/autonow/vehicle/VehicleServiceTest.java (1)
27-29: Please add company-association tests forcreateVehicle/updateVehicle.With
CompanyRepositorynow part of the service dependency graph, this test class should also cover: (1) existing companyId attaches company and saves, and (2) missing companyId in DB returnsOptional.empty()(and avoids save where applicable).🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/test/java/com/angel/autonow/vehicle/VehicleServiceTest.java` around lines 27 - 29, Add two unit tests in VehicleServiceTest covering company association: mock CompanyRepository to return Optional.of(company) when companyId exists and assert that VehicleService.createVehicle and updateVehicle attach the returned Company to the Vehicle before saving and that vehicleRepository.save is invoked; then mock CompanyRepository to return Optional.empty() for a missing companyId and assert that createVehicle/updateVehicle return Optional.empty() (or propagate empty result) and that vehicleRepository.save is not called. Use the existing mocks for CompanyRepository, VehicleRepository, and the VehicleService methods (createVehicle/updateVehicle) and verify interactions with companyRepository.findById(...) and vehicleRepository.save(...) accordingly.backend/src/test/java/com/angel/autonow/driver/DriverServiceTest.java (1)
28-30: Add tests for the newcompanyIdbranch behavior increateDriver.Now that
CompanyRepositoryis injected, please cover both cases: validcompanyId(driver is saved with company) and missingcompanyIdin DB (Optional.empty()and no save). This is the new business path introduced inDriverServiceand currently unexercised here.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/test/java/com/angel/autonow/driver/DriverServiceTest.java` around lines 28 - 30, Add two unit tests in DriverServiceTest exercising the new companyId branch in DriverService.createDriver: (1) when companyRepository.findById(...) returns Optional.of(company) assert the returned/created Driver has its company set and verify driverRepository.save(...) was called with that Driver; (2) when companyRepository.findById(...) returns Optional.empty() assert that driverRepository.save(...) is not called (or appropriate behavior asserted) and no company is set. Use the existing `@Mock` CompanyRepository and mock its findById for both scenarios, invoke DriverService.createDriver(...), and use Mockito.verify on driverRepository to assert save interactions.backend/src/test/java/com/angel/autonow/data/TestData.java (1)
265-294: Consider extracting shared company fixture literals into constants.
name/address/phone/email/companyTypeare duplicated across three methods; centralizing them will reduce fixture drift.♻️ Suggested refactor
+ private static final String TEST_COMPANY_NAME = "Test Fleet Co"; + private static final String TEST_COMPANY_ADDRESS = "123 Test St"; + private static final String TEST_COMPANY_PHONE = "+1234567890"; + private static final String TEST_COMPANY_EMAIL = "test@fleet.com"; + private static final CompanyType TEST_COMPANY_TYPE = CompanyType.TAXI; + public static CompanyEntity createCompanyEntity() { return CompanyEntity.builder() - .name("Test Fleet Co") - .address("123 Test St") - .phone("+1234567890") - .email("test@fleet.com") - .companyType(CompanyType.TAXI) + .name(TEST_COMPANY_NAME) + .address(TEST_COMPANY_ADDRESS) + .phone(TEST_COMPANY_PHONE) + .email(TEST_COMPANY_EMAIL) + .companyType(TEST_COMPANY_TYPE) .build(); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/test/java/com/angel/autonow/data/TestData.java` around lines 265 - 294, The three company fixture methods (createCompanyEntity, createCompanyRequest, createCompanyResponse) duplicate the same literals; extract them into shared private static final constants (e.g., COMPANY_NAME, COMPANY_ADDRESS, COMPANY_PHONE, COMPANY_EMAIL, COMPANY_TYPE) declared at the top of the TestData class and update those methods to reference the constants instead of hard-coded strings/types so the fixture is centralized and prevents drift.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@backend/src/test/java/com/angel/autonow/data/TestData.java`:
- Around line 265-294: The three company fixture methods (createCompanyEntity,
createCompanyRequest, createCompanyResponse) duplicate the same literals;
extract them into shared private static final constants (e.g., COMPANY_NAME,
COMPANY_ADDRESS, COMPANY_PHONE, COMPANY_EMAIL, COMPANY_TYPE) declared at the top
of the TestData class and update those methods to reference the constants
instead of hard-coded strings/types so the fixture is centralized and prevents
drift.
In `@backend/src/test/java/com/angel/autonow/driver/DriverServiceTest.java`:
- Around line 28-30: Add two unit tests in DriverServiceTest exercising the new
companyId branch in DriverService.createDriver: (1) when
companyRepository.findById(...) returns Optional.of(company) assert the
returned/created Driver has its company set and verify
driverRepository.save(...) was called with that Driver; (2) when
companyRepository.findById(...) returns Optional.empty() assert that
driverRepository.save(...) is not called (or appropriate behavior asserted) and
no company is set. Use the existing `@Mock` CompanyRepository and mock its
findById for both scenarios, invoke DriverService.createDriver(...), and use
Mockito.verify on driverRepository to assert save interactions.
In `@backend/src/test/java/com/angel/autonow/vehicle/VehicleServiceTest.java`:
- Around line 27-29: Add two unit tests in VehicleServiceTest covering company
association: mock CompanyRepository to return Optional.of(company) when
companyId exists and assert that VehicleService.createVehicle and updateVehicle
attach the returned Company to the Vehicle before saving and that
vehicleRepository.save is invoked; then mock CompanyRepository to return
Optional.empty() for a missing companyId and assert that
createVehicle/updateVehicle return Optional.empty() (or propagate empty result)
and that vehicleRepository.save is not called. Use the existing mocks for
CompanyRepository, VehicleRepository, and the VehicleService methods
(createVehicle/updateVehicle) and verify interactions with
companyRepository.findById(...) and vehicleRepository.save(...) accordingly.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 9c5ded64-d511-4c17-ad54-a366fb03890c
📒 Files selected for processing (3)
backend/src/test/java/com/angel/autonow/data/TestData.javabackend/src/test/java/com/angel/autonow/driver/DriverServiceTest.javabackend/src/test/java/com/angel/autonow/vehicle/VehicleServiceTest.java
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (4)
backend/src/test/java/com/angel/autonow/company/CompanyControllerIT.java (2)
106-124: Missing success test forjoinCompanyendpoint.The join company tests only cover failure scenarios (company not found, guest forbidden, unauthenticated). Consider adding a success test that creates both a company and a user in the database, then verifies the join succeeds and the user is properly associated.
🧪 Suggested success test
`@Test` void joinCompany_success() throws Exception { var company = TestData.createCompanyEntity(); companyRepository.save(company); var user = UserEntity.builder() .email("joiner@test.com") .password("encodedPassword") .authorities(new HashSet<>(Set.of(Role.CUSTOMER.getAuthority()))) .build(); userRepository.save(user); mockMvc.perform(post("/api/companies/{id}/join", company.getId()) .with(jwt().jwt(j -> j.subject("joiner@test.com")) .authorities(new SimpleGrantedAuthority(Role.CUSTOMER.getAuthority())))) .andExpect(status().isOk()); // Verify user is now associated with company var updatedUser = userRepository.findByEmail("joiner@test.com").orElseThrow(); assertEquals(company.getId(), updatedUser.getCompany().getId()); assertTrue(updatedUser.getAuthorities().contains(Role.COMPANY_ADMIN.getAuthority())); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/test/java/com/angel/autonow/company/CompanyControllerIT.java` around lines 106 - 124, Add a positive integration test for the joinCompany flow: create and save a Company entity (using TestData.createCompanyEntity()/companyRepository.save) and a UserEntity with CUSTOMER authority (userRepository.save), perform mockMvc.post("/api/companies/{id}/join", company.getId()) with a JWT for that user's email and CUSTOMER authority, expect status().isOk(), then reload the user via userRepository.findByEmail(...) and assert the user's company id equals company.getId() and their authorities now include Role.COMPANY_ADMIN.getAuthority(); name the test joinCompany_success in CompanyControllerIT.
137-143: Returning 200 OK with empty body for not-found resource is unconventional.Standard REST semantics typically return
404 Not Foundwhen a resource doesn't exist. Returning200 OKwith an empty body can confuse API consumers. Consider updating the controller to return404for non-existent resources.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/test/java/com/angel/autonow/company/CompanyControllerIT.java` around lines 137 - 143, The test reveals the controller currently returns 200 with an empty body for a missing company; change the controller logic (CompanyController.getCompanyById) to return 404 Not Found when the service/repository cannot find the entity (e.g., when CompanyService.findById or repository.findById returns empty/Optional.empty), and update the integration test (CompanyControllerIT#getCompanyById_notFound_returnsOkEmpty) to expect status().isNotFound() instead of isOk(); ensure any exception mapping or ResponseEntity usage returns ResponseEntity.notFound() or throws a ResourceNotFoundException handled by a `@ControllerAdvice` to produce 404.backend/src/test/java/com/angel/autonow/company/CompanyServiceTest.java (1)
56-96: Consider adding test for user already belonging to a company.The tests cover company-not-found and user-not-found scenarios, but there's no test verifying behavior when a user who already belongs to a company attempts to join another. This edge case should be covered to document the expected behavior (whether it should succeed, fail, or require explicit handling).
🧪 Suggested additional test
`@Test` void joinCompany_userAlreadyInCompany_behaviorDocumented() { CompanyEntity existingCompany = CompanyEntity.builder().id(1L).build(); CompanyEntity newCompany = CompanyEntity.builder().id(2L).build(); UserEntity user = UserEntity.builder() .id(1L) .email("test@example.com") .authorities(new HashSet<>(Set.of(Role.COMPANY_ADMIN.getAuthority()))) .company(existingCompany) .build(); when(companyRepository.findById(2L)).thenReturn(Optional.of(newCompany)); when(userRepository.findByEmail("test@example.com")).thenReturn(Optional.of(user)); var result = companyService.joinCompany(2L, "test@example.com"); // Document expected behavior - currently allows silent switch assertTrue(result); assertEquals(newCompany, user.getCompany()); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/test/java/com/angel/autonow/company/CompanyServiceTest.java` around lines 56 - 96, Add a test covering the "user already belongs to a company" edge case: create existingCompany and newCompany (CompanyEntity), build a UserEntity with company(existingCompany) and authorities containing Role.COMPANY_ADMIN.getAuthority(), mock companyRepository.findById(newCompanyId) to return newCompany and userRepository.findByEmail(...) to return the user, call companyService.joinCompany(newCompanyId, email) and assert the documented behavior (e.g., if current behavior is to switch companies, assertTrue(result), assertEquals(newCompany, user.getCompany()) and verify(userRepository).save(user); if desired behavior is to refuse, assertFalse(result) and verify(userRepository, never()).save(any())).backend/src/main/java/com/angel/autonow/company/CompanyService.java (1)
21-26:createCompanyalways succeeds—Optionalwrapper provides no value.The method wraps the result in
Optional.of()unconditionally, so it can never returnOptional.empty(). Either remove theOptionalwrapper and returnCompanyResponseDTOdirectly, or add validation/failure conditions that would justify returning empty.♻️ Suggested simplification
- public Optional<CompanyResponseDTO> createCompany(CompanyRequestDTO request) { + public CompanyResponseDTO createCompany(CompanyRequestDTO request) { CompanyEntity company = companyMapper.toEntity(request); CompanyEntity saved = companyRepository.save(company); - return Optional.of(companyMapper.toDTO(saved)); + return companyMapper.toDTO(saved); }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@backend/src/main/java/com/angel/autonow/company/CompanyService.java` around lines 21 - 26, The createCompany method always returns Optional.of(...) so Optional.empty() is impossible; fix by either removing the Optional wrapper and changing the signature to return CompanyResponseDTO (update callers) or implement real failure/validation paths and return Optional.empty() when appropriate—e.g., validate the CompanyRequestDTO before mapping, check for save failures (use Optional.ofNullable(companyRepository.save(...)) or catch exceptions and return Optional.empty()), and keep companyMapper.toDTO(saved) for the success path; adjust the createCompany signature and any callers accordingly.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@backend/src/test/java/com/angel/autonow/company/CompanyControllerIT.java`:
- Line 12: Replace the malformed import for AutoConfigureMockMvc: locate the
import statement currently referencing
org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc and
change it to the correct Spring Boot package
org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc so
CompanyControllerIT compiles and uses the proper test annotation.
---
Nitpick comments:
In `@backend/src/main/java/com/angel/autonow/company/CompanyService.java`:
- Around line 21-26: The createCompany method always returns Optional.of(...) so
Optional.empty() is impossible; fix by either removing the Optional wrapper and
changing the signature to return CompanyResponseDTO (update callers) or
implement real failure/validation paths and return Optional.empty() when
appropriate—e.g., validate the CompanyRequestDTO before mapping, check for save
failures (use Optional.ofNullable(companyRepository.save(...)) or catch
exceptions and return Optional.empty()), and keep companyMapper.toDTO(saved) for
the success path; adjust the createCompany signature and any callers
accordingly.
In `@backend/src/test/java/com/angel/autonow/company/CompanyControllerIT.java`:
- Around line 106-124: Add a positive integration test for the joinCompany flow:
create and save a Company entity (using
TestData.createCompanyEntity()/companyRepository.save) and a UserEntity with
CUSTOMER authority (userRepository.save), perform
mockMvc.post("/api/companies/{id}/join", company.getId()) with a JWT for that
user's email and CUSTOMER authority, expect status().isOk(), then reload the
user via userRepository.findByEmail(...) and assert the user's company id equals
company.getId() and their authorities now include
Role.COMPANY_ADMIN.getAuthority(); name the test joinCompany_success in
CompanyControllerIT.
- Around line 137-143: The test reveals the controller currently returns 200
with an empty body for a missing company; change the controller logic
(CompanyController.getCompanyById) to return 404 Not Found when the
service/repository cannot find the entity (e.g., when CompanyService.findById or
repository.findById returns empty/Optional.empty), and update the integration
test (CompanyControllerIT#getCompanyById_notFound_returnsOkEmpty) to expect
status().isNotFound() instead of isOk(); ensure any exception mapping or
ResponseEntity usage returns ResponseEntity.notFound() or throws a
ResourceNotFoundException handled by a `@ControllerAdvice` to produce 404.
In `@backend/src/test/java/com/angel/autonow/company/CompanyServiceTest.java`:
- Around line 56-96: Add a test covering the "user already belongs to a company"
edge case: create existingCompany and newCompany (CompanyEntity), build a
UserEntity with company(existingCompany) and authorities containing
Role.COMPANY_ADMIN.getAuthority(), mock companyRepository.findById(newCompanyId)
to return newCompany and userRepository.findByEmail(...) to return the user,
call companyService.joinCompany(newCompanyId, email) and assert the documented
behavior (e.g., if current behavior is to switch companies, assertTrue(result),
assertEquals(newCompany, user.getCompany()) and
verify(userRepository).save(user); if desired behavior is to refuse,
assertFalse(result) and verify(userRepository, never()).save(any())).
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: a94649f9-6299-44ca-9539-dd0195d4d7a8
📒 Files selected for processing (4)
backend/src/main/java/com/angel/autonow/company/CompanyController.javabackend/src/main/java/com/angel/autonow/company/CompanyService.javabackend/src/test/java/com/angel/autonow/company/CompanyControllerIT.javabackend/src/test/java/com/angel/autonow/company/CompanyServiceTest.java
🚧 Files skipped from review as they are similar to previous changes (1)
- backend/src/main/java/com/angel/autonow/company/CompanyController.java
added 3 commits
April 10, 2026 20:07
Cannot delete a company if there are drivers/vehicles attached.
|
This was referenced May 6, 2026
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
1 participant
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.
Summary by CodeRabbit
New Features
Tests
Chores