Skip to content

Commit de55788

Browse files
fix(ui): revert backend breaking changes to mau (datahub-project#12461)
1 parent 35e2bbb commit de55788

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,8 @@ private TimeSeriesChart getActiveUsersTimeSeriesChart(
8585
final String title,
8686
final DateInterval interval) {
8787

88-
final DateRange dateRange;
89-
90-
// adjust month to show 1st of month rather than last day of previous month
91-
if (interval == DateInterval.MONTH) {
92-
dateRange =
93-
new DateRange(
94-
String.valueOf(beginning.plusDays(1).getMillis()), // Shift start by 1 day
95-
String.valueOf(end.plusDays(1).getMillis()) // Shift end by 1 day
96-
);
97-
} else {
98-
// week display starting Sundays
99-
dateRange =
100-
new DateRange(String.valueOf(beginning.getMillis()), String.valueOf(end.getMillis()));
101-
}
88+
final DateRange dateRange =
89+
new DateRange(String.valueOf(beginning.getMillis()), String.valueOf(end.getMillis()));
10290

10391
final List<NamedLine> timeSeriesLines =
10492
_analyticsService.getTimeseriesChart(

datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/utils/DateUtilTest.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,4 @@ public void testStartOfNextWeek() {
4747
Mockito.when(dateUtil.getNow()).thenReturn(setTimeParts(8, false));
4848
assertEqualStartOfNextWeek(dateUtil, 9);
4949
}
50-
51-
// validates logic to display correct dates in MAU chart
52-
@Test
53-
public void testDateAdjustmentsForMonth() {
54-
DateUtil dateUtil = Mockito.spy(DateUtil.class);
55-
56-
Mockito.when(dateUtil.getNow()).thenReturn(new DateTime(2024, 11, 15, 0, 0, 0));
57-
58-
// start date should be next month minus a day
59-
// but we want to display Dec 1 instead of Nov 30, so add a day and verify it's Dec
60-
DateTime startOfNextMonthMinus12 = dateUtil.getStartOfNextMonth().minusMonths(12);
61-
DateTime adjustedStart = startOfNextMonthMinus12.minusMillis(1).plusDays(1);
62-
assertEquals(12, adjustedStart.getMonthOfYear()); // Verify it is December
63-
assertEquals(2023, adjustedStart.getYear()); // Verify it is 2023
64-
65-
// verify that the end date displays correctly
66-
// the chart will display Oct 1 as the last month because we don't show current month
67-
DateTime startOfThisMonth = dateUtil.getStartOfThisMonth();
68-
DateTime adjustedEnd = startOfThisMonth.minusMillis(1).plusDays(1);
69-
assertEquals(11, adjustedEnd.getMonthOfYear()); // Verify it is November
70-
assertEquals(2024, adjustedEnd.getYear()); // Verify it is 2024
71-
}
7250
}

0 commit comments

Comments
 (0)