args) {
this.code = code;
this.id = id;
this.type = type;
- this.index = index;
this.args = args;
}
}
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobRunErrorsParams.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobRunErrorsParams.java
new file mode 100644
index 000000000000..f7d0f28c74e1
--- /dev/null
+++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobRunErrorsParams.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2004-2023, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.scheduling;
+
+import java.util.Date;
+import java.util.List;
+import javax.annotation.CheckForNull;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.hisp.dhis.common.OpenApi;
+import org.hisp.dhis.common.UID;
+import org.hisp.dhis.feedback.ErrorCode;
+import org.hisp.dhis.user.User;
+
+/**
+ * Query params when searching for {@link JobConfiguration}s with errors.
+ *
+ * A match has to satisfy all filters (AND logic) but only one of the given codes or object
+ * {@link UID} (OR logic).
+ *
+ *
If any of the criteria is not defined it has no filter effect.
+ *
+ * @author Jan Bernitt
+ */
+@Data
+@Accessors(chain = true)
+public class JobRunErrorsParams {
+
+ @OpenApi.Ignore @CheckForNull private UID job;
+
+ /** The user that ran the job */
+ @OpenApi.Property({UID.class, User.class})
+ @CheckForNull
+ private UID user;
+
+ /** The earliest date the job ran that should be included */
+ @CheckForNull private Date from;
+
+ /** The latest date the job ran that should be included */
+ @CheckForNull private Date to;
+
+ /** The codes to select, any match combined */
+ @CheckForNull private List code;
+
+ /** The object with errors to select, any match combined */
+ @CheckForNull private List object;
+
+ /** The {@link JobType} with errors to select, any match combined */
+ @CheckForNull private List type;
+}
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/CurrentUserService.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/CurrentUserService.java
index 1c560dd94c4d..df8ca46c6d5c 100644
--- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/CurrentUserService.java
+++ b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/CurrentUserService.java
@@ -73,6 +73,7 @@ public String getCurrentUsername() {
return CurrentUserUtil.getCurrentUsername();
}
+ @Transactional(readOnly = true)
public User getCurrentUser() {
String username = CurrentUserUtil.getCurrentUsername();
diff --git a/dhis-2/dhis-services/dhis-service-administration/pom.xml b/dhis-2/dhis-services/dhis-service-administration/pom.xml
index db0a5aa361f9..9b4523cb4c35 100644
--- a/dhis-2/dhis-services/dhis-service-administration/pom.xml
+++ b/dhis-2/dhis-services/dhis-service-administration/pom.xml
@@ -101,8 +101,8 @@
test