Skip to content

feat!: Add submitting user to change request downloads #1963

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

Open
kekey1 wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

feat!: Add submitting user to change request downloads #1963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions ...va/gov/healthit/chpl/scheduler/job/changerequest/presenter/ChangeRequestCsvPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.apache.logging.log4j.Logger;

import gov.healthit.chpl.changerequest.domain.ChangeRequest;
import gov.healthit.chpl.changerequest.domain.ChangeRequestStatus;

public abstract class ChangeRequestCsvPresenter implements AutoCloseable {
protected static final String DEV_NAME_HEADING = "Developer Name";
Expand Down Expand Up @@ -73,6 +76,14 @@ public synchronized void add(ChangeRequest data) throws IOException {
}
}

protected String getSubmitterEmail(ChangeRequest changeRequest) {
List<ChangeRequestStatus> orderedStatuses = changeRequest.getStatuses().stream()
.sorted(Comparator.comparing(ChangeRequestStatus::getStatusChangeDateTime))
.collect(Collectors.toList());
//the oldest status is the submitting user
return orderedStatuses.get(0).getActingUser() == null ? "" : orderedStatuses.get(0).getActingUser();
}

public void close() throws IOException {
logger.info("Closing the CSV file.");
csvPrinter.close();
Expand Down
3 changes: 2 additions & 1 deletion ...ealthit/chpl/scheduler/job/changerequest/presenter/DownloadableDemographicsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ protected List<String> generateHeaderValues() {
DEV_CONTACT_PHONE_HEADING,
CR_TYPE_HEADING,
CR_STATUS_HEADING,
CR_SUBMITTER_EMAIL_HEADING,
CR_CREATED_DATE_HEADING,
CR_LAST_UPDATED_DATE_HEADING,
CR_ACBS_HEADING)
Expand All @@ -50,12 +51,12 @@ protected List<String> generateRowValue(ChangeRequest changeRequest) {
}
result.add(changeRequest.getChangeRequestType().getName());
result.add(changeRequest.getCurrentStatus().getChangeRequestStatusType().getName());
result.add(getSubmitterEmail(changeRequest));
result.add(DateUtil.formatInEasternTime(changeRequest.getSubmittedDateTime()));
result.add(DateUtil.formatInEasternTime(changeRequest.getCurrentStatus().getStatusChangeDateTime()));
result.add(changeRequest.getCertificationBodies().stream()
.map(acb -> acb.getName())
.collect(Collectors.joining("; ")));
return result;
}

}
2 changes: 2 additions & 0 deletions .../healthit/chpl/scheduler/job/changerequest/presenter/DownloadableListingUrlPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ protected List<String> generateHeaderValues() {
DEV_CONTACT_PHONE_HEADING,
CR_TYPE_HEADING,
CR_STATUS_HEADING,
CR_SUBMITTER_EMAIL_HEADING,
CR_CREATED_DATE_HEADING,
CR_LAST_UPDATED_DATE_HEADING,
CR_ACBS_HEADING,
Expand All @@ -50,6 +51,7 @@ protected List<String> generateRowValue(ChangeRequest changeRequest) {
}
result.add(changeRequest.getChangeRequestType().getName());
result.add(changeRequest.getCurrentStatus().getChangeRequestStatusType().getName());
result.add(getSubmitterEmail(changeRequest));
result.add(DateUtil.formatInEasternTime(changeRequest.getSubmittedDateTime()));
result.add(DateUtil.formatInEasternTime(changeRequest.getCurrentStatus().getStatusChangeDateTime()));
result.add(changeRequest.getCertificationBodies().stream()
Expand Down
2 changes: 2 additions & 0 deletions ...ov/healthit/chpl/scheduler/job/changerequest/presenter/PendingChangeRequestPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ protected List<String> generateHeaderValues() {
DEV_CONTACT_PHONE_HEADING,
CR_TYPE_HEADING,
CR_STATUS_HEADING,
CR_SUBMITTER_EMAIL_HEADING,
CR_CREATED_DATE_HEADING,
CR_DAYS_OPEN_HEADING,
CR_LAST_UPDATED_DATE_HEADING,
Expand All @@ -68,6 +69,7 @@ protected List<String> generateRowValue(ChangeRequest changeRequest) {
}
row.add(changeRequest.getChangeRequestType().getName());
row.add(changeRequest.getCurrentStatus().getChangeRequestStatusType().getName());
row.add(getSubmitterEmail(changeRequest));
row.add(DateUtil.formatInEasternTime(changeRequest.getSubmittedDateTime()));
row.add(calculateDaysOpen(changeRequest));
row.add(DateUtil.formatInEasternTime(changeRequest.getCurrentStatus().getStatusChangeDateTime()));
Expand Down
Loading