Skip to content
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.

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

KPMP-4530_fix-release-ver #2

Merged
merged 35 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6310dbe
add logic for highest release version
Dert1129 Jul 17, 2023
d2a06b9
add logic for highest release version
Dert1129 Jul 17, 2023
057dc2c
rename variable
Dert1129 Jul 17, 2023
96963dc
remove logging
Dert1129 Jul 17, 2023
3224cff
rename search engine name
Dert1129 Jul 17, 2023
fb2a0e6
Fix readme
Dert1129 Jul 18, 2023
4458cf6
added new fields
Dert1129 Jul 18, 2023
0ebe47a
Check for null filenames
Dert1129 Jul 18, 2023
e06c404
Save changes to string
Dert1129 Jul 18, 2023
15b4689
add tests
Dert1129 Jul 18, 2023
bf480b1
invert logic
Dert1129 Jul 18, 2023
2a1ae8a
rename methods
Dert1129 Jul 19, 2023
6855e9e
move variables
Dert1129 Jul 19, 2023
521036a
Implement Clinical File handling
Dert1129 Jul 21, 2023
51614bc
User Set for unique elements
Dert1129 Jul 28, 2023
cc0fb29
remove brackets
Dert1129 Jul 31, 2023
7812792
fix graphql names
Dert1129 Aug 1, 2023
97a7ebf
revert variable changes
Dert1129 Aug 1, 2023
3db93f6
fix JsonProperty names
Dert1129 Aug 4, 2023
32cb72a
write tests
Dert1129 Aug 7, 2023
1fad070
remove logging
Dert1129 Aug 7, 2023
2f62b57
remove unused tests
Dert1129 Aug 7, 2023
885a0c7
remove unused class
Dert1129 Aug 8, 2023
197b75f
cleanup queries
Dert1129 Aug 8, 2023
608918f
write tests
Dert1129 Aug 8, 2023
0add256
write tests
Dert1129 Aug 8, 2023
af330fb
remove unused imports
Dert1129 Aug 8, 2023
6016d67
move to BeforeEach and AfterEach
Dert1129 Aug 8, 2023
77db42a
add tests for add methods
Dert1129 Aug 8, 2023
d3a479c
move to newer Junit tests
Dert1129 Aug 8, 2023
58ed9ed
add empty contructor
Dert1129 Aug 8, 2023
d64756b
add tests
Dert1129 Aug 8, 2023
0bbd113
add tests
Dert1129 Aug 8, 2023
92864f7
fix tests and methods
Dert1129 Aug 10, 2023
d2ca9e2
test platformSort logic
Dert1129 Aug 11, 2023
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ If you have having troubles seeing changes during development, you can try to cl
3. Add your IP address to a new security group called sg-0597e054f11d2e31a (Developer to KE Mariadb)
4. Restart your knowledge-environment (don't worry that you have your own copy of mariadb, it'll be ignored)

# Regenerate the Spatial Viewer Search Engine
# Regenerate the Atlas Repository Search Engine

1. Login to the KE Enterprise Search console (see https://docs.google.com/document/d/1uMb_ooDEU6PDkZOuFQGnPHo07UtnA-mrfwe3lpuEiho)
2. Delete the "repository" search engine
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
implementation 'com.graphql-java:graphql-java-tools:5.2.4'
testImplementation 'org.mockito:mockito-core'
implementation 'org.springframework.boot:spring-boot-starter-cache:2.6.3'
testImplementation 'junit:junit:4.12'
testImplementation('org.mockito:mockito-junit-jupiter:3.12.4')
}

springBoot {
Expand Down
9 changes: 2 additions & 7 deletions src/main/java/org/kpmp/Query.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.kpmp;

import com.coxautodev.graphql.tools.GraphQLQueryResolver;
import org.kpmp.repositoryDataset.RepositoryDataset;
import org.kpmp.repositoryDataset.RepositoryDatasetDisplay;
import org.kpmp.repositoryDataset.RepositoryDatasetService;
import org.kpmp.repositoryDataset.RepositoryFileDataset;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

Expand All @@ -22,11 +21,7 @@ public Query(
this.repositoryDatasetService = repositoryDatasetService;
}

public List<RepositoryDataset> getRepositoryDataset() throws IOException, Exception {
public List<RepositoryDatasetDisplay> getRepositoryDataset() throws IOException, Exception {
return repositoryDatasetService.getRepositoryDataset();
}

public List<RepositoryFileDataset> getRepositoryFileDataset() throws IOException, Exception {
return repositoryDatasetService.getRepositoryFileDataset();
}
}
45 changes: 0 additions & 45 deletions src/main/java/org/kpmp/repositoryDataset/RepositoryDataset.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ public RepositoryDatasetController(RepositoryDatasetService repositoryDatasetSer
@RequestMapping(value = "/api/v1/repository/load-search", method = RequestMethod.GET)
public @ResponseBody String loadSearch(HttpServletRequest request) throws Exception {
return "Successfully added " + repositoryDatasetService.loadEnterpriseSearch().size() + " documents.";

}
}
Loading