refactor: rename query controllers and services for consistency

This commit is contained in:
2026-04-03 17:47:40 +08:00
parent 20c2da10ab
commit 80dc5170a4
6 changed files with 24 additions and 20 deletions
@@ -2,7 +2,7 @@ package com.onixbyte.deltaforceguide.controller;
import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse; import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse;
import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse;
import com.onixbyte.deltaforceguide.service.FirearmQueryService; import com.onixbyte.deltaforceguide.service.FirearmService;
import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
@@ -16,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
@Validated @Validated
@RestController @RestController
@RequestMapping("/api/v1/firearms") @RequestMapping("/firearms")
public class FirearmQueryController { public class FirearmController {
private final FirearmQueryService firearmQueryService; private final FirearmService firearmService;
public FirearmQueryController(FirearmQueryService firearmQueryService) { public FirearmController(FirearmService firearmService) {
this.firearmQueryService = firearmQueryService; this.firearmService = firearmService;
} }
@GetMapping @GetMapping
@@ -32,12 +32,12 @@ public class FirearmQueryController {
@RequestParam(defaultValue = "id") String sortBy, @RequestParam(defaultValue = "id") String sortBy,
@RequestParam(defaultValue = "DESC") Sort.Direction direction @RequestParam(defaultValue = "DESC") Sort.Direction direction
) { ) {
return firearmQueryService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy))); return firearmService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy)));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public FirearmResponse queryById(@PathVariable Long id) { public FirearmResponse queryById(@PathVariable Long id) {
return firearmQueryService.queryById(id); return firearmService.queryById(id);
} }
} }
@@ -2,7 +2,7 @@ package com.onixbyte.deltaforceguide.controller;
import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse; import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse;
import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse;
import com.onixbyte.deltaforceguide.service.ModificationQueryService; import com.onixbyte.deltaforceguide.service.ModificationService;
import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Min;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
@@ -16,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
@Validated @Validated
@RestController @RestController
@RequestMapping("/api/v1/modifications") @RequestMapping("/modifications")
public class ModificationQueryController { public class ModificationController {
private final ModificationQueryService modificationQueryService; private final ModificationService modificationService;
public ModificationQueryController(ModificationQueryService modificationQueryService) { public ModificationController(ModificationService modificationService) {
this.modificationQueryService = modificationQueryService; this.modificationService = modificationService;
} }
@GetMapping @GetMapping
@@ -32,12 +32,12 @@ public class ModificationQueryController {
@RequestParam(defaultValue = "id") String sortBy, @RequestParam(defaultValue = "id") String sortBy,
@RequestParam(defaultValue = "DESC") Sort.Direction direction @RequestParam(defaultValue = "DESC") Sort.Direction direction
) { ) {
return modificationQueryService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy))); return modificationService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy)));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ModificationResponse queryById(@PathVariable Long id) { public ModificationResponse queryById(@PathVariable Long id) {
return modificationQueryService.queryById(id); return modificationService.queryById(id);
} }
} }
@@ -2,7 +2,9 @@ package com.onixbyte.deltaforceguide.repository;
import com.onixbyte.deltaforceguide.domain.entity.Firearm; import com.onixbyte.deltaforceguide.domain.entity.Firearm;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface FirearmRepository extends JpaRepository<Firearm, Long> { public interface FirearmRepository extends JpaRepository<Firearm, Long> {
} }
@@ -5,9 +5,11 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.EntityGraph;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.Optional; import java.util.Optional;
@Repository
public interface ModificationRepository extends JpaRepository<Modification, Long> { public interface ModificationRepository extends JpaRepository<Modification, Long> {
@EntityGraph(attributePaths = {"firearm"}) @EntityGraph(attributePaths = {"firearm"})
@@ -10,11 +10,11 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
@Service @Service
public class FirearmQueryService { public class FirearmService {
private final FirearmRepository firearmRepository; private final FirearmRepository firearmRepository;
public FirearmQueryService(FirearmRepository firearmRepository) { public FirearmService(FirearmRepository firearmRepository) {
this.firearmRepository = firearmRepository; this.firearmRepository = firearmRepository;
} }
@@ -10,11 +10,11 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
@Service @Service
public class ModificationQueryService { public class ModificationService {
private final ModificationRepository modificationRepository; private final ModificationRepository modificationRepository;
public ModificationQueryService(ModificationRepository modificationRepository) { public ModificationService(ModificationRepository modificationRepository) {
this.modificationRepository = modificationRepository; this.modificationRepository = modificationRepository;
} }