[messy interim] freeze state prior to membership overhaul

NASA-PDS · Nov 21, 2023 · 60e801a · 60e801a
1 parent d3bcfd5
commit 60e801a
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 19 deletions.
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/LidvidsContext.java b/service/src/main/java/gov/nasa/pds/api/registry/LidvidsContext.java
@@ -7,7 +7,9 @@ public interface LidvidsContext {
 
   public Integer getLimit();
 
-  public List<String> getSearchAfter();
+  public List<String> getSortFields();
+
+  public List<String> getSearchAfterValues();
 
   public boolean getSingletonResultExpected();
 }
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/UserContext.java b/service/src/main/java/gov/nasa/pds/api/registry/UserContext.java
@@ -19,7 +19,9 @@ public interface UserContext extends LidvidsContext {
 
   public ProductVersionSelector getSelector();
 
-  public List<String> getSort();
+  public List<String> getSortFields();
+
+  public List<String> getSearchAfterValues();
 
   public String getVersion();
 }
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/controller/URIParameters.java b/service/src/main/java/gov/nasa/pds/api/registry/controller/URIParameters.java
@@ -37,12 +37,12 @@ class URIParameters implements UserContext {
   private final String group;
   private final String identifier;
   private final List<String> keywords;
-  private final List<String> searchAfter;
+  private final List<String> searchAfterValues;
   private final Integer limit;
   private final Boolean singletonResultExpected;
   private final String query;
   private final ProductVersionSelector selector;
-  private final List<String> sort;
+  private final List<String> sortFields;
   private final String version;
 
   private PdsProductIdentifier productIdentifier;
@@ -56,12 +56,12 @@ public URIParameters(URIParametersBuilder builder) {
     this.group = builder.group;
     this.identifier = builder.identifier;
     this.keywords = builder.keywords;
-    this.searchAfter = builder.searchAfter;
+    this.searchAfterValues = builder.searchAfter;
     this.limit = builder.limit;
     this.singletonResultExpected = builder.singletonResultExpected;
     this.query = builder.query;
     this.selector = builder.selector;
-    this.sort = builder.sort;
+    this.sortFields = builder.sort;
     this.version = builder.version;
 
   }
@@ -124,13 +124,13 @@ public ProductVersionSelector getSelector() {
   }
 
   @Override
-  public List<String> getSort() {
-    return sort;
+  public List<String> getSortFields() {
+    return sortFields;
   }
 
   @Override
-  public List<String> getSearchAfter() {
-    return searchAfter;
+  public List<String> getSearchAfterValues() {
+    return searchAfterValues;
   }
 
   public boolean getVerifyClassAndId() {

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/PaginationLidvidBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/model/PaginationLidvidBuilder.java
@@ -8,14 +8,16 @@
 
 class PaginationLidvidBuilder implements Pagination<String> {
   final private int limit;
-  final private List<String> searchAfter;
+  private List<String> sortFields;
+  private List<String> searchAfterValues;
   final private List<String> page = new ArrayList<String>();
 
   private int total = 0;
 
   PaginationLidvidBuilder(LidvidsContext bounds) {
     this.limit = bounds.getLimit();
-    this.searchAfter = bounds.getSearchAfter();
+    this.sortFields = bounds.getSortFields();
+    this.searchAfterValues = bounds.getSearchAfterValues();
   }
 
   void addAll(List<String> data) {
@@ -64,8 +66,11 @@ public int size() {
   }
 
   @Override
-  public List<String> searchAfter() {
-    return this.searchAfter;
+  public List<String> getSortFields() {
+    return this.sortFields;
+  }
+  public List<String> getSearchAfterValues() {
+    return this.searchAfterValues;
   }
 
   @Override

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/RequestAndResponseContext.java b/service/src/main/java/gov/nasa/pds/api/registry/model/RequestAndResponseContext.java
@@ -135,10 +135,10 @@ private RequestAndResponseContext(ControlContext controlContext, // webby criter
     this.productIdentifier = LidVidUtils.resolve(parameters.getIdentifier(), versionSelectionScope,
         controlContext, RequestBuildContextFactory
             .given(parameters.getSelector() == ProductVersionSelector.LATEST, fields, resPreset));
-    this.searchAfter = parameters.getSearchAfter();
+    this.searchAfter = parameters.getSearchAfterValues();
     this.limit = parameters.getLimit();
     this.singletonResultExpected = parameters.getSingletonResultExpected();
-    this.sort = parameters.getSort();
+    this.sort = parameters.getSortFields();
     this.presetCriteria = outPreset;
     this.selector = parameters.getSelector();
   }

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/Unlimited.java b/service/src/main/java/gov/nasa/pds/api/registry/model/Unlimited.java
@@ -22,8 +22,13 @@ public Integer getLimit() {
   }
 
   @Override
-  public List<String> getSearchAfter() {
-    return null;
+  public List<String> getSortFields() {
+    return List.of("ops:Harvest_Info/ops:harvest_date_time");
+  }
+
+  @Override
+  public List<String> getSearchAfterValues() {
+    return List.of("");  // TODO: Check whether this actually works or if it needs to be set per-page in the contexts in which Unlimited is used
   }
 
   @Override

diff --git a/service/src/test/java/gov/nasa/pds/api/registry/model/PaginationLidvidBuilderTest.java b/service/src/test/java/gov/nasa/pds/api/registry/model/PaginationLidvidBuilderTest.java
@@ -248,10 +248,12 @@ public void testComplexAddTrimHeadAndTailSpanning() {
 
 
 class LidvidsContextStub implements LidvidsContext {
+  private final List<String> sortFields;
   private final List<String> searchAfter;
   private final int limit;
 
   public LidvidsContextStub(int start, int limit) {
+    this.sortFields = null;
     this.searchAfter = null;
     this.limit = limit;
   }
@@ -267,7 +269,12 @@ public Integer getLimit() {
   }
 
   @Override
-  public List<String> getSearchAfter() {
+  public List<String> getSortFields() {
+    return sortFields;
+  }
+
+  @Override
+  public List<String> getSearchAfterValues() {
     return searchAfter;
   }