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.

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

Jump to bottom

261: lookup product class when group not explicitly given #263

Merged
merged 4 commits into from
Mar 8, 2023
Merged

261: lookup product class when group not explicitly given #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39ffefe
if not group given, then derive it from the product class
Feb 27, 2023
7cd2933
excise LidVidUtils.getLatestLidVidsForProductIdentifiers
alexdunnjpl Mar 8, 2023
fa85031
improve LidVidNotFound log message
alexdunnjpl Mar 8, 2023
d4b2458
remove illegal character
alexdunnjpl Mar 2, 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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.


<!--
👉 This is the TEMPLATE project object model or `pom.xml` file.
This is the TEMPLATE project object model or `pom.xml` file.

Go through this file line-by-line and replace the template values with your own.
-->
Expand Down Expand Up @@ -225,7 +225,7 @@ Go through this file line-by-line and replace the template values with your own.
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</goals>
</execution>
</executions>
</plugin>
Expand Down
7 changes: 6 additions & 1 deletion service/src/main/java/gov/nasa/pds/api/registry/controller/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import gov.nasa.pds.api.registry.exceptions.UnknownGroupNameException;
import gov.nasa.pds.api.registry.model.ReferencingLogicTransmuter;
import gov.nasa.pds.api.registry.model.RequestAndResponseContext;
import gov.nasa.pds.api.registry.search.QuickSearch;

class Member implements EndpointHandler
{
Expand All @@ -30,7 +31,11 @@ public ResponseEntity<Object> transmute(ControlContext control, UserContext cont
throws ApplicationTypeException, IOException, LidVidNotFoundException, MembershipException,
NothingFoundException, UnknownGroupNameException
{
ReferencingLogic transmuter = ReferencingLogicTransmuter.getBySwaggerGroup(content.getGroup()).impl();
ReferencingLogic transmuter;

if (0 < content.getGroup().length()) transmuter = ReferencingLogicTransmuter.getBySwaggerGroup(content.getGroup()).impl();
else transmuter = ReferencingLogicTransmuter.getByProductClass(QuickSearch.getValue(control.getConnection(), false, content.getLidVid(), "product_class")).impl();

RequestAndResponseContext context = this.offspring ? transmuter.member(control, content, this.twoSteps) :
transmuter.memberOf(control, content, this.twoSteps);
return new ResponseEntity<Object>(context.getResponse(), HttpStatus.OK);
Expand Down
18 changes: 9 additions & 9 deletions service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.TreeSet;
import java.util.stream.Collectors;

import gov.nasa.pds.api.registry.RequestBuildContext;
import gov.nasa.pds.api.registry.model.identifiers.LidVidUtils;
import gov.nasa.pds.api.registry.model.identifiers.PdsLidVid;
import gov.nasa.pds.api.registry.model.identifiers.PdsProductIdentifier;
Expand Down Expand Up @@ -161,15 +162,14 @@ static private Pagination<String> getBundleCollectionLidVids(

// Get the latest versions of LIDs
List<PdsProductIdentifier> productIdentifiers = lidStrings.stream().map(PdsProductIdentifier::fromString).collect(Collectors.toList());
try {
List<PdsLidVid> latestLidVids = LidVidUtils.getLatestLidVidsForProductIdentifiers(
ctlContext,
RequestBuildContextFactory.given(true, "lid", ReferencingLogicTransmuter.Collection.impl().constraints()),
productIdentifiers);
List<String> latestLidVidStrings = latestLidVids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
lidvids.addAll(latestLidVidStrings);
} catch (LidVidNotFoundException e) {
log.error("Database referential integrity error - LID is referenced but does not exist in db: " + e.toString());
RequestBuildContext reqContext = RequestBuildContextFactory.given(true, "lid", ReferencingLogicTransmuter.Collection.impl().constraints());
for (PdsProductIdentifier id : productIdentifiers) {
try {
PdsLidVid latestLidVid = LidVidUtils.getLatestLidVidByLid(ctlContext, reqContext, id.getLid().toString());
lidvids.add(latestLidVid.toString());
} catch (LidVidNotFoundException e) {
log.warn("LID is referenced but is in non-findable archive-status or does not exist in db: " + e.toString());
}
}

return lidvids;
Expand Down
23 changes: 12 additions & 11 deletions service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,20 @@ static Pagination<String> parents (ControlContext control, ProductVersionSelecto
}
}
sortedLidStrings = new ArrayList<String>(lids);
Collections.sort(sortedLidStrings); // TODO: Implement comparison for PdsLids (only with other PdsLids)
List<PdsProductIdentifier> sortedLids = sortedLidStrings.stream().map(PdsLid::fromString).collect(Collectors.toList());
Collections.sort(sortedLidStrings); // TODO: Implement comparison for PdsLids (only with other PdsLids)
List<PdsProductIdentifier> sortedLids = sortedLidStrings.stream().map(PdsLid::fromString).collect(Collectors.toList());

if (selection == ProductVersionSelector.ALL){
if (selection == ProductVersionSelector.ALL) {
bundleLidvids.addAll(LidVidUtils.getAllLidVidsByLids(control, RequestBuildContextFactory.empty(), sortedLidStrings));
}
else {
try {
List<PdsLidVid> latestLidvids = LidVidUtils.getLatestLidVidsForProductIdentifiers(control, RequestBuildContextFactory.empty(), sortedLids);
List<String> latestLidVidStrings = latestLidvids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
bundleLidvids.addAll(latestLidVidStrings);
} catch (LidVidNotFoundException e) {
log.error("Database referential integrity error - LID is referenced but does not exist in db: " + e.toString());
} else {
RequestBuildContext reqContext = RequestBuildContextFactory.empty();
for (PdsProductIdentifier lid : sortedLids) {
try {
PdsLidVid latestLidvid = LidVidUtils.getLatestLidVidByLid(control, reqContext, lid.getLid().toString());
bundleLidvids.add(latestLidvid.toString());
} catch (LidVidNotFoundException e) {
log.warn("LID is referenced but is in non-findable archive-status or does not exist in db: " + e.toString());
}
}
}

Expand Down
27 changes: 14 additions & 13 deletions service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicProduct.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.Set;
import java.util.stream.Collectors;

import gov.nasa.pds.api.registry.RequestBuildContext;
import gov.nasa.pds.api.registry.model.identifiers.LidVidUtils;
import gov.nasa.pds.api.registry.model.identifiers.PdsLid;
import gov.nasa.pds.api.registry.model.identifiers.PdsLidVid;
Expand Down Expand Up @@ -77,20 +78,20 @@ static Pagination<String> parents (ControlContext control, ProductVersionSelecto
Collections.sort(sortedLidStrings);
List<PdsProductIdentifier> sortedLids = sortedLidStrings.stream().map(PdsLid::fromString).collect(Collectors.toList());

if (selection == ProductVersionSelector.ALL){
parents.addAll (LidVidUtils.getAllLidVidsByLids(control, RequestBuildContextFactory.empty(), sortedLidStrings));
}
else{
try{
List<PdsLidVid> latestLidVids = LidVidUtils.getLatestLidVidsForProductIdentifiers(control, RequestBuildContextFactory.empty(), sortedLids);
List<String> latestLidVidStrings = latestLidVids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
parents.addAll(latestLidVidStrings);
} catch (LidVidNotFoundException e) {
log.error("Database referential integrity error - LID is referenced but does not exist in db: " + e.toString());
if (selection == ProductVersionSelector.ALL) {
parents.addAll(LidVidUtils.getAllLidVidsByLids(control, RequestBuildContextFactory.empty(), sortedLidStrings));
} else {
RequestBuildContext reqContext = RequestBuildContextFactory.empty();
for (PdsProductIdentifier id : sortedLids) {
try {
PdsLidVid latestLidvid = LidVidUtils.getLatestLidVidByLid(control, reqContext, id.getLid().toString());
parents.add(latestLidvid.toString());
} catch (LidVidNotFoundException e) {
log.warn("LID is referenced but is in non-findable archive-status or does not exist in db: " + e.toString());
}
}
}

return parents;
}

return parents;
}
}
22 changes: 0 additions & 22 deletions service/src/main/java/gov/nasa/pds/api/registry/model/identifiers/LidVidUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,6 @@ public class LidVidUtils
{
private static final Logger log = LoggerFactory.getLogger(LidVidUtils.class);

/**
* Get latest versions of LIDs
*/
public static List<PdsLidVid> getLatestLidVidsForProductIdentifiers(
ControlContext ctlContext,
RequestBuildContext reqContext,
Collection<PdsProductIdentifier> productIdentifiers) throws IOException,LidVidNotFoundException
{
List<PdsLidVid> lidVids = new ArrayList<>();

for (PdsProductIdentifier id : productIdentifiers) {
try {
PdsLidVid latestLidVid = LidVidUtils.getLatestLidVidByLid(ctlContext, reqContext, id.getLid().toString());
lidVids.add(latestLidVid);
} catch (LidVidNotFoundException e) {
throw new LidVidNotFoundException("Could not find any LIDVIDs for LID " + id.getLid().toString());
}
}

return lidVids;
}

public static PdsLidVid getLatestLidVidByLid(
ControlContext ctlContext,
RequestBuildContext reqContext,
Expand Down