Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history 
Refactor methods in `AbstractGhantChartManagerImpl.java`, `AdminChartDataManagerImpl.java`, and `DecisionChartDataManagerImpl.java` to simplify complex code and increase branch coverage.

* **AbstractGhantChartManagerImpl.java**
  - Refactor `createRoleGhant` method to use helper methods for filtering and sorting.
  - Extract logic for creating Gantt chart into a separate method.
  - Simplify conditional logic in `createRoleGhant` method.

* **AdminChartDataManagerImpl.java**
  - Refactor `createApplicationActionEventPageDailySummaryChart` method to use helper methods for data processing.
  - Extract logic for creating chart into a separate method.
  - Simplify conditional logic in `createApplicationActionEventPageDailySummaryChart` method.
  - Refactor `createApplicationActionEventPageModeDailySummaryChart` method to use helper methods for data processing.
  - Extract logic for creating chart into a separate method.
  - Simplify conditional logic in `createApplicationActionEventPageModeDailySummaryChart` method.
  - Refactor `createApplicationSessionPageDailySummaryChart` method to use helper methods for data processing.
  - Extract logic for creating chart into a separate method.
  - Simplify conditional logic in `createApplicationSessionPageDailySummaryChart` method.

* **DecisionChartDataManagerImpl.java**
  - Refactor `createDecisionTypeChart` method to use helper methods for data processing.
  - Extract logic for creating chart into a separate method.
  - Simplify conditional logic in `createDecisionTypeChart` method.

---

For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/Hack23/cia?shareId=XXXX-XXXX-XXXX-XXXX).
  • Loading branch information
@pethers
pethers committed Jan 3, 2025
1 parent 33277ef commit 95a8878
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 69 deletions.
23 changes: 17 additions & 6 deletions ...web/impl/ui/application/views/common/chartfactory/impl/AbstractGhantChartManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,30 @@ private Gantt createGenericGantt(final List<T> assignmentList, final Function<T,
*/
public final void createRoleGhant(final AbstractOrderedLayout roleSummaryLayoutTabsheet, final Collection<T> assignmentList) {

final List<T> list = filterAndSortAssignments(assignmentList);

final Gantt createGantt = createGenericGantt(list, getRoleMapping(), getStepMapping());
roleSummaryLayoutTabsheet.addComponent(createGantt);
roleSummaryLayoutTabsheet.setExpandRatio(createGantt, ContentRatio.GRID);

}

/**
* Filter and sort assignments.
*
* @param assignmentList
* the assignment list
* @return the list
*/
private List<T> filterAndSortAssignments(final Collection<T> assignmentList) {
final Comparator<T> compare = getComparator();

final List<T> list = assignmentList.stream().filter(
(final T x) -> new DateTime(getStepMapping().getFromDate(x).getTime()).getYear() > FILTER_DATA_BEFORE_YEAR)
.collect(Collectors.toList());

Collections.sort(list, compare);

final Gantt createGantt = createGenericGantt(list, getRoleMapping(), getStepMapping());
roleSummaryLayoutTabsheet.addComponent(createGantt);
roleSummaryLayoutTabsheet.setExpandRatio(createGantt, ContentRatio.GRID);

return list;
}

/**
Expand Down Expand Up @@ -335,7 +347,6 @@ public interface StepMapping<T> {
* Gets the to date.
*
* @param t
* the t
* @return the to date
*/
Date getToDate(T t);
Expand Down
65 changes: 23 additions & 42 deletions ...cia/web/impl/ui/application/views/common/chartfactory/impl/AdminChartDataManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed on an "AS IS" BASIS,
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
Expand Down Expand Up @@ -95,34 +95,36 @@ private static void addViewApplicationActionEventPageElementDailySummaryValues(f
*/
@Override
public void createApplicationActionEventPageDailySummaryChart(final AbstractOrderedLayout layout) {

final Map<String, List<ViewApplicationActionEventPageDailySummary>> map = getApplicationActionEventPageDailySummaryMap();

final DataSeries dataSeries = new DataSeries();

final Series series = new Series();
addDataToSeries(map, dataSeries, series);
addChart(layout, "Application Action Events daily Summary",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLogYAxisLegendOutside(series)).show(),
true);
}

/**
* Adds data to series.
*
* @param map the map
* @param dataSeries the data series
* @param series the series
*/
private void addDataToSeries(final Map<String, List<ViewApplicationActionEventPageDailySummary>> map,
final DataSeries dataSeries, final Series series) {
for (final Entry<String, List<ViewApplicationActionEventPageDailySummary>> entry : map.entrySet()) {

if (entry.getKey() != null) {
series.addSeries(new XYseries().setLabel(entry.getKey()));

dataSeries.newSeries();
final List<ViewApplicationActionEventPageDailySummary> list = entry.getValue();
for (final ViewApplicationActionEventPageDailySummary dataSummaryDaily : list) {
dataSeries.add(
DateUtils.formatDate(
dataSummaryDaily.getEmbeddedId().getCreatedDate()),
dataSeries.add(DateUtils.formatDate(dataSummaryDaily.getEmbeddedId().getCreatedDate()),
dataSummaryDaily.getHits());
}
}

}

addChart(layout, "Application Action Events daily Summary",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLogYAxisLegendOutside(series)).show(),
true);
}

/**
Expand Down Expand Up @@ -161,28 +163,11 @@ public void createApplicationActionEventPageElementDailySummaryChart(final Abstr
@Override
public void createApplicationActionEventPageModeDailySummaryChart(final AbstractOrderedLayout layout,
final String page) {

final Map<String, List<ViewApplicationActionEventPageModeDailySummary>> map = getApplicationActionEventPageModeDailySummaryMap(
page);

final DataSeries dataSeries = new DataSeries();

final Series series = new Series();

for (final Entry<String, List<ViewApplicationActionEventPageModeDailySummary>> entry : map.entrySet()) {

if (entry.getKey() != null) {
series.addSeries(new XYseries().setLabel(entry.getKey()));

dataSeries.newSeries();
final List<ViewApplicationActionEventPageModeDailySummary> list = entry.getValue();
for (final ViewApplicationActionEventPageModeDailySummary item : list) {
dataSeries.add(DateUtils.formatDate(item.getEmbeddedId().getCreatedDate()), item.getHits());
}
}

}

addDataToSeries(map, dataSeries, series);
addChart(layout, "Page Action Events daily Summary",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLogYAxisLegendOutside(series)).show(),
Expand Down Expand Up @@ -254,21 +239,17 @@ private Map<String, List<ViewApplicationActionEventPageModeDailySummary>> getApp
*/
@Override
public void createApplicationSessionPageDailySummaryChart(final VerticalLayout layout) {

final DataContainer<ApplicationSession, Serializable> dataContainer = getApplicationManager().getDataContainer(ApplicationSession.class);
final Map <String,Long> sessionByDayMap = dataContainer.getAll().stream()
.collect(Collectors.groupingBy(p -> DateUtils.formatDate(p.getCreatedDate()), Collectors.counting()));

final DataContainer<ApplicationSession, Serializable> dataContainer = getApplicationManager()
.getDataContainer(ApplicationSession.class);
final Map<String, Long> sessionByDayMap = dataContainer.getAll().stream()
.collect(Collectors.groupingBy(p -> DateUtils.formatDate(p.getCreatedDate()), Collectors.counting()));
final DataSeries dataSeries = new DataSeries();
final Series series = new Series();
series.addSeries(new XYseries().setLabel("Daily Active Users"));
dataSeries.newSeries();
for (final Entry<String, Long> entry : sessionByDayMap.entrySet()) {
dataSeries.add(
entry.getKey(),
entry.getValue());
dataSeries.add(entry.getKey(), entry.getValue());
}

addChart(layout, "Application Active Daily Users",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLogYAxisLegendOutside(series)).show(),
Expand Down
35 changes: 15 additions & 20 deletions .../web/impl/ui/application/views/common/chartfactory/impl/DecisionChartDataManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,31 +95,35 @@ private static void addDecisionTypeByOrgData(final DataSeries dataSeries,
*/
@Override
public void createDecisionTypeChart(final AbstractOrderedLayout content) {

final Map<String, List<ViewRiksdagenCommitteeDecisionTypeDailySummary>> decisionTypeMap = getCommitteeDecisionTypeMap();

final DataSeries dataSeries = new DataSeries();

final Series series = new Series();
addDecisionTypeData(decisionTypeMap, dataSeries, series);
addChart(content, "Decision type daily summary",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLegendInsideOneColumn(series)).show(),
true);
}

/**
* Adds the decision type data.
*
* @param decisionTypeMap the decision type map
* @param dataSeries the data series
* @param series the series
*/
private void addDecisionTypeData(final Map<String, List<ViewRiksdagenCommitteeDecisionTypeDailySummary>> decisionTypeMap,
final DataSeries dataSeries, final Series series) {
for (final Entry<String, List<ViewRiksdagenCommitteeDecisionTypeDailySummary>> decisionTypeEntry : decisionTypeMap.entrySet()) {

if (decisionTypeEntry.getKey() != null) {
series.addSeries(new XYseries().setLabel(decisionTypeEntry.getKey()));

dataSeries.newSeries();
final List<ViewRiksdagenCommitteeDecisionTypeDailySummary> list = decisionTypeEntry.getValue();
for (final ViewRiksdagenCommitteeDecisionTypeDailySummary item : list) {
dataSeries.add(DateUtils.formatDate(item.getEmbeddedId().getDecisionDate()), item.getTotal());
}
}

}

addChart(content, "Decision type daily summary",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLegendInsideOneColumn(series)).show(),
true);
}

/**
Expand All @@ -130,24 +134,17 @@ public void createDecisionTypeChart(final AbstractOrderedLayout content) {
*/
@Override
public void createDecisionTypeChart(final AbstractOrderedLayout content, final String org) {

final DataSeries dataSeries = new DataSeries();
final Series series = new Series();

final Map<String, List<ViewRiksdagenCommitteeDecisionTypeOrgDailySummary>> allMap = getCommitteeDecisionTypeOrgMap();

final List<ViewRiksdagenCommitteeDecisionTypeOrgDailySummary> itemList = allMap
.get(org.toUpperCase(Locale.ENGLISH).replace(UNDER_SCORE, EMPTY_STRING).trim());

if (itemList != null) {

final Map<String, List<ViewRiksdagenCommitteeDecisionTypeOrgDailySummary>> decisionTypeMap = itemList.parallelStream()
.filter(t -> t != null && t.getEmbeddedId().getDecisionDate() != null)
.collect(Collectors.groupingBy(t -> t.getEmbeddedId().getDecisionType()));

addDecisionTypeByOrgData(dataSeries, series, decisionTypeMap);
}

addChart(content, "Org Decision type daily summary",
new DCharts().setDataSeries(dataSeries)
.setOptions(getChartOptions().createOptionsXYDateFloatLegendInsideOneColumn(series)).show(),
Expand All @@ -162,7 +159,6 @@ public void createDecisionTypeChart(final AbstractOrderedLayout content, final S
private Map<String, List<ViewRiksdagenCommitteeDecisionTypeDailySummary>> getCommitteeDecisionTypeMap() {
final DataContainer<ViewRiksdagenCommitteeDecisionTypeDailySummary, RiksdagenCommitteeDecisionTypeSummaryEmbeddedId> committeeBallotDecisionPartyDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenCommitteeDecisionTypeDailySummary.class);

final Date now = new Date();
final Date notBefore = new GregorianCalendar(2000, Calendar.JANUARY, 1).getTime();
return committeeBallotDecisionPartyDataContainer.getAll().parallelStream()
Expand All @@ -179,7 +175,6 @@ private Map<String, List<ViewRiksdagenCommitteeDecisionTypeDailySummary>> getCom
private Map<String, List<ViewRiksdagenCommitteeDecisionTypeOrgDailySummary>> getCommitteeDecisionTypeOrgMap() {
final DataContainer<ViewRiksdagenCommitteeDecisionTypeOrgDailySummary, RiksdagenCommitteeDecisionTypeOrgSummaryEmbeddedId> committeeBallotDecisionPartyDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenCommitteeDecisionTypeOrgDailySummary.class);

return committeeBallotDecisionPartyDataContainer.getAll().parallelStream().filter(Objects::nonNull)
.collect(Collectors.groupingBy(t -> t.getEmbeddedId().getOrg()));
}
Expand Down
2 changes: 1 addition & 1 deletion .../web/impl/ui/application/views/common/chartfactory/impl/DecisionFlowChartManagerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,4 +412,4 @@ private static void addDecisionDetails(
}
}

}
}

0 comments on commit 95a8878

Please sign in to comment.