Skip to content

Added HR tab for canned reports using ETL #68

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Added HR tab for canned reports using ETL #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbda0f2
avniproject/avni-product#1334 | added suggested changes:
ak2502 Sep 16, 2023
a5af384
avniproject/avni-product#1334 | added schemaName directly into Report…
ak2502 Sep 16, 2023
abd284d
avniproject/avni-product#1334 | removed userIds from ReportController
ak2502 Sep 16, 2023
2a03014
avniproject/avni-product#1334 | removed userIds from ReportController
ak2502 Sep 16, 2023
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
75 changes: 21 additions & 54 deletions src/main/java/org/avniproject/etl/controller/ReportController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.avniproject.etl.controller;

import org.avniproject.etl.domain.OrgIdentityContextHolder;
import org.avniproject.etl.dto.AggregateReportResult;
import org.avniproject.etl.dto.UserActivityDTO;
import org.avniproject.etl.repository.ReportRepository;
Expand All @@ -25,124 +24,92 @@ public ReportController(ReportRepository reportRepository, ReportUtil reportUtil

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/aggregate/summaryTable", method = RequestMethod.GET)
public List<UserActivityDTO> getSummaryTable(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds){
return reportRepository.generateSummaryTable(
OrgIdentityContextHolder.getDbSchema()
);
public List<UserActivityDTO> getSummaryTable(){
return reportRepository.generateSummaryTable();
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "report/hr/userActivity", method = RequestMethod.GET)
public List<UserActivityDTO> getUserActivity(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds){
@RequestParam(value = "endDate", required = false) String endDate){
return reportRepository.generateUserActivity(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateDynamicWhere(startDate, endDate, "registration_date"),
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"),
reportUtil.getDateDynamicWhere(startDate, endDate, "enrolment_date_time"),
reportUtil.getDynamicUserWhere(userIds, "u.id")
);
reportUtil.getDateDynamicWhere(startDate, endDate, "enrolment_date_time"));
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/syncFailures",method = RequestMethod.GET)
public List<UserActivityDTO> getUserWiseSyncFailures(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds){
@RequestParam(value = "endDate", required = false) String endDate){
return reportRepository.generateUserSyncFailures(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateDynamicWhere(startDate, endDate, "st.sync_start_time"),
reportUtil.getDynamicUserWhere(userIds, "u.id")
reportUtil.getDateDynamicWhere(startDate, endDate, "st.sync_start_time")
);
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/deviceModels", method = RequestMethod.GET)
public List<AggregateReportResult> getUserWiseDeviceModels(@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
public List<AggregateReportResult> getUserWiseDeviceModels() {

return reportRepository.generateUserDeviceModels(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDynamicUserWhere(userIds, "u.id"));
return reportRepository.generateUserDeviceModels();
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/appVersions", method = RequestMethod.GET)
public List<AggregateReportResult> getUserWiseAppVersions(@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
public List<AggregateReportResult> getUserWiseAppVersions() {

return reportRepository.generateUserAppVersions(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDynamicUserWhere(userIds, "u.id"));
return reportRepository.generateUserAppVersions();
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/userDetails", method = RequestMethod.GET)
public List<UserActivityDTO> getUserDetails(@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
public List<UserActivityDTO> getUserDetails() {

return reportRepository.generateUserDetails(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDynamicUserWhere(userIds, "u.id"));
return reportRepository.generateUserDetails();
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/latestSyncs", method = RequestMethod.GET)
public List<UserActivityDTO> getLatestSyncs(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
@RequestParam(value = "endDate", required = false) String endDate) {

return reportRepository.generateLatestSyncs(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateDynamicWhere(startDate, endDate, "st.sync_end_time"),
reportUtil.getDynamicUserWhere(userIds, "u.id"));
reportUtil.getDateDynamicWhere(startDate, endDate, "st.sync_end_time"));
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/medianSync", method = RequestMethod.GET)
public List<UserActivityDTO> getMedianSync(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
@RequestParam(value = "endDate", required = false) String endDate) {

return reportRepository.generateMedianSync(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateSeries(startDate, endDate));
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/championUsers", method = RequestMethod.GET)
public List<AggregateReportResult> getChampionUsers(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
@RequestParam(value = "endDate", required = false) String endDate) {
return reportRepository.generateCompletedVisitsOnTimeByProportion(
">= 0.5",
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"),
reportUtil.getDynamicUserWhere(userIds, "u.id"));
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"));
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/nonPerformingUsers", method = RequestMethod.GET)
public List<AggregateReportResult> getNonPerformingUsers(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
@RequestParam(value = "endDate", required = false) String endDate) {
return reportRepository.generateCompletedVisitsOnTimeByProportion(
"<= 0.5",
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"),
reportUtil.getDynamicUserWhere(userIds, "u.id")
);
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"));
}

@PreAuthorize("hasAnyAuthority('analytics_user')")
@RequestMapping(value = "/report/hr/mostCancelled", method = RequestMethod.GET)
public List<AggregateReportResult> getUsersCancellingMostVisits(@RequestParam(value = "startDate", required = false) String startDate,
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "userIds", required = false, defaultValue = "") List<Long> userIds) {
@RequestParam(value = "endDate", required = false) String endDate) {
return reportRepository.generateUserCancellingMostVisits(
OrgIdentityContextHolder.getDbSchema(),
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"),
reportUtil.getDynamicUserWhere(userIds, "u.id"));
reportUtil.getDateDynamicWhere(startDate, endDate, "encounter_date_time"));
}


Expand Down
Loading