-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #328 from folio-org/MODFQMMGR-391
Modfqmmgr 391- Add endpoint to get latest query version
- Loading branch information
Showing
4 changed files
with
85 additions
and
2 deletions.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
src/main/java/org/folio/fqm/resource/MigrationController.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package org.folio.fqm.resource; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
import org.folio.fqm.service.MigrationService; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
public class MigrationController implements FqmVersionApi { | ||
private final MigrationService migrationService; | ||
|
||
@Override | ||
public ResponseEntity<String> getFqmVersion() { | ||
return new ResponseEntity<>(migrationService.getLatestVersion(), HttpStatus.OK); | ||
} | ||
} |
This file contains 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
This file contains 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
44 changes: 44 additions & 0 deletions
44
src/test/java/org/folio/fqm/controller/MigrationControllerTest.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
package org.folio.fqm.controller; | ||
|
||
import org.folio.fqm.resource.MigrationController; | ||
import org.folio.fqm.service.MigrationService; | ||
import org.folio.spring.FolioExecutionContext; | ||
import org.junit.jupiter.api.Test; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; | ||
import org.springframework.boot.test.mock.mockito.MockBean; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.test.web.servlet.MockMvc; | ||
import org.springframework.test.web.servlet.RequestBuilder; | ||
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; | ||
|
||
import static org.mockito.Mockito.when; | ||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; | ||
|
||
@WebMvcTest(MigrationController.class) | ||
class MigrationControllerTest { | ||
private static final String GET_VERSION_URL = "/fqm/version"; | ||
@Autowired | ||
private MockMvc mockMvc; | ||
|
||
@MockBean | ||
private MigrationService migrationService; | ||
|
||
@MockBean | ||
private FolioExecutionContext executionContext; | ||
|
||
@Test | ||
void shouldReturnVersion() throws Exception { | ||
String tenantId = "tenant_01"; | ||
when(executionContext.getTenantId()).thenReturn(tenantId); | ||
when(migrationService.getLatestVersion()).thenReturn("1"); | ||
RequestBuilder builder = MockMvcRequestBuilders | ||
.get(GET_VERSION_URL) | ||
.accept(MediaType.APPLICATION_JSON); | ||
mockMvc | ||
.perform(builder) | ||
.andExpect(status().isOk()) | ||
.andExpect(content().string("1")); | ||
} | ||
} |