Skip to content

Update base path to /nbs/api/deduplication. Remove /api from controllers #331

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
mpeels merged 1 commit into from
Apr 2, 2025
Merged

Update base path to /nbs/api/deduplication. Remove /api from controllers #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion deduplication/src/main/java/gov/cdc/nbs/deduplication/algorithm/AlgorithmController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import gov.cdc.nbs.deduplication.algorithm.pass.model.ui.Algorithm;

@RestController
@RequestMapping("/api/configuration")
@RequestMapping("/configuration")
public class AlgorithmController {

private final PassService passService;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/gov/cdc/nbs/deduplication/algorithm/dataelements/DataElementsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import gov.cdc.nbs.deduplication.algorithm.pass.PassService;

@RestController
@RequestMapping("/api/configuration/data-elements")
@RequestMapping("/configuration/data-elements")
public class DataElementsController {

private final DataElementsService service;
Expand Down
2 changes: 1 addition & 1 deletion deduplication/src/main/java/gov/cdc/nbs/deduplication/algorithm/pass/PassController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import gov.cdc.nbs.deduplication.algorithm.pass.model.ui.Algorithm.Pass;

@RestController
@RequestMapping("/api/configuration/pass")
@RequestMapping("/configuration/pass")
public class PassController {

private final PassService passService;
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/gov/cdc/nbs/deduplication/duplicates/controller/MergeGroupController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


@RestController
@RequestMapping("/api/deduplication")
@RequestMapping("/deduplication")
public class MergeGroupController {

private final MergeGroupHandler mergeGroupHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...ication/src/main/java/gov/cdc/nbs/deduplication/duplicates/controller/TestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api/batch-job/test")
@RequestMapping("/batch-job/test")
public class TestController {

private final JobLauncher jobLauncher;
Expand Down
2 changes: 1 addition & 1 deletion deduplication/src/main/java/gov/cdc/nbs/deduplication/matching/MatchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import gov.cdc.nbs.deduplication.matching.model.RelateRequest;

@RestController
@RequestMapping("/api/deduplication")
@RequestMapping("/deduplication")
public class MatchController {

private final MatchService matchService;
Expand Down
2 changes: 1 addition & 1 deletion deduplication/src/main/java/gov/cdc/nbs/deduplication/seed/SeedController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api/deduplication/seed")
@RequestMapping("/deduplication/seed")
public class SeedController {

private final JobLauncher launcher;
Expand Down
2 changes: 1 addition & 1 deletion deduplication/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
server:
port: 8083
servlet:
context-path: /nbs/deduplication
context-path: /nbs/api/deduplication

spring:
application.name: deduplication
Expand Down
6 changes: 3 additions & 3 deletions ...c/test/java/gov/cdc/nbs/deduplication/duplicates/controller/MergeGroupControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void testGetPossibleMatchGroups() throws Exception {


// Act & Assert
mockMvc.perform(get("/api/deduplication/merge-groups")
mockMvc.perform(get("/deduplication/merge-groups")
.param("page", String.valueOf(page))
.param("size", String.valueOf(size)))
.andExpect(status().isOk())
Expand All @@ -56,7 +56,7 @@ void testUpdateMergeStatus() throws Exception {
MergeStatusRequest request = new MergeStatusRequest(100L, false);

// Act & Assert
mockMvc.perform(post("/api/deduplication/merge-status")
mockMvc.perform(post("/deduplication/merge-status")
.contentType("application/json")
.content("{\"personUid\": 100, \"status\": \"false\"}"))
.andExpect(status().isOk())
Expand All @@ -72,7 +72,7 @@ void testUpdateMergeStatus_Error() throws Exception {
doThrow(new RuntimeException("Some error")).when(mergeGroupHandler).updateMergeStatus(request);

// Act & Assert
mockMvc.perform(post("/api/deduplication/merge-status")
mockMvc.perform(post("/deduplication/merge-status")
.contentType("application/json")
.content("{\"personUid\": 100, \"status\": \"false\"}"))
.andExpect(status().isInternalServerError())
Expand Down
Loading