add "note" to chargepoint and ocpptag queries

steve-community · Jan 26, 2025 · 4149309 · 4149309
1 parent 7893695
commit 4149309
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java
@@ -158,6 +158,10 @@ private Result<Record5<Integer, String, String, String, DateTime>> getOverviewIn
             selectQuery.addConditions(includes(CHARGE_BOX.CHARGE_BOX_ID, form.getChargeBoxId()));
         }
 
+        if (form.isSetNote()) {
+            selectQuery.addConditions(includes(CHARGE_BOX.NOTE, form.getNote()));
+        }
+
         switch (form.getHeartbeatPeriod()) {
             case ALL:
                 break;

diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static de.rwth.idsg.steve.utils.CustomDSL.includes;
 import static de.rwth.idsg.steve.utils.DateTimeUtils.humanize;
 import static de.rwth.idsg.steve.utils.DateTimeUtils.toDateTime;
 import static jooq.steve.db.tables.OcppTag.OCPP_TAG;
@@ -98,6 +99,10 @@ public List<Overview> getOverview(OcppTagQueryForm form) {
             selectQuery.addConditions(OCPP_TAG_ACTIVITY.PARENT_ID_TAG.eq(form.getParentIdTag()));
         }
 
+        if (form.isNoteSet()) {
+            selectQuery.addConditions(includes(OCPP_TAG_ACTIVITY.NOTE, form.getNote()));
+        }
+
         switch (form.getExpired()) {
             case ALL:
                 break;

diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java
@@ -18,6 +18,7 @@
  */
 package de.rwth.idsg.steve.web.dto;
 
+import com.google.common.base.Strings;
 import de.rwth.idsg.steve.ocpp.OcppVersion;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -35,6 +36,7 @@ public class ChargePointQueryForm {
 
     private String chargeBoxId;
     private String description;
+    private String note;
     private OcppVersion ocppVersion;
     private QueryPeriodType heartbeatPeriod;
 
@@ -57,6 +59,10 @@ public boolean isSetChargeBoxId() {
         return chargeBoxId != null;
     }
 
+    public boolean isSetNote() {
+        return !Strings.isNullOrEmpty(note);
+    }
+
     @RequiredArgsConstructor
     public enum QueryPeriodType {
         ALL("All"),

diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java
@@ -18,6 +18,7 @@
  */
 package de.rwth.idsg.steve.web.dto;
 
+import com.google.common.base.Strings;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -53,6 +54,13 @@ public class OcppTagQueryForm {
     @Schema(description = "Return blocked, not blocked, or all Ocpp tags? Defaults to ALL")
     private BooleanType blocked = BooleanType.FALSE;
 
+    @Schema(description = """
+            Query by the note associated with the OCPP tag.
+            The value of this field does not have to exactly match the note.
+            A substring is also accepted.
+        """)
+    private String note;
+
     @Schema(hidden = true)
     public boolean isOcppTagPkSet() {
         return ocppTagPk != null;
@@ -68,6 +76,11 @@ public boolean isParentIdTagSet() {
         return parentIdTag != null;
     }
 
+    @Schema(hidden = true)
+    public boolean isNoteSet() {
+        return !Strings.isNullOrEmpty(note);
+    }
+
     public BooleanType getExpired() {
         return Objects.requireNonNullElse(expired, BooleanType.ALL);
     }

diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp
@@ -98,6 +98,10 @@
                     </form:select>
                     </td>
                 </tr>
+                <tr>
+                    <td>Note:</td>
+                    <td><form:input path="note"/></td>
+                </tr>
                 <tr>
                     <td></td>
                     <td id="add_space">

diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp
@@ -112,6 +112,10 @@
                     </form:select>
                     </td>
                 </tr>
+                <tr>
+                    <td>Note:</td>
+                    <td><form:input path="note"/></td>
+                </tr>
                 <tr>
                     <td></td>
                     <td id="add_space">