#83 .all()

cqfn · Dec 1, 2017 · 42562c6 · 42562c6
1 parent 071dbb0
commit 42562c6
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 31 deletions.
diff --git a/src/main/java/org/jpeek/web/Results.java b/src/main/java/org/jpeek/web/Results.java
@@ -23,8 +23,12 @@
  */
 package org.jpeek.web;
 
+import com.amazonaws.services.dynamodbv2.model.AttributeValue;
+import com.amazonaws.services.dynamodbv2.model.ComparisonOperator;
+import com.amazonaws.services.dynamodbv2.model.Condition;
 import com.jcabi.dynamo.Attributes;
 import com.jcabi.dynamo.QueryValve;
+import com.jcabi.dynamo.ScanValve;
 import com.jcabi.dynamo.Table;
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
@@ -93,34 +97,67 @@ public void add(final String artifact, final Path dir)
  rank = (long) (new DyNum(10L).doubleValue()
  + (double) rank * (1.0d - diff.doubleValue()));
  }
- this.table.put(
- new Attributes()
- .with("good", "true")
- .with("artifact", artifact)
- .with("rank", rank)
- .with("score", score)
- .with("diff", diff.longValue())
- .with(
- "defects",
- new DyNum(index.xpath("/index/@defects").get(0)).longValue()
- )
- .with("classes", classes)
- .with("version", new Version().value())
- .with("added", System.currentTimeMillis())
- .with(
- "ttl",
- System.currentTimeMillis() / TimeUnit.SECONDS.toMillis(1L)
+ if (classes > 0) {
+ this.table.put(
+ new Attributes()
+ .with("good", "true")
+ .with("artifact", artifact)
+ .with("rank", rank)
+ .with("score", score)
+ .with("diff", diff.longValue())
+ .with(
+ "defects",
+ new DyNum(
+ index.xpath("/index/@defects").get(0)
+ ).longValue()
+ )
+ .with("classes", classes)
+ .with("version", new Version().value())
+ .with("added", System.currentTimeMillis())
+ .with(
+ "ttl",
+ System.currentTimeMillis()
+ / TimeUnit.SECONDS.toMillis(1L)
+ // @checkstyle MagicNumber (1 line)
+ + TimeUnit.DAYS.toSeconds(100L)
+ )
+ );
+ }
+ }
+
+ /**
+ * Recent artifacts..
+ * @return List of them
+ */
+ public Iterable<Iterable<Directive>> recent() {
+ return new Mapped<>(
+ item -> {
+ final String[] parts = item.get("artifact").getS().split(":");
+ return new Directives()
+ .add("repo")
+ .add("group").set(parts[0]).up()
+ .add("artifact").set(parts[1]).up()
+ .up();
+ },
+ this.table.frame()
+ .where("good", "true")
+ .through(
+ new QueryValve()
+ .withScanIndexForward(false)
+ .withIndexName("recent")
+ .withConsistentRead(false)
  // @checkstyle MagicNumber (1 line)
- + TimeUnit.DAYS.toSeconds(100L)
+ .withLimit(25)
+ .withAttributesToGet("artifact")
  )
  );
  }
 
  /**
- * Recent artifacts..
+ * All of them.
  * @return List of them
  */
- public Iterable<Iterable<Directive>> recent() {
+ public Iterable<Iterable<Directive>> all() {
  return new Mapped<>(
  item -> {
  final String[] parts = item.get("artifact").getS().split(":");
@@ -138,15 +175,17 @@ public Iterable<Iterable<Directive>> recent() {
  .up();
  },
  this.table.frame()
- .where("good", "true")
+ .where(
+ "classes",
+ new Condition()
+ .withAttributeValueList(new AttributeValue().withN("0"))
+ .withComparisonOperator(ComparisonOperator.GT)
+ )
  .through(
- new QueryValve()
- .withScanIndexForward(false)
- .withIndexName("recent")
- .withConsistentRead(false)
+ new ScanValve()
  // @checkstyle MagicNumber (1 line)
  .withLimit(25)
- .withAttributesToGet(
+ .withAttributeToGet(
  "artifact", "classes", "defects", "version"
  )
  )

diff --git a/src/main/java/org/jpeek/web/TkAll.java b/src/main/java/org/jpeek/web/TkAll.java
@@ -52,7 +52,7 @@ public Response act(final Request req) {
  "recent",
  new XeDirectives(
  new Joined<>(
- new Results().recent()
+ new Results().all()
  )
  )
  )

diff --git a/src/main/resources/org/jpeek/web/all.xsl b/src/main/resources/org/jpeek/web/all.xsl
@@ -37,6 +37,8 @@ SOFTWARE.
  </xsl:template>
  <xsl:template match="/page" mode="body">
  <xsl:apply-templates select="recent"/>
+ </xsl:template>
+ <xsl:template match="recent">
  <script>
  <xsl:text>
  function ping() {
@@ -48,12 +50,10 @@ SOFTWARE.
  $span.text(status);
  }
  );
- })
+ });
  }
  </xsl:text>
  </script>
- </xsl:template>
- <xsl:template match="recent">
  <p>
  <xsl:text>There are </xsl:text>
  <xsl:value-of select="count(repo)"/>

diff --git a/src/test/java/org/jpeek/web/TkAppTest.java b/src/test/java/org/jpeek/web/TkAppTest.java
@@ -79,7 +79,6 @@ public void pingsSimplePages() throws IOException {
  "/jpeek.css",
  "/",
  "/mistakes",
- "/all",
  "/robots.txt",
  };
  final Take app = new TkApp(Files.createTempDirectory("x"));