disable auto case indexation #39
Merged
Conversation
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
jamal-khey
changed the title
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
jamal-khey
force-pushed
the
jamalkhey/disable-auto-case-indexation
branch
from
decb125 to
4fb0ead
Compare
jamal-khey
force-pushed
the
jamalkhey/disable-auto-case-indexation
branch
from
fde5d71 to
dff6051
Compare
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
jamal-khey
force-pushed
the
jamalkhey/disable-auto-case-indexation
branch
from
00c954d to
571a851
Compare
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
SlimaneAmar
requested changes
Aug 14, 2024
| LOGGER.debug("importCase request received with file = {}", file.getName()); | ||
| UUID caseUuid = caseService.importCase(file, withExpiration); | ||
| UUID caseUuid = caseService.importCase(file, withExpiration, indexed); |
There was a problem hiding this comment.
Rename by withIndexation
But in database leave indexed
| @@ -17,4 +18,8 @@ | |||
| @Repository | |||
| public interface CaseMetadataRepository extends JpaRepository<CaseMetadataEntity, UUID> { | |||
|
|
|||
| @Override | |||
| List<CaseMetadataEntity> findAllById(Iterable<UUID> uuids); | |||
| return nbIndexesToDelete; | ||
| } | ||
|
|
||
| public long getIndexedCaseElementsCount() { |
There was a problem hiding this comment.
Remove elements -> getIndexedCasesCount
| @@ -165,9 +166,10 @@ public ResponseEntity<UUID> importCase(@RequestParam("file") MultipartFile file, | |||
| @ApiResponse(responseCode = "500", description = "An error occurred during the case file duplication")}) | |||
| public ResponseEntity<UUID> duplicateCase( | |||
| @RequestParam("duplicateFrom") UUID caseId, | |||
| @RequestParam(value = "withExpiration", required = false, defaultValue = "false") boolean withExpiration) { | |||
| @RequestParam(value = "withExpiration", required = false, defaultValue = "false") boolean withExpiration, | |||
There was a problem hiding this comment.
Remove paramter
Do indexation if the origin case is indexed only
| @@ -273,6 +284,12 @@ public void disableCaseExpiration(UUID caseUuid) { | |||
| caseMetadataEntity.setExpirationDate(null); | |||
| } | |||
|
|
|||
| @Transactional | |||
Comment on lines
42
to
45
| @RunWith(SpringRunner.class) | ||
| @AutoConfigureMockMvc | ||
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, properties = {"case-store-directory=/cases"}) | ||
| @ContextConfigurationWithTestChannel |
There was a problem hiding this comment.
Suggested change
| @RunWith(SpringRunner.class) | |
| @AutoConfigureMockMvc | |
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, properties = {"case-store-directory=/cases"}) | |
| @ContextConfigurationWithTestChannel | |
| @RunWith(SpringRunner.class) | |
| @AutoConfigureMockMvc | |
| @SpringBootTest | |
| @ContextConfiguration(classes = {CaseApplication.class}) |
There was a problem hiding this comment.
done partially , the tests does not pass without properties = {"case-store-directory=/cases"}
| private FileSystem fileSystem; | ||
|
|
||
| @Test | ||
| public void testGetElementInfosCount() throws Exception { |
There was a problem hiding this comment.
Ranma element by case anywhere
| } | ||
|
|
||
| @Test | ||
| public void testDeleteElementInfos() throws Exception { |
There was a problem hiding this comment.
Rename by testReindexAll ?
| Assert.assertEquals(2, supervisionService.getIndexedCaseElementsCount()); | ||
|
|
||
| } | ||
|
|
There was a problem hiding this comment.
Need a test for index name ?
SlimaneAmar
reviewed
Aug 14, 2024
| fileSystem = Jimfs.newFileSystem(Configuration.unix()); | ||
| caseService.setFileSystem(fileSystem); | ||
| caseService.setComputationManager(Mockito.mock(ComputationManager.class)); | ||
| cleanDB(); |
There was a problem hiding this comment.
Move cleanDB in the tearDown method
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
SlimaneAmar
reviewed
Aug 19, 2024
| @@ -238,7 +236,10 @@ UUID duplicateCase(UUID sourceCaseUuid, boolean withExpiration) { | |||
| CaseInfos existingCaseInfos = caseInfosService.getCaseInfosByUuid(sourceCaseUuid.toString()).orElseThrow(); | |||
| CaseInfos caseInfos = createInfos(existingCaseInfos.getName(), newCaseUuid, existingCaseInfos.getFormat()); | |||
| caseInfosService.addCaseInfos(caseInfos); | |||
| createCaseMetadataEntity(newCaseUuid, withExpiration); | |||
|
|
|||
| Optional<CaseMetadataEntity> existingCase = caseMetadataRepository.findById(sourceCaseUuid); | |||
There was a problem hiding this comment.
Throws NO_FOUND exception like disableCaseExpiration
|
Remove any reference of the word |
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Signed-off-by: jamal-khey <myjamal89@gmail.com>
|
SlimaneAmar
approved these changes
Aug 21, 2024
jonenst
added a commit
that referenced
this pull request
Sep 16, 2024
Signed-off-by: jamal-khey <myjamal89@gmail.com>
jonenst
pushed a commit
that referenced
this pull request
Sep 16, 2024
Signed-off-by: jamal-khey <myjamal89@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Please check if the PR fulfills these requirements
What kind of change does this PR introduce?
this PR disable auto indexation of the cases, and intreduce a new param "indexed" to indicate wich cases should be indexed by
/v1/supervision/case/reindexThis also PR create a supervision service to delete elk documents and reindex cases.
What is the current behavior?
when a case is created or duplication , this service index it automatically
What is the new behavior (if this is a feature change)?
cases are indexed on demand
Does this PR introduce a breaking change or deprecate an API?
If yes, please check if the following requirements are fulfilled
What changes might users need to make in their application due to this PR? (migration steps)
The endpoint for reindexing all cases has been renamed from
/v1/cases/index-allto/v1/supervision/cases/reindex.Any client applications or scripts that previously called the
/v1/cases/index-allendpoint will need to be updated to use the new/v1/supervision/cases/reindexendpoint.The database schema has also been changed to add a new column "indexed" , the values of this collumn will be set to false by default.
Other information:
To test this PR :
/v1/supervision/cases/reindexto recreate the index ( you should have no cases indexed , all of them are marked indexed=false by default)PUT /cases/{caseUuid}/indexation