From 186a97a2bc8efd5d5f350eacdb9288cad2dafc64 Mon Sep 17 00:00:00 2001 From: Zhang Ziqing Date: Tue, 12 Mar 2024 09:56:35 +0800 Subject: [PATCH 01/95] Enable CI on account request form branch --- .github/workflows/axe.yml | 2 ++ .github/workflows/component.yml | 2 ++ .github/workflows/e2e-sql.yml | 2 ++ .github/workflows/e2e.yml | 2 ++ .github/workflows/jdk17.yml | 1 + .github/workflows/lnp.yml | 1 + .github/workflows/pr.yml | 1 + 7 files changed, 11 insertions(+) diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml index 771dd8a3edc..bee66fbcfc3 100644 --- a/.github/workflows/axe.yml +++ b/.github/workflows/axe.yml @@ -5,10 +5,12 @@ on: branches: - master - release + - account-request-form pull_request: branches: - master - release + - account-request-form jobs: axe-testing: runs-on: ubuntu-latest diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml index 11ecfb7357f..bb814a02c0e 100644 --- a/.github/workflows/component.yml +++ b/.github/workflows/component.yml @@ -5,10 +5,12 @@ on: branches: - master - release + - account-request-form pull_request: branches: - master - release + - account-request-form schedule: - cron: "0 0 * * *" #end of every day jobs: diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml index 0a67cbac52d..267cd0d219f 100644 --- a/.github/workflows/e2e-sql.yml +++ b/.github/workflows/e2e-sql.yml @@ -5,10 +5,12 @@ on: branches: - master - release + - account-request-form pull_request: branches: - master - release + - account-request-form schedule: - cron: "0 0 * * *" #end of every day jobs: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 52ab76019ed..71cfa72bd24 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -5,10 +5,12 @@ on: branches: - master - release + - account-request-form pull_request: branches: - master - release + - account-request-form schedule: - cron: "0 0 * * *" #end of every day jobs: diff --git a/.github/workflows/jdk17.yml b/.github/workflows/jdk17.yml index 29ab59bb561..f0d68910de5 100644 --- a/.github/workflows/jdk17.yml +++ b/.github/workflows/jdk17.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - account-request-form jobs: lint: diff --git a/.github/workflows/lnp.yml b/.github/workflows/lnp.yml index 2ff33dda920..4389bac81ff 100644 --- a/.github/workflows/lnp.yml +++ b/.github/workflows/lnp.yml @@ -5,6 +5,7 @@ on: branches: - master - release + - account-request-form schedule: - cron: "0 0 * * *" # end of every day jobs: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 03f11d9b6d3..f55fd672fe0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,6 +6,7 @@ on: - reopened branches: - master + - account-request-form jobs: check-pr: From 17866eb4b93c3d773296ea2022cbf3ad96585a16 Mon Sep 17 00:00:00 2001 From: DS Date: Mon, 18 Mar 2024 11:14:43 +0800 Subject: [PATCH 02/95] [#11843] Create FeedbackSessionLog entity and cron job action (#12895) * Create FeedbackSessionLog entity * fix lint * Create UpdateFeedbackSessionLogsAction * Sort query results from logging service * Update type of feedbackSessionLogType * Fix naming * Fix enum in entity * Update filter to differentiate by session * Add Uri Info * Add tests * Update test case * Update to getOrderedFeedbackSessionLogs --- .../datatransfer/FeedbackSessionLogEntry.java | 7 +- .../java/teammates/common/util/Const.java | 2 + .../teammates/logic/api/LogsProcessor.java | 6 +- .../external/GoogleCloudLoggingService.java | 3 +- .../logic/external/LocalLoggingService.java | 3 +- .../teammates/logic/external/LogService.java | 4 +- .../java/teammates/sqllogic/api/Logic.java | 9 + .../storage/sqlentity/FeedbackSessionLog.java | 123 +++++++++++ .../teammates/ui/webapi/ActionFactory.java | 1 + .../webapi/GetFeedbackSessionLogsAction.java | 2 +- .../UpdateFeedbackSessionLogsAction.java | 64 ++++++ .../logic/api/MockLogsProcessor.java | 3 +- .../UpdateFeedbackSessionLogsActionTest.java | 207 ++++++++++++++++++ .../ui/webapi/GetActionClassesActionTest.java | 3 +- 14 files changed, 426 insertions(+), 11 deletions(-) create mode 100644 src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java create mode 100644 src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java create mode 100644 src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java diff --git a/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java b/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java index 1502071050e..ea95a6a951d 100644 --- a/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java +++ b/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java @@ -3,7 +3,7 @@ /** * Represents a log entry of a feedback session. */ -public class FeedbackSessionLogEntry { +public class FeedbackSessionLogEntry implements Comparable { private final String studentEmail; private final String feedbackSessionName; private final String feedbackSessionLogType; @@ -32,4 +32,9 @@ public String getFeedbackSessionLogType() { public long getTimestamp() { return this.timestamp; } + + @Override + public int compareTo(FeedbackSessionLogEntry o) { + return Long.compare(this.getTimestamp(), o.getTimestamp()); + } } diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index b24d0ded648..4aad059a211 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -401,6 +401,8 @@ public static class CronJobURIs { URI_PREFIX + "/feedbackSessionPublishedReminders"; public static final String AUTOMATED_USAGE_STATISTICS_COLLECTION = URI_PREFIX + "/calculateUsageStatistics"; + public static final String AUTOMATED_FEEDBACK_SESSION_LOGS_PROCESSING = + URI_PREFIX + "/updateFeedbackSessionLogs"; } /** diff --git a/src/main/java/teammates/logic/api/LogsProcessor.java b/src/main/java/teammates/logic/api/LogsProcessor.java index eac5f73f755..2f95021e441 100644 --- a/src/main/java/teammates/logic/api/LogsProcessor.java +++ b/src/main/java/teammates/logic/api/LogsProcessor.java @@ -51,12 +51,12 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam } /** - * Gets the feedback session logs as filtered by the given parameters. + * Gets the feedback session logs as filtered by the given parameters ordered by ascending timestamp. * @param email Can be null */ - public List getFeedbackSessionLogs(String courseId, String email, + public List getOrderedFeedbackSessionLogs(String courseId, String email, long startTime, long endTime, String fsName) { - return service.getFeedbackSessionLogs(courseId, email, startTime, endTime, fsName); + return service.getOrderedFeedbackSessionLogs(courseId, email, startTime, endTime, fsName); } /** diff --git a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java index 3c2b7000ce7..e48dbe6dad8 100644 --- a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java +++ b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java @@ -115,7 +115,7 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam } @Override - public List getFeedbackSessionLogs(String courseId, String email, + public List getOrderedFeedbackSessionLogs(String courseId, String email, long startTime, long endTime, String fsName) { List filters = new ArrayList<>(); if (courseId != null) { @@ -131,6 +131,7 @@ public List getFeedbackSessionLogs(String courseId, Str .withLogEvent(LogEvent.FEEDBACK_SESSION_AUDIT.name()) .withSeverityLevel(LogSeverity.INFO) .withExtraFilters(String.join("\n", filters)) + .withOrder(ASCENDING_ORDER) .build(); LogSearchParams logSearchParams = LogSearchParams.from(queryLogsParams) .addLogName(STDOUT_LOG_NAME) diff --git a/src/main/java/teammates/logic/external/LocalLoggingService.java b/src/main/java/teammates/logic/external/LocalLoggingService.java index 03c90f52b4a..16c04a3d0d0 100644 --- a/src/main/java/teammates/logic/external/LocalLoggingService.java +++ b/src/main/java/teammates/logic/external/LocalLoggingService.java @@ -209,7 +209,7 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam } @Override - public List getFeedbackSessionLogs(String courseId, String email, + public List getOrderedFeedbackSessionLogs(String courseId, String email, long startTime, long endTime, String fsName) { return FEEDBACK_SESSION_LOG_ENTRIES .getOrDefault(courseId, new ArrayList<>()) @@ -218,6 +218,7 @@ public List getFeedbackSessionLogs(String courseId, Str .filter(log -> fsName == null || log.getFeedbackSessionName().equals(fsName)) .filter(log -> log.getTimestamp() >= startTime) .filter(log -> log.getTimestamp() <= endTime) + .sorted() .collect(Collectors.toList()); } diff --git a/src/main/java/teammates/logic/external/LogService.java b/src/main/java/teammates/logic/external/LogService.java index 5a85c59fafb..ac79d13ab9d 100644 --- a/src/main/java/teammates/logic/external/LogService.java +++ b/src/main/java/teammates/logic/external/LogService.java @@ -22,8 +22,8 @@ public interface LogService { void createFeedbackSessionLog(String courseId, String email, String fsName, String fslType); /** - * Gets the feedback session logs as filtered by the given parameters. + * Gets the feedback session logs as filtered by the given parameters ordered by ascending timestamp. */ - List getFeedbackSessionLogs(String courseId, String email, + List getOrderedFeedbackSessionLogs(String courseId, String email, long startTime, long endTime, String fsName); } diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index a10fe1bae21..5cd50a10268 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -41,6 +41,7 @@ import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.FeedbackResponseComment; import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Notification; import teammates.storage.sqlentity.Section; @@ -1595,4 +1596,12 @@ public List getFeedbackSessionsClosingWithinTimeLimit() { public List getFeedbackSessionsOpeningWithinTimeLimit() { return feedbackSessionsLogic.getFeedbackSessionsOpeningWithinTimeLimit(); } + + /** + * Create feedback session logs. + */ + public void createFeedbackSessionLogs(List feedbackSessionLogs) + throws EntityAlreadyExistsException, InvalidParametersException { + // TODO: implement logic layer + } } diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java new file mode 100644 index 00000000000..61d54f3c8a1 --- /dev/null +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java @@ -0,0 +1,123 @@ +package teammates.storage.sqlentity; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.UUID; + +import teammates.common.datatransfer.logs.FeedbackSessionLogType; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +/** + * Represents a feedback session log. + */ +@Entity +@Table(name = "FeedbackSessionLogs") +public class FeedbackSessionLog extends BaseEntity { + @Id + private UUID id; + + @Column(nullable = false) + private String studentEmail; + + @Column(nullable = false) + private String feedbackSessionName; + + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private FeedbackSessionLogType feedbackSessionLogType; + + @Column(nullable = false) + private Instant timestamp; + + protected FeedbackSessionLog() { + // required by Hibernate + } + + public FeedbackSessionLog(String email, String feedbackSessionName, FeedbackSessionLogType feedbackSessionLogType, + Instant timestamp) { + this.setId(UUID.randomUUID()); + this.studentEmail = email; + this.feedbackSessionName = feedbackSessionName; + this.feedbackSessionLogType = feedbackSessionLogType; + this.timestamp = timestamp; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getStudentEmail() { + return studentEmail; + } + + public void setStudentEmail(String email) { + this.studentEmail = email; + } + + public String getFeedbackSessionName() { + return feedbackSessionName; + } + + public void setFeedbackSessionName(String feedbackSessionName) { + this.feedbackSessionName = feedbackSessionName; + } + + public FeedbackSessionLogType getFeedbackSessionLogType() { + return feedbackSessionLogType; + } + + public void setFeedbackSessionLogType(FeedbackSessionLogType feedbackSessionLogType) { + this.feedbackSessionLogType = feedbackSessionLogType; + } + + public Instant getTimestamp() { + return timestamp; + } + + public void setTimestamp(Instant timestamp) { + this.timestamp = timestamp; + } + + @Override + public String toString() { + return "FeedbackSessionLog [id=" + id + ", email=" + studentEmail + ", feedbackSessionName=" + + feedbackSessionName + + ", feedbackSessionLogType=" + feedbackSessionLogType.getLabel() + ", timestamp=" + timestamp + "]"; + } + + @Override + public int hashCode() { + return this.getId().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) { + return false; + } else if (this == other) { + return true; + } else if (this.getClass() == other.getClass()) { + FeedbackSessionLog otherFeedbackSessionLog = (FeedbackSessionLog) other; + return Objects.equals(this.getId(), otherFeedbackSessionLog.getId()); + } else { + return false; + } + } + + @Override + public List getInvalidityInfo() { + return new ArrayList<>(); + } +} diff --git a/src/main/java/teammates/ui/webapi/ActionFactory.java b/src/main/java/teammates/ui/webapi/ActionFactory.java index 38c4b00b753..48f595a7008 100644 --- a/src/main/java/teammates/ui/webapi/ActionFactory.java +++ b/src/main/java/teammates/ui/webapi/ActionFactory.java @@ -151,6 +151,7 @@ public final class ActionFactory { map(CronJobURIs.AUTOMATED_FEEDBACK_OPENING_SOON_REMINDERS, GET, FeedbackSessionOpeningSoonRemindersAction.class); map(CronJobURIs.AUTOMATED_USAGE_STATISTICS_COLLECTION, GET, CalculateUsageStatisticsAction.class); + map(CronJobURIs.AUTOMATED_FEEDBACK_SESSION_LOGS_PROCESSING, GET, UpdateFeedbackSessionLogsAction.class); // Task queue workers; use POST request // Reference: https://cloud.google.com/tasks/docs/creating-appengine-tasks diff --git a/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java b/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java index 72332d439e5..bddaeb6c780 100644 --- a/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java +++ b/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java @@ -135,7 +135,7 @@ public JsonResult execute() { } List fsLogEntries = - logsProcessor.getFeedbackSessionLogs(courseId, email, startTime, endTime, feedbackSessionName); + logsProcessor.getOrderedFeedbackSessionLogs(courseId, email, startTime, endTime, feedbackSessionName); if (isCourseMigrated(courseId)) { Map studentsMap = new HashMap<>(); diff --git a/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java b/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java new file mode 100644 index 00000000000..568852dd032 --- /dev/null +++ b/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java @@ -0,0 +1,64 @@ +package teammates.ui.webapi; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import teammates.common.datatransfer.FeedbackSessionLogEntry; +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Logger; +import teammates.common.util.TimeHelper; +import teammates.storage.sqlentity.FeedbackSessionLog; + +/** + * Process feedback session logs in the past defined time period and store in the database. + */ +public class UpdateFeedbackSessionLogsAction extends AdminOnlyAction { + + static final int COLLECTION_TIME_PERIOD = 60; // represents one hour + static final long SPAM_FILTER = 2000L; // in ms + private static final Logger log = Logger.getLogger(); + + @Override + public JsonResult execute() { + List filteredLogs = new ArrayList<>(); + + Instant endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); + Instant startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); + + List logEntries = logsProcessor.getOrderedFeedbackSessionLogs(null, null, + startTime.toEpochMilli(), endTime.toEpochMilli(), null); + + Map>> lastSavedTimestamps = new HashMap<>(); + for (FeedbackSessionLogEntry logEntry : logEntries) { + String email = logEntry.getStudentEmail(); + String fbSessionName = logEntry.getFeedbackSessionName(); + String type = logEntry.getFeedbackSessionLogType(); + Long timestamp = logEntry.getTimestamp(); + + lastSavedTimestamps.putIfAbsent(email, new HashMap<>()); + lastSavedTimestamps.get(email).putIfAbsent(fbSessionName, new HashMap<>()); + Long lastSaved = lastSavedTimestamps.get(email).get(fbSessionName).getOrDefault(type, 0L); + + if (Math.abs(timestamp - lastSaved) > SPAM_FILTER) { + lastSavedTimestamps.get(email).get(fbSessionName).put(type, timestamp); + FeedbackSessionLog fslEntity = new FeedbackSessionLog(email, fbSessionName, + FeedbackSessionLogType.valueOfLabel(type), Instant.ofEpochMilli(timestamp)); + filteredLogs.add(fslEntity); + } + } + + try { + sqlLogic.createFeedbackSessionLogs(filteredLogs); + } catch (InvalidParametersException | EntityAlreadyExistsException e) { + log.severe("Unexpected error", e); + } + + return new JsonResult("Successful"); + } +} diff --git a/src/test/java/teammates/logic/api/MockLogsProcessor.java b/src/test/java/teammates/logic/api/MockLogsProcessor.java index dc8a90ed9fd..f07a15d7701 100644 --- a/src/test/java/teammates/logic/api/MockLogsProcessor.java +++ b/src/test/java/teammates/logic/api/MockLogsProcessor.java @@ -102,8 +102,9 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam } @Override - public List getFeedbackSessionLogs(String courseId, String email, + public List getOrderedFeedbackSessionLogs(String courseId, String email, long startTime, long endTime, String fsName) { + feedbackSessionLogs.sort((x, y) -> x.compareTo(y)); return feedbackSessionLogs; } diff --git a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java new file mode 100644 index 00000000000..d244f7eeb62 --- /dev/null +++ b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java @@ -0,0 +1,207 @@ +package teammates.sqlui.webapi; + +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.verify; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.List; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.FeedbackSessionLogEntry; +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.common.util.TimeHelper; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.ui.webapi.UpdateFeedbackSessionLogsAction; + +/** + * SUT: {@link UpdateFeedbackSessionLogsAction}. + */ +public class UpdateFeedbackSessionLogsActionTest + extends BaseActionTest { + + static final int COLLECTION_TIME_PERIOD = 60; // represents one hour + static final long SPAM_FILTER = 2000L; // in ms + + String student1 = "student1"; + String student2 = "student2"; + + String feedbackSession1 = "fs1"; + String feedbackSession2 = "fs2"; + + Instant endTime; + Instant startTime; + + @Override + protected String getActionUri() { + return Const.CronJobURIs.AUTOMATED_FEEDBACK_SESSION_LOGS_PROCESSING; + } + + @Override + String getRequestMethod() { + return GET; + } + + @BeforeMethod + void setUp() { + endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); + startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); + mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, "").clear(); + } + + @Test + public void testExecute_noRecentLogs_noLogsCreated() + throws EntityAlreadyExistsException, InvalidParametersException { + UpdateFeedbackSessionLogsAction action = getAction(); + action.execute(); + + verify(mockLogic) + .createFeedbackSessionLogs(argThat(filteredLogs -> filteredLogs.size() == 0)); + } + + @Test + public void testExecute_recentLogsNoSpam_allLogsCreated() + throws EntityAlreadyExistsException, InvalidParametersException { + // Different Types + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.SUBMISSION.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.VIEW_RESULT.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + + // Different feedback sessions + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(600).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession2, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(600).toEpochMilli()); + + // Different Student + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(900).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(student2, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(900).toEpochMilli()); + + // Gap is larger than spam filter + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + + UpdateFeedbackSessionLogsAction action = getAction(); + action.execute(); + + // method returns all logs regardless of params + List expected = + mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, ""); + + verify(mockLogic).createFeedbackSessionLogs( + argThat(filteredLogs -> isEqualExceptId(expected, filteredLogs))); + } + + @Test + public void testExecute_recentLogsWithSpam_someLogsCreated() + throws EntityAlreadyExistsException, InvalidParametersException { + // Gap is smaller than spam filter + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER - 2).toEpochMilli()); + + // Filters multiple logs within one spam window + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER - 1).toEpochMilli()); + + // Correctly adds new log after filtering + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + + // Filters out spam in the new window + mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 2).toEpochMilli()); + + UpdateFeedbackSessionLogsAction action = getAction(); + action.execute(); + + List expected = new ArrayList<>(); + expected.add(new FeedbackSessionLogEntry(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(student1, feedbackSession1, + FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); + + verify(mockLogic).createFeedbackSessionLogs( + argThat(filteredLogs -> isEqualExceptId(expected, filteredLogs))); + } + + @Test + public void testSpecificAccessControl_isAdmin_canAccess() { + loginAsAdmin(); + verifyCanAccess(); + } + + @Test + public void testSpecificAccessControl_isInstructor_cannotAccess() { + loginAsInstructor("user-id"); + verifyCannotAccess(); + } + + @Test + public void testSpecificAccessControl_isStudent_cannotAccess() { + loginAsStudent("user-id"); + verifyCannotAccess(); + } + + @Test + public void testSpecificAccessControl_loggedOut_cannotAccess() { + logoutUser(); + verifyCannotAccess(); + } + + private Boolean isEqualExceptId(List expected, + List actual) { + if (expected.size() != actual.size()) { + return false; + } + + for (int i = 0; i < expected.size(); i++) { + FeedbackSessionLogEntry expectedEntry = expected.get(i); + FeedbackSessionLog actualLog = actual.get(i); + + if (!expectedEntry.getStudentEmail().equals(actualLog.getStudentEmail())) { + return false; + } + if (!expectedEntry.getFeedbackSessionName() + .equals(actualLog.getFeedbackSessionName())) { + return false; + } + if (!expectedEntry.getFeedbackSessionLogType() + .equals(actualLog.getFeedbackSessionLogType().getLabel())) { + return false; + } + if (expectedEntry.getTimestamp() != actualLog.getTimestamp().toEpochMilli()) { + return false; + } + } + + return true; + } +} diff --git a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java index 2c989868edc..fa8f5f9f2ef 100644 --- a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java +++ b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java @@ -140,7 +140,8 @@ protected void testExecute() { GetDeadlineExtensionAction.class, SendLoginEmailAction.class, PutSqlDataBundleAction.class, - DeleteSqlDataBundleAction.class + DeleteSqlDataBundleAction.class, + UpdateFeedbackSessionLogsAction.class ); List expectedActionClassesNames = expectedActionClasses.stream() .map(Class::getSimpleName) From 395bdd7bcdffdbdbbdf474eefa96fa09270541cd Mon Sep 17 00:00:00 2001 From: Jay Ting <65202977+jayasting98@users.noreply.github.com> Date: Tue, 19 Mar 2024 02:19:52 +0800 Subject: [PATCH 03/95] [#11878] Remove AccountRequest unique constraint (#12899) * Remove AccountRequest unique constraint * Remove EntityAlreadyExistsException from the throws clause * Remove unused import of EntityAlreadyExistsException * Fix failing checks * Remove EntityAlreadyExistsException in dependents * Remove assertion that is now incorrect * Remove mysterious trailing whitespaces that appeared out of nowhere * Remove parts in E2E test that are no longer relevant * Remove unused import * Improve clarity of test case Co-authored-by: EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com> --------- Co-authored-by: EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com> --- .../e2e/cases/AdminHomePageE2ETest.java | 23 ------------------- .../storage/sqlapi/AccountRequestsDbIT.java | 11 +++++---- .../java/teammates/sqllogic/api/Logic.java | 2 +- .../sqllogic/core/AccountRequestsLogic.java | 6 ++--- .../storage/sqlapi/AccountRequestsDb.java | 12 +--------- .../storage/sqlentity/AccountRequest.java | 1 - .../ui/webapi/CreateAccountRequestAction.java | 4 ---- .../storage/sqlapi/AccountRequestsDbTest.java | 15 ++++-------- 8 files changed, 15 insertions(+), 59 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java index 6cfb6b478e0..56953689329 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java @@ -5,7 +5,6 @@ import teammates.common.util.AppUrl; import teammates.common.util.Const; import teammates.e2e.pageobjects.AdminHomePage; -import teammates.storage.sqlentity.AccountRequest; /** * SUT: {@link Const.WebPageURIs#ADMIN_HOME_PAGE}. @@ -50,28 +49,6 @@ public void testAll() { assertNotNull(BACKDOOR.getAccountRequest(email, institute)); BACKDOOR.deleteAccountRequest(email, institute); - - ______TS("Failure case: Instructor is already registered"); - AccountRequest registeredAccountRequest = sqlTestData.accountRequests.get("AHome.instructor1OfCourse1"); - homePage.queueInstructorForAdding(registeredAccountRequest.getName(), - registeredAccountRequest.getEmail(), registeredAccountRequest.getInstitute()); - - homePage.addAllInstructors(); - - failureMessage = homePage.getMessageForInstructor(2); - assertTrue(failureMessage.contains("Cannot create account request as instructor has already registered.")); - - ______TS("Success case: Reset account request"); - - homePage.clickMoreInfoButtonForRegisteredInstructor(2); - homePage.clickResetAccountRequestLink(); - - successMessage = homePage.getMessageForInstructor(2); - assertTrue(successMessage.contains( - "Instructor \"" + registeredAccountRequest.getName() + "\" has been successfully created")); - - assertNull(BACKDOOR.getAccountRequest( - registeredAccountRequest.getEmail(), registeredAccountRequest.getInstitute()).getRegisteredAt()); } } diff --git a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java index 8af4c8065df..c2aa8aef078 100644 --- a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java @@ -4,7 +4,6 @@ import org.testng.annotations.Test; -import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess; import teammates.storage.sqlapi.AccountRequestsDb; @@ -51,21 +50,23 @@ public void testCreateReadDeleteAccountRequest() throws Exception { accountRequest.getCreatedAt().minusMillis(2000)); assertEquals(0, actualAccReqCreatedAtOutside.size()); - ______TS("Create acccount request, already exists, execption thrown"); + ______TS("Create account request, same email address and institute already exist, creates successfully"); AccountRequest identicalAccountRequest = new AccountRequest("test@gmail.com", "name", "institute"); assertNotSame(accountRequest, identicalAccountRequest); - assertThrows(EntityAlreadyExistsException.class, - () -> accountRequestDb.createAccountRequest(identicalAccountRequest)); + accountRequestDb.createAccountRequest(identicalAccountRequest); + AccountRequest actualIdenticalAccountRequest = + accountRequestDb.getAccountRequestByRegistrationKey(identicalAccountRequest.getRegistrationKey()); + verifyEquals(identicalAccountRequest, actualIdenticalAccountRequest); ______TS("Delete account request that was created"); accountRequestDb.deleteAccountRequest(accountRequest); AccountRequest actualAccountRequest = - accountRequestDb.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); + accountRequestDb.getAccountRequestByRegistrationKey(accountRequest.getRegistrationKey()); assertNull(actualAccountRequest); } diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index a10fe1bae21..121257a6601 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -89,7 +89,7 @@ public static Logic inst() { * @throws EntityAlreadyExistsException if the account request already exists. */ public AccountRequest createAccountRequest(String name, String email, String institute) - throws InvalidParametersException, EntityAlreadyExistsException { + throws InvalidParametersException { return accountRequestLogic.createAccountRequest(name, email, institute); } diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index fd7742b3a73..0465e061519 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -2,7 +2,6 @@ import java.util.List; -import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; @@ -51,8 +50,7 @@ public void putDocument(AccountRequest accountRequest) throws SearchServiceExcep /** * Creates an account request. */ - public AccountRequest createAccountRequest(AccountRequest accountRequest) - throws InvalidParametersException, EntityAlreadyExistsException { + public AccountRequest createAccountRequest(AccountRequest accountRequest) throws InvalidParametersException { return accountRequestDb.createAccountRequest(accountRequest); } @@ -60,7 +58,7 @@ public AccountRequest createAccountRequest(AccountRequest accountRequest) * Creates an account request. */ public AccountRequest createAccountRequest(String name, String email, String institute) - throws InvalidParametersException, EntityAlreadyExistsException { + throws InvalidParametersException { AccountRequest toCreate = new AccountRequest(email, name, institute); return accountRequestDb.createAccountRequest(toCreate); diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index a315cb18484..068ed3ed253 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -1,6 +1,5 @@ package teammates.storage.sqlapi; -import static teammates.common.util.Const.ERROR_CREATE_ENTITY_ALREADY_EXISTS; import static teammates.common.util.Const.ERROR_UPDATE_NON_EXISTENT; import java.time.Instant; @@ -9,7 +8,6 @@ import java.util.List; import java.util.UUID; -import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; @@ -46,20 +44,12 @@ public AccountRequestSearchManager getSearchManager() { /** * Creates an AccountRequest in the database. */ - public AccountRequest createAccountRequest(AccountRequest accountRequest) - throws InvalidParametersException, EntityAlreadyExistsException { + public AccountRequest createAccountRequest(AccountRequest accountRequest) throws InvalidParametersException { assert accountRequest != null; if (!accountRequest.isValid()) { throw new InvalidParametersException(accountRequest.getInvalidityInfo()); } - - // don't need to check registrationKey for uniqueness since it is generated using email + institute - if (getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()) != null) { - throw new EntityAlreadyExistsException( - String.format(ERROR_CREATE_ENTITY_ALREADY_EXISTS, accountRequest.toString())); - } - persist(accountRequest); return accountRequest; } diff --git a/src/main/java/teammates/storage/sqlentity/AccountRequest.java b/src/main/java/teammates/storage/sqlentity/AccountRequest.java index 2389fbf352d..70d74e8b910 100644 --- a/src/main/java/teammates/storage/sqlentity/AccountRequest.java +++ b/src/main/java/teammates/storage/sqlentity/AccountRequest.java @@ -27,7 +27,6 @@ @Table(name = "AccountRequests", uniqueConstraints = { @UniqueConstraint(name = "Unique registration key", columnNames = "registrationKey"), - @UniqueConstraint(name = "Unique name and institute", columnNames = {"email", "institute"}) }) public class AccountRequest extends BaseEntity { @Id diff --git a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java index 27de0e8437b..5f13178f426 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java @@ -1,6 +1,5 @@ package teammates.ui.webapi; -import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.InvalidParametersException; import teammates.common.util.EmailWrapper; import teammates.storage.sqlentity.AccountRequest; @@ -29,9 +28,6 @@ public JsonResult execute() taskQueuer.scheduleAccountRequestForSearchIndexing(instructorEmail, instructorInstitution); } catch (InvalidParametersException ipe) { throw new InvalidHttpRequestBodyException(ipe); - } catch (EntityAlreadyExistsException eaee) { - // Use existing account request - accountRequest = sqlLogic.getAccountRequest(instructorEmail, instructorInstitution); } assert accountRequest != null; diff --git a/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java b/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java index ef31306aef9..9d150133689 100644 --- a/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java +++ b/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java @@ -16,7 +16,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; @@ -49,8 +48,7 @@ public void teardownMethod() { } @Test - public void testCreateAccountRequest_accountRequestDoesNotExist_success() - throws InvalidParametersException, EntityAlreadyExistsException { + public void testCreateAccountRequest_accountRequestDoesNotExist_success() throws InvalidParametersException { AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); doReturn(null).when(accountRequestDb).getAccountRequest(anyString(), anyString()); @@ -60,16 +58,13 @@ public void testCreateAccountRequest_accountRequestDoesNotExist_success() } @Test - public void testCreateAccountRequest_accountRequestAlreadyExists_throwsEntityAlreadyExistsException() { + public void testCreateAccountRequest_accountRequestAlreadyExists_createsSuccessfully() + throws InvalidParametersException { AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); doReturn(new AccountRequest("test@gmail.com", "name", "institute")) .when(accountRequestDb).getAccountRequest(anyString(), anyString()); - - EntityAlreadyExistsException ex = assertThrows(EntityAlreadyExistsException.class, - () -> accountRequestDb.createAccountRequest(accountRequest)); - - assertEquals(ex.getMessage(), "Trying to create an entity that exists: " + accountRequest.toString()); - mockHibernateUtil.verify(() -> HibernateUtil.persist(accountRequest), never()); + accountRequestDb.createAccountRequest(accountRequest); + mockHibernateUtil.verify(() -> HibernateUtil.persist(accountRequest)); } @Test From fc1342faf82484868b839c249155658e978c81a1 Mon Sep 17 00:00:00 2001 From: Jay Ting <65202977+jayasting98@users.noreply.github.com> Date: Tue, 19 Mar 2024 04:04:04 +0800 Subject: [PATCH 04/95] [#11878] Add status and comments to AccountRequest (#12898) * Add AccountRequestStatus * Add AccountRequest status attribute * Add status to AccountRequest constructor * Add AccountRequest comments attribute * Add comments to AccountRequest constructor * Wrap lines * Remove mysterious unnecessary imports that appeared out of nowhere * Use non-null placeholder * Use literal placeholder --- .../DataMigrationForAccountRequestSql.java | 5 ++- .../sql/VerifyDataMigrationConnection.java | 5 ++- .../sqllogic/core/AccountRequestsLogicIT.java | 5 ++- .../it/sqllogic/core/DataBundleLogicIT.java | 3 +- .../storage/sqlapi/AccountRequestsDbIT.java | 36 ++++++++++++------- src/it/resources/data/DataBundleLogicIT.json | 2 ++ .../datatransfer/AccountRequestStatus.java | 27 ++++++++++++++ .../java/teammates/sqllogic/api/Logic.java | 7 ++-- .../sqllogic/core/AccountRequestsLogic.java | 7 ++-- .../storage/sqlentity/AccountRequest.java | 34 ++++++++++++++++-- .../ui/webapi/CreateAccountRequestAction.java | 6 +++- .../storage/sqlapi/AccountRequestsDbTest.java | 21 +++++++---- 12 files changed, 125 insertions(+), 33 deletions(-) create mode 100644 src/main/java/teammates/common/datatransfer/AccountRequestStatus.java diff --git a/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountRequestSql.java b/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountRequestSql.java index b42be34734e..dbe37b9760e 100644 --- a/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountRequestSql.java +++ b/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountRequestSql.java @@ -2,6 +2,7 @@ import com.googlecode.objectify.cmd.Query; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.storage.sqlentity.AccountRequest; /** @@ -50,7 +51,9 @@ protected void migrateEntity(teammates.storage.entity.AccountRequest oldEntity) AccountRequest newEntity = new AccountRequest( oldEntity.getEmail(), oldEntity.getName(), - oldEntity.getInstitute()); + oldEntity.getInstitute(), + AccountRequestStatus.APPROVED, + null); // set registration key to the old value if exists if (oldEntity.getRegistrationKey() != null) { diff --git a/src/client/java/teammates/client/scripts/sql/VerifyDataMigrationConnection.java b/src/client/java/teammates/client/scripts/sql/VerifyDataMigrationConnection.java index 909c8ac649e..c26147b4016 100644 --- a/src/client/java/teammates/client/scripts/sql/VerifyDataMigrationConnection.java +++ b/src/client/java/teammates/client/scripts/sql/VerifyDataMigrationConnection.java @@ -7,6 +7,7 @@ import teammates.client.connector.DatastoreClient; import teammates.client.util.ClientProperties; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.util.HibernateUtil; import teammates.storage.entity.UsageStatistics; import teammates.storage.sqlentity.Notification; @@ -43,7 +44,9 @@ protected void verifySqlConnection() { teammates.storage.sqlentity.AccountRequest newEntity = new teammates.storage.sqlentity.AccountRequest( "dummy-teammates-account-request-email@gmail.com", "dummy-teammates-account-request", - "dummy-teammates-institute"); + "dummy-teammates-institute", + AccountRequestStatus.PENDING, + "dummy-comments"); HibernateUtil.beginTransaction(); HibernateUtil.persist(newEntity); HibernateUtil.commitTransaction(); diff --git a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java index c449f3358a0..f95a6cfa682 100644 --- a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java @@ -4,6 +4,7 @@ import org.testng.annotations.Test; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -28,8 +29,10 @@ public void testResetAccountRequest() String name = "name lee"; String email = "email@gmail.com"; String institute = "institute"; + AccountRequestStatus status = AccountRequestStatus.PENDING; + String comments = "comments"; - AccountRequest toReset = accountRequestsLogic.createAccountRequest(name, email, institute); + AccountRequest toReset = accountRequestsLogic.createAccountRequest(name, email, institute, status, comments); AccountRequestsDb accountRequestsDb = AccountRequestsDb.inst(); toReset.setRegisteredAt(Instant.now()); diff --git a/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java b/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java index f8571037632..079f95b13e7 100644 --- a/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java @@ -8,6 +8,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.InstructorPermissionRole; import teammates.common.datatransfer.InstructorPrivileges; @@ -62,7 +63,7 @@ public void testCreateDataBundle_typicalValues_createdCorrectly() throws Excepti AccountRequest actualAccountRequest = dataBundle.accountRequests.get("instructor1"); AccountRequest expectedAccountRequest = new AccountRequest("instr1@teammates.tmt", "Instructor 1", - "TEAMMATES Test Institute 1"); + "TEAMMATES Test Institute 1", AccountRequestStatus.REGISTERED, "These are some comments."); expectedAccountRequest.setId(actualAccountRequest.getId()); expectedAccountRequest.setRegisteredAt(Instant.parse("2015-02-14T00:00:00Z")); expectedAccountRequest.setRegistrationKey(actualAccountRequest.getRegistrationKey()); diff --git a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java index c2aa8aef078..a4c25763e40 100644 --- a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java @@ -4,6 +4,7 @@ import org.testng.annotations.Test; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess; import teammates.storage.sqlapi.AccountRequestsDb; @@ -20,7 +21,8 @@ public class AccountRequestsDbIT extends BaseTestCaseWithSqlDatabaseAccess { public void testCreateReadDeleteAccountRequest() throws Exception { ______TS("Create account request, does not exists, succeeds"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.createAccountRequest(accountRequest); ______TS("Read account request using the given email and institute"); @@ -53,7 +55,7 @@ public void testCreateReadDeleteAccountRequest() throws Exception { ______TS("Create account request, same email address and institute already exist, creates successfully"); AccountRequest identicalAccountRequest = - new AccountRequest("test@gmail.com", "name", "institute"); + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); assertNotSame(accountRequest, identicalAccountRequest); accountRequestDb.createAccountRequest(identicalAccountRequest); @@ -74,7 +76,8 @@ public void testCreateReadDeleteAccountRequest() throws Exception { public void testUpdateAccountRequest() throws Exception { ______TS("Update account request, does not exists, exception thrown"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); assertThrows(EntityDoesNotExistException.class, () -> accountRequestDb.updateAccountRequest(accountRequest)); @@ -96,7 +99,8 @@ public void testSqlInjectionInCreateAccountRequestEmailField() throws Exception // Attempt to use SQL commands in email field String email = "email'/**/OR/**/1=1/**/@gmail.com"; - AccountRequest accountRequest = new AccountRequest(email, "name", "institute"); + AccountRequest accountRequest = + new AccountRequest(email, "name", "institute", AccountRequestStatus.PENDING, "comments"); // The system should treat the input as a plain text string accountRequestDb.createAccountRequest(accountRequest); @@ -110,7 +114,8 @@ public void testSqlInjectionInCreateAccountRequestNameField() throws Exception { // Attempt to use SQL commands in name field String name = "name'; SELECT * FROM account_requests; --"; - AccountRequest accountRequest = new AccountRequest("test@gmail.com", name, "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", name, "institute", AccountRequestStatus.PENDING, "comments"); // The system should treat the input as a plain text string accountRequestDb.createAccountRequest(accountRequest); @@ -124,7 +129,8 @@ public void testSqlInjectionInCreateAccountRequestInstituteField() throws Except // Attempt to use SQL commands in institute field String institute = "institute'; DROP TABLE account_requests; --"; - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", institute); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", institute, AccountRequestStatus.PENDING, "comments"); // The system should treat the input as a plain text string accountRequestDb.createAccountRequest(accountRequest); @@ -136,7 +142,8 @@ public void testSqlInjectionInCreateAccountRequestInstituteField() throws Except public void testSqlInjectionInGetAccountRequest() throws Exception { ______TS("SQL Injection test in getAccountRequest"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.createAccountRequest(accountRequest); String instituteInjection = "institute'; DROP TABLE account_requests; --"; @@ -151,7 +158,8 @@ public void testSqlInjectionInGetAccountRequest() throws Exception { public void testSqlInjectionInGetAccountRequestByRegistrationKey() throws Exception { ______TS("SQL Injection test in getAccountRequestByRegistrationKey"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.createAccountRequest(accountRequest); String regKeyInjection = "regKey'; DROP TABLE account_requests; --"; @@ -166,7 +174,8 @@ public void testSqlInjectionInGetAccountRequestByRegistrationKey() throws Except public void testSqlInjectionInUpdateAccountRequest() throws Exception { ______TS("SQL Injection test in updateAccountRequest"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.createAccountRequest(accountRequest); String nameInjection = "newName'; DROP TABLE account_requests; --"; @@ -181,13 +190,15 @@ public void testSqlInjectionInUpdateAccountRequest() throws Exception { public void testSqlInjectionInDeleteAccountRequest() throws Exception { ______TS("SQL Injection test in deleteAccountRequest"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.createAccountRequest(accountRequest); String emailInjection = "email'/**/OR/**/1=1/**/@gmail.com"; String nameInjection = "name'; DROP TABLE account_requests; --"; String instituteInjection = "institute'; DROP TABLE account_requests; --"; - AccountRequest accountRequestInjection = new AccountRequest(emailInjection, nameInjection, instituteInjection); + AccountRequest accountRequestInjection = new AccountRequest(emailInjection, nameInjection, instituteInjection, + AccountRequestStatus.PENDING, "comments"); accountRequestDb.deleteAccountRequest(accountRequestInjection); AccountRequest actual = accountRequestDb.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); @@ -198,7 +209,8 @@ public void testSqlInjectionInDeleteAccountRequest() throws Exception { public void testSqlInjectionSearchAccountRequestsInWholeSystem() throws Exception { ______TS("SQL Injection test in searchAccountRequestsInWholeSystem"); - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.createAccountRequest(accountRequest); String searchInjection = "institute'; DROP TABLE account_requests; --"; diff --git a/src/it/resources/data/DataBundleLogicIT.json b/src/it/resources/data/DataBundleLogicIT.json index 49e7cdec993..371a87c963b 100644 --- a/src/it/resources/data/DataBundleLogicIT.json +++ b/src/it/resources/data/DataBundleLogicIT.json @@ -19,6 +19,8 @@ "name": "Instructor 1", "email": "instr1@teammates.tmt", "institute": "TEAMMATES Test Institute 1", + "status": "REGISTERED", + "comments": "These are some comments.", "registeredAt": "2015-02-14T00:00:00Z" } }, diff --git a/src/main/java/teammates/common/datatransfer/AccountRequestStatus.java b/src/main/java/teammates/common/datatransfer/AccountRequestStatus.java new file mode 100644 index 00000000000..db80e7cb830 --- /dev/null +++ b/src/main/java/teammates/common/datatransfer/AccountRequestStatus.java @@ -0,0 +1,27 @@ +package teammates.common.datatransfer; + +/** + * The status of an account request. + */ +public enum AccountRequestStatus { + + /** + * The account request has not yet been processed by the admin. + */ + PENDING, + + /** + * The account request has been rejected by the admin. + */ + REJECTED, + + /** + * The account request has been approved by the admin but the instructor has not created an account yet. + */ + APPROVED, + + /** + * The account request has been approved by the admin and the instructor has created an account. + */ + REGISTERED +} diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 121257a6601..3ffa0458042 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -8,6 +8,7 @@ import javax.annotation.Nullable; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.FeedbackQuestionRecipient; import teammates.common.datatransfer.FeedbackResultFetchType; import teammates.common.datatransfer.NotificationStyle; @@ -88,10 +89,10 @@ public static Logic inst() { * @throws InvalidParametersException if the account request details are invalid. * @throws EntityAlreadyExistsException if the account request already exists. */ - public AccountRequest createAccountRequest(String name, String email, String institute) - throws InvalidParametersException { + public AccountRequest createAccountRequest(String name, String email, String institute, AccountRequestStatus status, + String comments) throws InvalidParametersException { - return accountRequestLogic.createAccountRequest(name, email, institute); + return accountRequestLogic.createAccountRequest(name, email, institute, status, comments); } /** diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index 0465e061519..5766fa6c224 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -2,6 +2,7 @@ import java.util.List; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; @@ -57,9 +58,9 @@ public AccountRequest createAccountRequest(AccountRequest accountRequest) throws /** * Creates an account request. */ - public AccountRequest createAccountRequest(String name, String email, String institute) - throws InvalidParametersException { - AccountRequest toCreate = new AccountRequest(email, name, institute); + public AccountRequest createAccountRequest(String name, String email, String institute, AccountRequestStatus status, + String comments) throws InvalidParametersException { + AccountRequest toCreate = new AccountRequest(email, name, institute, status, comments); return accountRequestDb.createAccountRequest(toCreate); } diff --git a/src/main/java/teammates/storage/sqlentity/AccountRequest.java b/src/main/java/teammates/storage/sqlentity/AccountRequest.java index 70d74e8b910..97a65e6b468 100644 --- a/src/main/java/teammates/storage/sqlentity/AccountRequest.java +++ b/src/main/java/teammates/storage/sqlentity/AccountRequest.java @@ -9,13 +9,17 @@ import org.hibernate.annotations.UpdateTimestamp; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.util.Config; import teammates.common.util.Const; import teammates.common.util.FieldValidator; import teammates.common.util.SanitizationHelper; import teammates.common.util.StringHelper; +import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; @@ -40,6 +44,12 @@ public class AccountRequest extends BaseEntity { private String institute; + @Enumerated(EnumType.STRING) + private AccountRequestStatus status; + + @Column(columnDefinition = "TEXT") + private String comments; + private Instant registeredAt; @UpdateTimestamp @@ -49,11 +59,13 @@ protected AccountRequest() { // required by Hibernate } - public AccountRequest(String email, String name, String institute) { + public AccountRequest(String email, String name, String institute, AccountRequestStatus status, String comments) { this.setId(UUID.randomUUID()); this.setEmail(email); this.setName(name); this.setInstitute(institute); + this.setStatus(status); + this.setComments(comments); this.generateNewRegistrationKey(); this.setCreatedAt(Instant.now()); this.setRegisteredAt(null); @@ -128,6 +140,22 @@ public void setInstitute(String institute) { this.institute = SanitizationHelper.sanitizeTitle(institute); } + public AccountRequestStatus getStatus() { + return this.status; + } + + public void setStatus(AccountRequestStatus status) { + this.status = status; + } + + public String getComments() { + return this.comments; + } + + public void setComments(String comments) { + this.comments = comments; + } + public Instant getRegisteredAt() { return this.registeredAt; } @@ -166,8 +194,8 @@ public int hashCode() { @Override public String toString() { return "AccountRequest [id=" + id + ", registrationKey=" + registrationKey + ", name=" + name + ", email=" - + email + ", institute=" + institute + ", registeredAt=" + registeredAt + ", createdAt=" + getCreatedAt() - + ", updatedAt=" + updatedAt + "]"; + + email + ", institute=" + institute + ", status=" + status + ", comments=" + comments + + ", registeredAt=" + registeredAt + ", createdAt=" + getCreatedAt() + ", updatedAt=" + updatedAt + "]"; } public String getRegistrationUrl() { diff --git a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java index 5f13178f426..30a4e9da8a7 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java @@ -1,5 +1,6 @@ package teammates.ui.webapi; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.InvalidParametersException; import teammates.common.util.EmailWrapper; import teammates.storage.sqlentity.AccountRequest; @@ -20,11 +21,14 @@ public JsonResult execute() String instructorName = createRequest.getInstructorName().trim(); String instructorEmail = createRequest.getInstructorEmail().trim(); String instructorInstitution = createRequest.getInstructorInstitution().trim(); + // TODO: This is a placeholder. It should be obtained from AccountCreateRequest, in a separate PR. + String comments = "PLACEHOLDER"; AccountRequest accountRequest; try { - accountRequest = sqlLogic.createAccountRequest(instructorName, instructorEmail, instructorInstitution); + accountRequest = sqlLogic.createAccountRequest(instructorName, instructorEmail, instructorInstitution, + AccountRequestStatus.PENDING, comments); taskQueuer.scheduleAccountRequestForSearchIndexing(instructorEmail, instructorInstitution); } catch (InvalidParametersException ipe) { throw new InvalidHttpRequestBodyException(ipe); diff --git a/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java b/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java index 9d150133689..61f9f8e0d24 100644 --- a/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java +++ b/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java @@ -16,6 +16,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; @@ -49,7 +50,8 @@ public void teardownMethod() { @Test public void testCreateAccountRequest_accountRequestDoesNotExist_success() throws InvalidParametersException { - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); doReturn(null).when(accountRequestDb).getAccountRequest(anyString(), anyString()); accountRequestDb.createAccountRequest(accountRequest); @@ -60,8 +62,9 @@ public void testCreateAccountRequest_accountRequestDoesNotExist_success() throws @Test public void testCreateAccountRequest_accountRequestAlreadyExists_createsSuccessfully() throws InvalidParametersException { - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); - doReturn(new AccountRequest("test@gmail.com", "name", "institute")) + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); + doReturn(new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments")) .when(accountRequestDb).getAccountRequest(anyString(), anyString()); accountRequestDb.createAccountRequest(accountRequest); mockHibernateUtil.verify(() -> HibernateUtil.persist(accountRequest)); @@ -69,7 +72,8 @@ public void testCreateAccountRequest_accountRequestAlreadyExists_createsSuccessf @Test public void testUpdateAccountRequest_invalidEmail_throwsInvalidParametersException() { - AccountRequest accountRequestWithInvalidEmail = new AccountRequest("testgmail.com", "name", "institute"); + AccountRequest accountRequestWithInvalidEmail = + new AccountRequest("testgmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); assertThrows(InvalidParametersException.class, () -> accountRequestDb.updateAccountRequest(accountRequestWithInvalidEmail)); @@ -79,7 +83,8 @@ public void testUpdateAccountRequest_invalidEmail_throwsInvalidParametersExcepti @Test public void testUpdateAccountRequest_accountRequestDoesNotExist_throwsEntityDoesNotExistException() { - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); doReturn(null).when(accountRequestDb).getAccountRequest(anyString(), anyString()); assertThrows(EntityDoesNotExistException.class, @@ -90,7 +95,8 @@ public void testUpdateAccountRequest_accountRequestDoesNotExist_throwsEntityDoes @Test public void testUpdateAccountRequest_success() throws InvalidParametersException, EntityDoesNotExistException { - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); doReturn(accountRequest).when(accountRequestDb).getAccountRequest(anyString(), anyString()); accountRequestDb.updateAccountRequest(accountRequest); @@ -100,7 +106,8 @@ public void testUpdateAccountRequest_success() throws InvalidParametersException @Test public void testDeleteAccountRequest_success() { - AccountRequest accountRequest = new AccountRequest("test@gmail.com", "name", "institute"); + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); accountRequestDb.deleteAccountRequest(accountRequest); From 24a914df33f17f1cfc8def8bcb7fafb5e7adc2db Mon Sep 17 00:00:00 2001 From: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> Date: Mon, 25 Mar 2024 08:51:08 +0800 Subject: [PATCH 05/95] [#11878] Add new account request alert email for admins (#12926) * Add admin alert email * Add email type * Add subject * Add email content * Indicate that action is needed in the email subject --- .../webapi/CreateAccountRequestActionIT.java | 5 +- .../java/teammates/common/util/EmailType.java | 1 + .../java/teammates/common/util/Templates.java | 2 + .../sqllogic/api/SqlEmailGenerator.java | 28 +++++++++ .../ui/webapi/CreateAccountRequestAction.java | 3 +- ...nEmailTemplate-newAccountRequestAlert.html | 60 +++++++++++++++++++ .../sqllogic/api/SqlEmailGeneratorTest.java | 58 ++++++++++++++++++ ...wAccountRequestAlertEmailWithComments.html | 60 +++++++++++++++++++ ...ccountRequestAlertEmailWithNoComments.html | 60 +++++++++++++++++++ 9 files changed, 275 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/adminEmailTemplate-newAccountRequestAlert.html create mode 100644 src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java create mode 100644 src/test/resources/emails/adminNewAccountRequestAlertEmailWithComments.html create mode 100644 src/test/resources/emails/adminNewAccountRequestAlertEmailWithNoComments.html diff --git a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java index 70aa4ecc521..c2af0829c69 100644 --- a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java @@ -43,13 +43,16 @@ protected void testExecute() throws Exception { assertEquals("The Fellowship of the Ring", accountRequest.getInstitute()); assertNull(accountRequest.getRegisteredAt()); assertEquals(accountRequest.getRegistrationUrl(), output.getJoinLink()); - verifyNumberOfEmailsSent(1); verifySpecifiedTasksAdded(Const.TaskQueue.SEARCH_INDEXING_QUEUE_NAME, 1); + verifyNumberOfEmailsSent(2); EmailWrapper emailSent = mockEmailSender.getEmailsSent().get(0); assertEquals(String.format(EmailType.NEW_INSTRUCTOR_ACCOUNT.getSubject(), "Frodo Baggins"), emailSent.getSubject()); assertEquals("ring-bearer@fellowship.net", emailSent.getRecipient()); assertTrue(emailSent.getContent().contains(output.getJoinLink())); + EmailWrapper sentAdminAlertEmail = mockEmailSender.getEmailsSent().get(1); + // Check only the email type. The content of the email is not tested here, but in the email generator test(s). + assertEquals(EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT, sentAdminAlertEmail.getType()); } @Override diff --git a/src/main/java/teammates/common/util/EmailType.java b/src/main/java/teammates/common/util/EmailType.java index af649debb7b..5f0cd5df568 100644 --- a/src/main/java/teammates/common/util/EmailType.java +++ b/src/main/java/teammates/common/util/EmailType.java @@ -23,6 +23,7 @@ public enum EmailType { NEW_INSTRUCTOR_ACCOUNT("TEAMMATES: Welcome to TEAMMATES! %s"), STUDENT_COURSE_JOIN("TEAMMATES: Invitation to join course [%s][Course ID: %s]"), STUDENT_COURSE_REJOIN_AFTER_GOOGLE_ID_RESET("TEAMMATES: Your account has been reset for course [%s][Course ID: %s]"), + NEW_ACCOUNT_REQUEST_ADMIN_ALERT("TEAMMATES (Action Needed): New Account Request Received"), INSTRUCTOR_COURSE_JOIN("TEAMMATES: Invitation to join course as an instructor [%s][Course ID: %s]"), INSTRUCTOR_COURSE_REJOIN_AFTER_GOOGLE_ID_RESET("TEAMMATES: Your account has been reset for course [%s][Course ID: %s]"), USER_COURSE_REGISTER("TEAMMATES: Registered for Course [%s][Course ID: %s]"), diff --git a/src/main/java/teammates/common/util/Templates.java b/src/main/java/teammates/common/util/Templates.java index 524c84bc2c6..75cf95a2d38 100644 --- a/src/main/java/teammates/common/util/Templates.java +++ b/src/main/java/teammates/common/util/Templates.java @@ -32,6 +32,8 @@ public static String populateTemplate(String template, String... keyValuePairs) * Collection of templates of emails to be sent by the system. */ public static class EmailTemplates { + public static final String ADMIN_NEW_ACCOUNT_REQUEST_ALERT = + FileHelper.readResourceFile("adminEmailTemplate-newAccountRequestAlert.html"); public static final String USER_COURSE_JOIN = FileHelper.readResourceFile("userEmailTemplate-courseJoin.html"); public static final String USER_COURSE_REGISTER = diff --git a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java index 2bd8f2bfb08..f89eb4008a7 100644 --- a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java +++ b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java @@ -26,6 +26,7 @@ import teammates.sqllogic.core.FeedbackSessionsLogic; import teammates.sqllogic.core.UsersLogic; import teammates.storage.sqlentity.Account; +import teammates.storage.sqlentity.AccountRequest; import teammates.storage.sqlentity.Course; import teammates.storage.sqlentity.DeadlineExtension; import teammates.storage.sqlentity.FeedbackSession; @@ -973,6 +974,33 @@ public EmailWrapper generateInstructorCourseRejoinEmailAfterGoogleIdReset( return email; } + /** + * Generates the email to alert the admin of the new {@code accountRequest}. + */ + public EmailWrapper generateNewAccountRequestAdminAlertEmail(AccountRequest accountRequest) { + String name = accountRequest.getName(); + String institute = accountRequest.getInstitute(); + String emailAddress = accountRequest.getEmail(); + String comments = accountRequest.getComments(); + if (comments == null) { + comments = ""; + } + String adminAccountRequestsPageUrl = Config.getFrontEndAppUrl(Const.WebPageURIs.ADMIN_HOME_PAGE).toAbsoluteString(); + String[] templateKeyValuePairs = new String[] { + "${name}", name, + "${institute}", institute, + "${emailAddress}", emailAddress, + "${comments}", comments, + "${adminAccountRequestsPageUrl}", adminAccountRequestsPageUrl, + }; + String content = Templates.populateTemplate(EmailTemplates.ADMIN_NEW_ACCOUNT_REQUEST_ALERT, templateKeyValuePairs); + EmailWrapper email = getEmptyEmailAddressedToEmail(Config.SUPPORT_EMAIL); + email.setType(EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT); + email.setSubjectFromType(); + email.setContent(content); + return email; + } + /** * Generates the course registered email for the user with the given details in {@code course}. */ diff --git a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java index 30a4e9da8a7..b6243a0016f 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java @@ -45,7 +45,8 @@ public JsonResult execute() EmailWrapper email = emailGenerator.generateNewInstructorAccountJoinEmail( instructorEmail, instructorName, joinLink); emailSender.sendEmail(email); - + EmailWrapper adminAlertEmail = sqlEmailGenerator.generateNewAccountRequestAdminAlertEmail(accountRequest); + emailSender.sendEmail(adminAlertEmail); JoinLinkData output = new JoinLinkData(joinLink); return new JsonResult(output); } diff --git a/src/main/resources/adminEmailTemplate-newAccountRequestAlert.html b/src/main/resources/adminEmailTemplate-newAccountRequestAlert.html new file mode 100644 index 00000000000..a91c1250a26 --- /dev/null +++ b/src/main/resources/adminEmailTemplate-newAccountRequestAlert.html @@ -0,0 +1,60 @@ +

Hello, Admin

+ +

+ A new instructor account request has been submitted: +

+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + Full Name + + + ${name} +
+ + Institute + + + ${institute} +
+ + Email Address + + + ${emailAddress} +
+ + Comments + + + ${comments} +
+
+ +Accept/reject this request on the admin panel: ${adminAccountRequestsPageUrl} + +

+ Regards,
+ TEAMMATES Team. +

diff --git a/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java b/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java new file mode 100644 index 00000000000..24a77f91ac7 --- /dev/null +++ b/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java @@ -0,0 +1,58 @@ +package teammates.sqllogic.api; + +import java.io.IOException; + +import org.testng.annotations.Test; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.util.Config; +import teammates.common.util.EmailType; +import teammates.common.util.EmailWrapper; +import teammates.storage.sqlentity.AccountRequest; +import teammates.test.BaseTestCase; +import teammates.test.EmailChecker; + +/** + * SUT: {@link SqlEmailGenerator}. + */ +public class SqlEmailGeneratorTest extends BaseTestCase { + private final SqlEmailGenerator sqlEmailGenerator = SqlEmailGenerator.inst(); + + @Test + void testGenerateNewAccountRequestAdminAlertEmail_withComments_generatesSuccessfully() throws IOException { + AccountRequest accountRequest = new AccountRequest("chosen-one@jedi.org", "Anakin Skywalker", "Jedi Order", + AccountRequestStatus.PENDING, + "I don't like sand. It's coarse and rough and irritating... and it gets everywhere."); + EmailWrapper email = sqlEmailGenerator.generateNewAccountRequestAdminAlertEmail(accountRequest); + verifyEmail(email, Config.SUPPORT_EMAIL, EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT, + "TEAMMATES (Action Needed): New Account Request Received", + "/adminNewAccountRequestAlertEmailWithComments.html"); + } + + @Test + void testGenerateNewAccountRequestAdminAlertEmail_withNoComments_generatesSuccessfully() throws IOException { + AccountRequest accountRequest = new AccountRequest("maul@sith.org", "Maul", "Sith Order", + AccountRequestStatus.PENDING, null); + EmailWrapper email = sqlEmailGenerator.generateNewAccountRequestAdminAlertEmail(accountRequest); + verifyEmail(email, Config.SUPPORT_EMAIL, EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT, + "TEAMMATES (Action Needed): New Account Request Received", + "/adminNewAccountRequestAlertEmailWithNoComments.html"); + } + + private void verifyEmail(EmailWrapper email, String expectedRecipientEmailAddress, EmailType expectedEmailType, + String expectedSubject, String expectedEmailContentFilePathname) throws IOException { + assertEquals(expectedRecipientEmailAddress, email.getRecipient()); + assertEquals(Config.EMAIL_SENDEREMAIL, email.getSenderEmail()); + assertEquals(Config.EMAIL_SENDERNAME, email.getSenderName()); + assertEquals(Config.EMAIL_REPLYTO, email.getReplyTo()); + assertEquals(expectedEmailType, email.getType()); + assertEquals(expectedSubject, email.getSubject()); + String emailContent = email.getContent(); + EmailChecker.verifyEmailContent(emailContent, expectedEmailContentFilePathname); + verifyEmailContentHasNoPlaceholders(emailContent); + } + + private void verifyEmailContentHasNoPlaceholders(String emailContent) { + assertFalse(emailContent.contains("${")); + } +} diff --git a/src/test/resources/emails/adminNewAccountRequestAlertEmailWithComments.html b/src/test/resources/emails/adminNewAccountRequestAlertEmailWithComments.html new file mode 100644 index 00000000000..301fd024a3e --- /dev/null +++ b/src/test/resources/emails/adminNewAccountRequestAlertEmailWithComments.html @@ -0,0 +1,60 @@ +

Hello, Admin

+ +

+ A new instructor account request has been submitted: +

+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + Full Name + + + Anakin Skywalker +
+ + Institute + + + Jedi Order +
+ + Email Address + + + chosen-one@jedi.org +
+ + Comments + + + I don't like sand. It's coarse and rough and irritating... and it gets everywhere. +
+
+ +Accept/reject this request on the admin panel: ${app.url}/web/admin/home + +

+ Regards,
+ TEAMMATES Team. +

diff --git a/src/test/resources/emails/adminNewAccountRequestAlertEmailWithNoComments.html b/src/test/resources/emails/adminNewAccountRequestAlertEmailWithNoComments.html new file mode 100644 index 00000000000..a2f62ae17b1 --- /dev/null +++ b/src/test/resources/emails/adminNewAccountRequestAlertEmailWithNoComments.html @@ -0,0 +1,60 @@ +

Hello, Admin

+ +

+ A new instructor account request has been submitted: +

+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + Full Name + + + Maul +
+ + Institute + + + Sith Order +
+ + Email Address + + + maul@sith.org +
+ + Comments + + + +
+
+ +Accept/reject this request on the admin panel: ${app.url}/web/admin/home + +

+ Regards,
+ TEAMMATES Team. +

From 126d2c45fd281f2ea8ff6640088f04587e4b65e7 Mon Sep 17 00:00:00 2001 From: EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:00:48 +0800 Subject: [PATCH 06/95] [#11878] Add GetAllPendingAccountRequests API (#12927) * add endpoint * remove 'all' in class and method names * fix checkstyle * add it test * fix checkstyle * fix checkstyle * fix failing test * update endpoint url * update it tests * fix linting * update param name * update request param condition --- .../ui/webapi/GetAccountRequestsActionIT.java | 109 ++++++++++++++++++ .../java/teammates/common/util/Const.java | 2 + .../java/teammates/sqllogic/api/Logic.java | 7 ++ .../sqllogic/core/AccountRequestsLogic.java | 7 ++ .../storage/sqlapi/AccountRequestsDb.java | 14 +++ .../ui/constants/ResourceEndpoints.java | 1 + .../teammates/ui/webapi/ActionFactory.java | 1 + .../ui/webapi/GetAccountRequestsAction.java | 34 ++++++ .../ui/webapi/GetActionClassesActionTest.java | 1 + 9 files changed, 176 insertions(+) create mode 100644 src/it/java/teammates/it/ui/webapi/GetAccountRequestsActionIT.java create mode 100644 src/main/java/teammates/ui/webapi/GetAccountRequestsAction.java diff --git a/src/it/java/teammates/it/ui/webapi/GetAccountRequestsActionIT.java b/src/it/java/teammates/it/ui/webapi/GetAccountRequestsActionIT.java new file mode 100644 index 00000000000..565fda387a5 --- /dev/null +++ b/src/it/java/teammates/it/ui/webapi/GetAccountRequestsActionIT.java @@ -0,0 +1,109 @@ +package teammates.it.ui.webapi; + +import java.util.List; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.common.util.HibernateUtil; +import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.ui.output.AccountRequestData; +import teammates.ui.output.AccountRequestsData; +import teammates.ui.webapi.GetAccountRequestsAction; +import teammates.ui.webapi.JsonResult; + +/** + * SUT: {@link GetAccountRequestsAction}. + */ +public class GetAccountRequestsActionIT extends BaseActionIT { + private final String[] validParams = { Const.ParamsNames.ACCOUNT_REQUEST_STATUS, "pending" }; + + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalBundle); + HibernateUtil.flushSession(); + } + + @Override + protected String getActionUri() { + return Const.ResourceURIs.ACCOUNT_REQUESTS; + } + + @Override + protected String getRequestMethod() { + return GET; + } + + @Override + @Test + public void testExecute() { + ______TS("accountrequeststatus param is null"); + + verifyHttpParameterFailure(); + verifyHttpParameterFailure(Const.ParamsNames.ACCOUNT_REQUEST_STATUS, "pendin"); + + ______TS("No pending account requests initially"); + + GetAccountRequestsAction action = getAction(this.validParams); + JsonResult result = getJsonResult(action); + AccountRequestsData data = (AccountRequestsData) result.getOutput(); + List arData = data.getAccountRequests(); + + assertEquals(0, arData.size()); + + ______TS("1 pending account request, case insensitive match for status request param"); + + AccountRequest accountRequest1 = typicalBundle.accountRequests.get("instructor1"); + accountRequest1.setStatus(AccountRequestStatus.PENDING); + + String[] params = { Const.ParamsNames.ACCOUNT_REQUEST_STATUS, "PendinG" }; + action = getAction(params); + result = getJsonResult(action); + data = (AccountRequestsData) result.getOutput(); + arData = data.getAccountRequests(); + + assertEquals(1, arData.size()); + + ______TS("Get 2 pending account requests, ignore 1 approved account request"); + AccountRequest approvedAccountRequest1 = typicalBundle.accountRequests.get("instructor2"); + approvedAccountRequest1.setStatus(AccountRequestStatus.APPROVED); + + accountRequest1 = typicalBundle.accountRequests.get("instructor1"); + AccountRequest accountRequest2 = typicalBundle.accountRequests.get("instructor1OfCourse2"); + accountRequest1.setStatus(AccountRequestStatus.PENDING); + accountRequest2.setStatus(AccountRequestStatus.PENDING); + + action = getAction(this.validParams); + result = getJsonResult(action); + data = (AccountRequestsData) result.getOutput(); + arData = data.getAccountRequests(); + + assertEquals(2, arData.size()); + + // account request 1 + assertEquals(arData.get(0).getEmail(), accountRequest1.getEmail()); + assertEquals(arData.get(0).getInstitute(), accountRequest1.getInstitute()); + assertEquals(arData.get(0).getName(), accountRequest1.getName()); + assertEquals(arData.get(0).getRegistrationKey(), accountRequest1.getRegistrationKey()); + + // account request 2 + assertEquals(arData.get(1).getEmail(), accountRequest2.getEmail()); + assertEquals(arData.get(1).getInstitute(), accountRequest2.getInstitute()); + assertEquals(arData.get(1).getName(), accountRequest2.getName()); + assertEquals(arData.get(1).getRegistrationKey(), accountRequest2.getRegistrationKey()); + } + + @Override + @Test + public void testAccessControl() throws InvalidParametersException, EntityAlreadyExistsException { + Course course = typicalBundle.courses.get("course1"); + verifyOnlyAdminCanAccess(course); + } +} diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index b24d0ded648..34b5a369479 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -122,6 +122,7 @@ public static class ParamsNames { public static final String INSTRUCTOR_INSTITUTION = "instructorinstitution"; public static final String IS_CREATING_ACCOUNT = "iscreatingaccount"; public static final String IS_INSTRUCTOR = "isinstructor"; + public static final String ACCOUNT_REQUEST_STATUS = "status"; public static final String FEEDBACK_SESSION_NAME = "fsname"; public static final String FEEDBACK_SESSION_STARTTIME = "starttime"; @@ -332,6 +333,7 @@ public static class ResourceURIs { public static final String ACCOUNT = URI_PREFIX + "/account"; public static final String ACCOUNT_RESET = URI_PREFIX + "/account/reset"; public static final String ACCOUNT_REQUEST = URI_PREFIX + "/account/request"; + public static final String ACCOUNT_REQUESTS = URI_PREFIX + "/account/requests"; public static final String ACCOUNT_REQUEST_RESET = ACCOUNT_REQUEST + "/reset"; public static final String ACCOUNTS = URI_PREFIX + "/accounts"; public static final String RESPONSE_COMMENT = URI_PREFIX + "/responsecomment"; diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 3ffa0458042..a6f785e442e 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -149,6 +149,13 @@ public void deleteAccountRequest(String email, String institute) { accountRequestLogic.deleteAccountRequest(email, institute); } + /** + * Gets all pending account requests. + */ + public List getPendingAccountRequests() { + return accountRequestLogic.getPendingAccountRequests(); + } + /** * Gets an account. */ diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index 5766fa6c224..6c0f34efb1a 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -88,6 +88,13 @@ public AccountRequest getAccountRequestByRegistrationKey(String regkey) { return accountRequestDb.getAccountRequestByRegistrationKey(regkey); } + /** + * Gets all pending account requests. + */ + public List getPendingAccountRequests() { + return accountRequestDb.getPendingAccountRequests(); + } + /** * Creates/resets the account request with the given email and institute such that it is not registered. */ diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index 068ed3ed253..e3ced48d6af 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.UUID; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; @@ -68,6 +69,19 @@ public AccountRequest getAccountRequest(String email, String institute) { return query.getResultStream().findFirst().orElse(null); } + /** + * Get all Account Requests with {@code status} of 'pending'. + */ + public List getPendingAccountRequests() { + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cr = cb.createQuery(AccountRequest.class); + Root root = cr.from(AccountRequest.class); + cr.select(root).where(cb.equal(root.get("status"), AccountRequestStatus.PENDING)); + + TypedQuery query = HibernateUtil.createQuery(cr); + return query.getResultList(); + } + /** * Get AccountRequest by {@code registrationKey} from database. */ diff --git a/src/main/java/teammates/ui/constants/ResourceEndpoints.java b/src/main/java/teammates/ui/constants/ResourceEndpoints.java index 2401fad8efe..8e288eb6264 100644 --- a/src/main/java/teammates/ui/constants/ResourceEndpoints.java +++ b/src/main/java/teammates/ui/constants/ResourceEndpoints.java @@ -15,6 +15,7 @@ public enum ResourceEndpoints { ACCOUNT(ResourceURIs.ACCOUNT), ACCOUNT_RESET(ResourceURIs.ACCOUNT_RESET), ACCOUNT_REQUEST(ResourceURIs.ACCOUNT_REQUEST), + ACCOUNT_REQUESTS(ResourceURIs.ACCOUNT_REQUESTS), ACCOUNT_REQUEST_RESET(ResourceURIs.ACCOUNT_REQUEST_RESET), ACCOUNTS(ResourceURIs.ACCOUNTS), RESPONSE_COMMENT(ResourceURIs.RESPONSE_COMMENT), diff --git a/src/main/java/teammates/ui/webapi/ActionFactory.java b/src/main/java/teammates/ui/webapi/ActionFactory.java index 38c4b00b753..72d16ad9973 100644 --- a/src/main/java/teammates/ui/webapi/ActionFactory.java +++ b/src/main/java/teammates/ui/webapi/ActionFactory.java @@ -50,6 +50,7 @@ public final class ActionFactory { map(ResourceURIs.ACCOUNT_REQUEST, GET, GetAccountRequestAction.class); map(ResourceURIs.ACCOUNT_REQUEST, POST, CreateAccountRequestAction.class); map(ResourceURIs.ACCOUNT_REQUEST, DELETE, DeleteAccountRequestAction.class); + map(ResourceURIs.ACCOUNT_REQUESTS, GET, GetAccountRequestsAction.class); map(ResourceURIs.ACCOUNT_REQUEST_RESET, PUT, ResetAccountRequestAction.class); map(ResourceURIs.ACCOUNTS, GET, GetAccountsAction.class); map(ResourceURIs.COURSE, GET, GetCourseAction.class); diff --git a/src/main/java/teammates/ui/webapi/GetAccountRequestsAction.java b/src/main/java/teammates/ui/webapi/GetAccountRequestsAction.java new file mode 100644 index 00000000000..7cac4331b98 --- /dev/null +++ b/src/main/java/teammates/ui/webapi/GetAccountRequestsAction.java @@ -0,0 +1,34 @@ +package teammates.ui.webapi; + +import java.util.List; +import java.util.stream.Collectors; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.util.Const; +import teammates.storage.sqlentity.AccountRequest; +import teammates.ui.output.AccountRequestData; +import teammates.ui.output.AccountRequestsData; + +/** + * Action: Gets pending account requests. + */ +public class GetAccountRequestsAction extends AdminOnlyAction { + @Override + public JsonResult execute() { + String accountRequestStatus = getNonNullRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_STATUS); + String pending = AccountRequestStatus.PENDING.name(); // 'PENDING' + if (!pending.equalsIgnoreCase(accountRequestStatus)) { + throw new InvalidHttpParameterException("Only 'pending' is allowed for account request status."); + } + + List accountRequests = sqlLogic.getPendingAccountRequests(); + List accountRequestDatas = accountRequests + .stream() + .map(ar -> new AccountRequestData(ar)) + .collect(Collectors.toList()); + + AccountRequestsData output = new AccountRequestsData(); + output.setAccountRequests(accountRequestDatas); + return new JsonResult(output); + } +} diff --git a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java index 2c989868edc..752a74d9101 100644 --- a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java +++ b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java @@ -86,6 +86,7 @@ protected void testExecute() { CreateAccountRequestAction.class, GetAccountRequestAction.class, DeleteAccountRequestAction.class, + GetAccountRequestsAction.class, GetAccountAction.class, GetAccountsAction.class, FeedbackSessionPublishedRemindersAction.class, From cb29108134cfe44f025d2de5793ad835c47c6b50 Mon Sep 17 00:00:00 2001 From: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:25:50 +0800 Subject: [PATCH 07/95] [#11878] Modify CreateAccountRequestAction (#12913) * Add AccountCreateRequest instructorComments attribute * Add new AccountRequestData attributes * Remove check for registered instructor * Remove sending of registration email * Use AccountCreateRequest comments * Change output of CreateAccountRequestAction to AccountRequestData * Add CreateAccountRequestActionIT * Test execute with null arguments * Test execute with valid requests * Test execute on invalid arguments * Allow anybody to create an account request * Fix architecture test * Fix test * Update tests to verify search indexing --- .../webapi/CreateAccountRequestActionIT.java | 179 ++++++++++++++++-- .../attributes/AccountRequestAttributes.java | 8 +- .../ui/output/AccountRequestData.java | 27 ++- .../ui/request/AccountCreateRequest.java | 12 ++ .../ui/webapi/CreateAccountRequestAction.java | 33 ++-- .../logic/core/AccountRequestsLogicTest.java | 6 +- .../CreateAccountRequestActionTest.java | 42 +--- .../admin-home-page.component.spec.ts | 14 +- .../admin-home-page.component.ts | 6 +- src/web/services/account.service.ts | 4 +- src/web/services/search.service.spec.ts | 9 +- 11 files changed, 256 insertions(+), 84 deletions(-) diff --git a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java index c2af0829c69..f1acd18c78c 100644 --- a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java @@ -2,12 +2,15 @@ import org.testng.annotations.Test; +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.InvalidParametersException; import teammates.common.util.Const; import teammates.common.util.EmailType; import teammates.common.util.EmailWrapper; import teammates.storage.sqlentity.AccountRequest; -import teammates.ui.output.JoinLinkData; +import teammates.ui.output.AccountRequestData; import teammates.ui.request.AccountCreateRequest; +import teammates.ui.request.InvalidHttpRequestBodyException; import teammates.ui.webapi.CreateAccountRequestAction; import teammates.ui.webapi.JsonResult; @@ -27,37 +30,171 @@ String getRequestMethod() { } @Override - @Test protected void testExecute() throws Exception { - // This is a minimal test; other cases are not tested due to upcoming changes in behaviour. + // This is separated into different test methods. + } + + @Test + void testExecute_nullEmail_throwsInvalidHttpRequestBodyException() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorName("Paul Atreides"); + request.setInstructorInstitution("House Atreides"); + InvalidHttpRequestBodyException ihrbException = verifyHttpRequestBodyFailure(request); + assertEquals("email cannot be null", ihrbException.getMessage()); + } + + @Test + void testExecute_nullName_throwsInvalidHttpRequestBodyException() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail("kwisatz.haderach@atreides.org"); + request.setInstructorInstitution("House Atreides"); + InvalidHttpRequestBodyException ihrbException = verifyHttpRequestBodyFailure(request); + assertEquals("name cannot be null", ihrbException.getMessage()); + } + + @Test + void testExecute_nullInstitute_throwsInvalidHttpRequestBodyException() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail("kwisatz.haderach@atreides.org"); + request.setInstructorName("Paul Atreides"); + InvalidHttpRequestBodyException ihrbException = verifyHttpRequestBodyFailure(request); + assertEquals("institute cannot be null", ihrbException.getMessage()); + } + + @Test + void testExecute_invalidEmail_throwsInvalidHttpRequestBodyException() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail("invalid email address"); + request.setInstructorName("Paul Atreides"); + request.setInstructorInstitution("House Atreides"); + InvalidHttpRequestBodyException ihrbException = verifyHttpRequestBodyFailure(request); + String expectedMessage = "\"invalid email address\" is not acceptable to TEAMMATES as a/an email because it is not " + + "in the correct format. An email address contains some text followed by one '@' sign followed by some " + + "more text, and should end with a top level domain address like .com. It cannot be longer than 254 " + + "characters, cannot be empty and cannot contain spaces."; + assertEquals(expectedMessage, ihrbException.getMessage()); + } + + @Test + void testExecute_invalidName_throwsInvalidHttpRequestBodyException() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail("kwisatz.haderach@atreides.org"); + request.setInstructorName("Pau| Atreides"); + request.setInstructorInstitution("House Atreides"); + InvalidHttpRequestBodyException ihrbException = verifyHttpRequestBodyFailure(request); + String expectedMessage = "\"Pau| Atreides\" is not acceptable to TEAMMATES as a/an person name because it contains " + + "invalid characters. A/An person name must start with an alphanumeric character, and cannot contain any " + + "vertical bar (|) or percent sign (%)."; + assertEquals(expectedMessage, ihrbException.getMessage()); + } + + @Test + void testExecute_invalidInstitute_throwsInvalidHttpRequestBodyException() { AccountCreateRequest request = new AccountCreateRequest(); - request.setInstructorEmail("ring-bearer@fellowship.net"); - request.setInstructorName("Frodo Baggins"); - request.setInstructorInstitution("The Fellowship of the Ring"); + request.setInstructorEmail("kwisatz.haderach@atreides.org"); + request.setInstructorName("Paul Atreides"); + request.setInstructorInstitution("House Atreide%"); + InvalidHttpRequestBodyException ihrbException = verifyHttpRequestBodyFailure(request); + String expectedMessage = "\"House Atreide%\" is not acceptable to TEAMMATES as a/an institute name because it " + + "contains invalid characters. A/An institute name must start with an alphanumeric character, and cannot " + + "contain any vertical bar (|) or percent sign (%)."; + assertEquals(expectedMessage, ihrbException.getMessage()); + } + + @Test + void testExecute_typicalCase_createsSuccessfully() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail("kwisatz.haderach@atreides.org"); + request.setInstructorName("Paul Atreides"); + request.setInstructorInstitution("House Atreides"); + request.setInstructorComments("My road leads into the desert. I can see it."); CreateAccountRequestAction action = getAction(request); JsonResult result = getJsonResult(action); - JoinLinkData output = (JoinLinkData) result.getOutput(); - AccountRequest accountRequest = logic.getAccountRequest("ring-bearer@fellowship.net", "The Fellowship of the Ring"); - assertEquals("ring-bearer@fellowship.net", accountRequest.getEmail()); - assertEquals("Frodo Baggins", accountRequest.getName()); - assertEquals("The Fellowship of the Ring", accountRequest.getInstitute()); + AccountRequestData output = (AccountRequestData) result.getOutput(); + assertEquals("kwisatz.haderach@atreides.org", output.getEmail()); + assertEquals("Paul Atreides", output.getName()); + assertEquals("House Atreides", output.getInstitute()); + assertEquals(AccountRequestStatus.PENDING, output.getStatus()); + assertEquals("My road leads into the desert. I can see it.", output.getComments()); + assertNull(output.getRegisteredAt()); + AccountRequest accountRequest = logic.getAccountRequestByRegistrationKey(output.getRegistrationKey()); + assertEquals("kwisatz.haderach@atreides.org", accountRequest.getEmail()); + assertEquals("Paul Atreides", accountRequest.getName()); + assertEquals("House Atreides", accountRequest.getInstitute()); + assertEquals(AccountRequestStatus.PENDING, accountRequest.getStatus()); + assertEquals("My road leads into the desert. I can see it.", accountRequest.getComments()); assertNull(accountRequest.getRegisteredAt()); - assertEquals(accountRequest.getRegistrationUrl(), output.getJoinLink()); verifySpecifiedTasksAdded(Const.TaskQueue.SEARCH_INDEXING_QUEUE_NAME, 1); - verifyNumberOfEmailsSent(2); - EmailWrapper emailSent = mockEmailSender.getEmailsSent().get(0); - assertEquals(String.format(EmailType.NEW_INSTRUCTOR_ACCOUNT.getSubject(), "Frodo Baggins"), - emailSent.getSubject()); - assertEquals("ring-bearer@fellowship.net", emailSent.getRecipient()); - assertTrue(emailSent.getContent().contains(output.getJoinLink())); - EmailWrapper sentAdminAlertEmail = mockEmailSender.getEmailsSent().get(1); - // Check only the email type. The content of the email is not tested here, but in the email generator test(s). + verifyNumberOfEmailsSent(1); + EmailWrapper sentAdminAlertEmail = mockEmailSender.getEmailsSent().get(0); + assertEquals(EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT, sentAdminAlertEmail.getType()); + } + + @Test + void testExecute_leadingAndTrailingSpacesAndNullComments_createsSuccessfully() { + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail(" kwisatz.haderach@atreides.org "); + request.setInstructorName(" Paul Atreides "); + request.setInstructorInstitution(" House Atreides "); + CreateAccountRequestAction action = getAction(request); + JsonResult result = getJsonResult(action); + AccountRequestData output = (AccountRequestData) result.getOutput(); + assertEquals("kwisatz.haderach@atreides.org", output.getEmail()); + assertEquals("Paul Atreides", output.getName()); + assertEquals("House Atreides", output.getInstitute()); + assertEquals(AccountRequestStatus.PENDING, output.getStatus()); + assertNull(output.getComments()); + assertNull(output.getRegisteredAt()); + AccountRequest accountRequest = logic.getAccountRequestByRegistrationKey(output.getRegistrationKey()); + assertEquals("kwisatz.haderach@atreides.org", accountRequest.getEmail()); + assertEquals("Paul Atreides", accountRequest.getName()); + assertEquals("House Atreides", accountRequest.getInstitute()); + assertEquals(AccountRequestStatus.PENDING, accountRequest.getStatus()); + assertNull(accountRequest.getComments()); + assertNull(accountRequest.getRegisteredAt()); + verifySpecifiedTasksAdded(Const.TaskQueue.SEARCH_INDEXING_QUEUE_NAME, 1); + verifyNumberOfEmailsSent(1); + EmailWrapper sentAdminAlertEmail = mockEmailSender.getEmailsSent().get(0); + assertEquals(EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT, sentAdminAlertEmail.getType()); + } + + @Test + void testExecute_accountRequestWithSameEmailAddressAndInstituteAlreadyExists_createsSuccessfully() + throws InvalidParametersException { + AccountRequest existingAccountRequest = logic.createAccountRequest("Paul Atreides", "kwisatz.haderach@atreides.org", + "House Atreides", AccountRequestStatus.PENDING, "My road leads into the desert. I can see it."); + AccountCreateRequest request = new AccountCreateRequest(); + request.setInstructorEmail("kwisatz.haderach@atreides.org"); + request.setInstructorName("Paul Atreides"); + request.setInstructorInstitution("House Atreides"); + request.setInstructorComments("My road leads into the desert. I can see it."); + CreateAccountRequestAction action = getAction(request); + JsonResult result = getJsonResult(action); + AccountRequestData output = (AccountRequestData) result.getOutput(); + assertEquals("kwisatz.haderach@atreides.org", output.getEmail()); + assertEquals("Paul Atreides", output.getName()); + assertEquals("House Atreides", output.getInstitute()); + assertEquals(AccountRequestStatus.PENDING, output.getStatus()); + assertEquals("My road leads into the desert. I can see it.", output.getComments()); + assertNull(output.getRegisteredAt()); + assertNotEquals(output.getRegistrationKey(), existingAccountRequest.getRegistrationKey()); + AccountRequest accountRequest = logic.getAccountRequestByRegistrationKey(output.getRegistrationKey()); + assertEquals("kwisatz.haderach@atreides.org", accountRequest.getEmail()); + assertEquals("Paul Atreides", accountRequest.getName()); + assertEquals("House Atreides", accountRequest.getInstitute()); + assertEquals(AccountRequestStatus.PENDING, accountRequest.getStatus()); + assertEquals("My road leads into the desert. I can see it.", accountRequest.getComments()); + assertNull(accountRequest.getRegisteredAt()); + verifySpecifiedTasksAdded(Const.TaskQueue.SEARCH_INDEXING_QUEUE_NAME, 1); + verifyNumberOfEmailsSent(1); + EmailWrapper sentAdminAlertEmail = mockEmailSender.getEmailsSent().get(0); assertEquals(EmailType.NEW_ACCOUNT_REQUEST_ADMIN_ALERT, sentAdminAlertEmail.getType()); } @Override + @Test protected void testAccessControl() throws Exception { - // This is not tested due to upcoming changes in behaviour. + verifyAccessibleWithoutLogin(); } } diff --git a/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java index 70f97471d6f..95550962ed5 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java @@ -15,7 +15,7 @@ * The data transfer object for {@link AccountRequest} entities. */ public final class AccountRequestAttributes extends EntityAttributes { - + private String id; private String email; private String name; private String institute; @@ -38,7 +38,7 @@ private AccountRequestAttributes(String email, String institute, String name) { public static AccountRequestAttributes valueOf(AccountRequest accountRequest) { AccountRequestAttributes accountRequestAttributes = new AccountRequestAttributes(accountRequest.getEmail(), accountRequest.getInstitute(), accountRequest.getName()); - + accountRequestAttributes.id = accountRequest.getId(); accountRequestAttributes.registrationKey = accountRequest.getRegistrationKey(); accountRequestAttributes.registeredAt = accountRequest.getRegisteredAt(); accountRequestAttributes.createdAt = accountRequest.getCreatedAt(); @@ -53,6 +53,10 @@ public static Builder builder(String email, String institute, String name) { return new Builder(email, institute, name); } + public String getId() { + return id; + } + public String getRegistrationKey() { return registrationKey; } diff --git a/src/main/java/teammates/ui/output/AccountRequestData.java b/src/main/java/teammates/ui/output/AccountRequestData.java index 2d50bcb1360..92dc77ed50a 100644 --- a/src/main/java/teammates/ui/output/AccountRequestData.java +++ b/src/main/java/teammates/ui/output/AccountRequestData.java @@ -2,6 +2,7 @@ import javax.annotation.Nullable; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.attributes.AccountRequestAttributes; import teammates.storage.sqlentity.AccountRequest; @@ -9,36 +10,44 @@ * Output format of account request data. */ public class AccountRequestData extends ApiOutput { - + private final String id; private final String email; private final String name; private final String institute; private final String registrationKey; + private final AccountRequestStatus status; + @Nullable + private final String comments; @Nullable private final Long registeredAt; private final long createdAt; public AccountRequestData(AccountRequestAttributes accountRequestInfo) { - + this.id = accountRequestInfo.getId(); this.name = accountRequestInfo.getName(); this.email = accountRequestInfo.getEmail(); this.institute = accountRequestInfo.getInstitute(); this.registrationKey = accountRequestInfo.getRegistrationKey(); + this.comments = null; this.createdAt = accountRequestInfo.getCreatedAt().toEpochMilli(); if (accountRequestInfo.getRegisteredAt() == null) { + this.status = AccountRequestStatus.APPROVED; this.registeredAt = null; } else { + this.status = AccountRequestStatus.REGISTERED; this.registeredAt = accountRequestInfo.getRegisteredAt().toEpochMilli(); } } public AccountRequestData(AccountRequest accountRequest) { - + this.id = accountRequest.getId().toString(); this.name = accountRequest.getName(); this.email = accountRequest.getEmail(); this.institute = accountRequest.getInstitute(); this.registrationKey = accountRequest.getRegistrationKey(); + this.status = accountRequest.getStatus(); + this.comments = accountRequest.getComments(); this.createdAt = accountRequest.getCreatedAt().toEpochMilli(); if (accountRequest.getRegisteredAt() == null) { @@ -48,6 +57,10 @@ public AccountRequestData(AccountRequest accountRequest) { } } + public String getId() { + return id; + } + public String getInstitute() { return institute; } @@ -64,6 +77,14 @@ public String getRegistrationKey() { return registrationKey; } + public AccountRequestStatus getStatus() { + return status; + } + + public String getComments() { + return comments; + } + public Long getRegisteredAt() { return registeredAt; } diff --git a/src/main/java/teammates/ui/request/AccountCreateRequest.java b/src/main/java/teammates/ui/request/AccountCreateRequest.java index f3097ce1152..9e39b524549 100644 --- a/src/main/java/teammates/ui/request/AccountCreateRequest.java +++ b/src/main/java/teammates/ui/request/AccountCreateRequest.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import javax.annotation.Nullable; + import teammates.common.util.FieldValidator; import teammates.common.util.StringHelper; @@ -14,6 +16,8 @@ public class AccountCreateRequest extends BasicRequest { private String instructorEmail; private String instructorName; private String instructorInstitution; + @Nullable + private String instructorComments; public String getInstructorEmail() { return instructorEmail; @@ -27,6 +31,10 @@ public String getInstructorInstitution() { return this.instructorInstitution; } + public String getInstructorComments() { + return this.instructorComments; + } + public void setInstructorName(String name) { this.instructorName = name; } @@ -39,6 +47,10 @@ public void setInstructorEmail(String instructorEmail) { this.instructorEmail = instructorEmail; } + public void setInstructorComments(String instructorComments) { + this.instructorComments = instructorComments; + } + @Override public void validate() throws InvalidHttpRequestBodyException { assertTrue(this.instructorEmail != null, "email cannot be null"); diff --git a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java index b6243a0016f..34a450f3b65 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java @@ -4,14 +4,24 @@ import teammates.common.exception.InvalidParametersException; import teammates.common.util.EmailWrapper; import teammates.storage.sqlentity.AccountRequest; -import teammates.ui.output.JoinLinkData; +import teammates.ui.output.AccountRequestData; import teammates.ui.request.AccountCreateRequest; import teammates.ui.request.InvalidHttpRequestBodyException; /** * Creates a new account request. */ -public class CreateAccountRequestAction extends AdminOnlyAction { +public class CreateAccountRequestAction extends Action { + + @Override + AuthType getMinAuthLevel() { + return AuthType.PUBLIC; + } + + @Override + void checkSpecificAccessControl() throws UnauthorizedAccessException { + // Nothing needs to be done here because anybody should be able to create an account request. + } @Override public JsonResult execute() @@ -21,9 +31,10 @@ public JsonResult execute() String instructorName = createRequest.getInstructorName().trim(); String instructorEmail = createRequest.getInstructorEmail().trim(); String instructorInstitution = createRequest.getInstructorInstitution().trim(); - // TODO: This is a placeholder. It should be obtained from AccountCreateRequest, in a separate PR. - String comments = "PLACEHOLDER"; - + String comments = createRequest.getInstructorComments(); + if (comments != null) { + comments = comments.trim(); + } AccountRequest accountRequest; try { @@ -35,19 +46,9 @@ public JsonResult execute() } assert accountRequest != null; - - if (accountRequest.getRegisteredAt() != null) { - throw new InvalidOperationException("Cannot create account request as instructor has already registered."); - } - - String joinLink = accountRequest.getRegistrationUrl(); - - EmailWrapper email = emailGenerator.generateNewInstructorAccountJoinEmail( - instructorEmail, instructorName, joinLink); - emailSender.sendEmail(email); EmailWrapper adminAlertEmail = sqlEmailGenerator.generateNewAccountRequestAdminAlertEmail(accountRequest); emailSender.sendEmail(adminAlertEmail); - JoinLinkData output = new JoinLinkData(joinLink); + AccountRequestData output = new AccountRequestData(accountRequest); return new JsonResult(output); } diff --git a/src/test/java/teammates/logic/core/AccountRequestsLogicTest.java b/src/test/java/teammates/logic/core/AccountRequestsLogicTest.java index 88cfd8430b3..24a66afbe6d 100644 --- a/src/test/java/teammates/logic/core/AccountRequestsLogicTest.java +++ b/src/test/java/teammates/logic/core/AccountRequestsLogicTest.java @@ -9,6 +9,7 @@ import teammates.common.exception.InvalidParametersException; import teammates.common.util.Const; import teammates.common.util.FieldValidator; +import teammates.storage.entity.AccountRequest; import teammates.test.AssertHelper; /** @@ -108,7 +109,10 @@ public void testUpdateAccountRequest() throws Exception { @Test public void testDeleteAccountRequest() throws Exception { - AccountRequestAttributes a = dataBundle.accountRequests.get("unregisteredInstructor1"); + // This ensures the AccountRequestAttributes has the correct ID. + AccountRequestAttributes accountRequestAttributes = dataBundle.accountRequests.get("unregisteredInstructor1"); + AccountRequest accountRequest = accountRequestAttributes.toEntity(); + AccountRequestAttributes a = AccountRequestAttributes.valueOf(accountRequest); ______TS("silent deletion of non-existent account request"); diff --git a/src/test/java/teammates/ui/webapi/CreateAccountRequestActionTest.java b/src/test/java/teammates/ui/webapi/CreateAccountRequestActionTest.java index 1fb58f95c6b..2e1cfa96b05 100644 --- a/src/test/java/teammates/ui/webapi/CreateAccountRequestActionTest.java +++ b/src/test/java/teammates/ui/webapi/CreateAccountRequestActionTest.java @@ -4,9 +4,7 @@ import teammates.common.datatransfer.attributes.AccountRequestAttributes; import teammates.common.util.Const; -import teammates.common.util.EmailType; -import teammates.common.util.EmailWrapper; -import teammates.ui.output.JoinLinkData; +import teammates.ui.output.AccountRequestData; import teammates.ui.request.AccountCreateRequest; import teammates.ui.request.InvalidHttpRequestBodyException; @@ -64,45 +62,23 @@ protected void testExecute() { assertEquals(institute, accountRequestAttributes.getInstitute()); assertNotNull(accountRequestAttributes.getRegistrationKey()); - String joinLink = accountRequestAttributes.getRegistrationUrl(); - JoinLinkData output = (JoinLinkData) r.getOutput(); - assertEquals(joinLink, output.getJoinLink()); + String registrationKey = accountRequestAttributes.getRegistrationKey(); + AccountRequestData output = (AccountRequestData) r.getOutput(); + assertEquals(registrationKey, output.getRegistrationKey()); - verifyNumberOfEmailsSent(1); + verifyNoEmailsSent(); verifySpecifiedTasksAdded(Const.TaskQueue.SEARCH_INDEXING_QUEUE_NAME, 1); - EmailWrapper emailSent = mockEmailSender.getEmailsSent().get(0); - assertEquals(String.format(EmailType.NEW_INSTRUCTOR_ACCOUNT.getSubject(), name), - emailSent.getSubject()); - assertEquals(email, emailSent.getRecipient()); - assertTrue(emailSent.getContent().contains(joinLink)); - - ______TS("Account request already exists: instructor unregistered, email sent again"); + ______TS("Account request already exists: instructor unregistered"); a = getAction(req); r = getJsonResult(a); - output = (JoinLinkData) r.getOutput(); - assertEquals(joinLink, output.getJoinLink()); + output = (AccountRequestData) r.getOutput(); + assertEquals(registrationKey, output.getRegistrationKey()); - verifyNumberOfEmailsSent(1); + verifyNoEmailsSent(); verifyNoTasksAdded(); // Account request not added to search indexing queue - emailSent = mockEmailSender.getEmailsSent().get(0); - assertEquals(String.format(EmailType.NEW_INSTRUCTOR_ACCOUNT.getSubject(), name), - emailSent.getSubject()); - assertEquals(email, emailSent.getRecipient()); - assertTrue(emailSent.getContent().contains(joinLink)); - - ______TS("Account request already exists: instructor registered, InvalidOperationException thrown"); - - accountRequestAttributes = typicalBundle.accountRequests.get("instructor1OfCourse1"); - - req = buildCreateRequest(accountRequestAttributes.getName(), - accountRequestAttributes.getInstitute(), accountRequestAttributes.getEmail()); - - InvalidOperationException ioe = verifyInvalidOperation(req); - assertEquals("Cannot create account request as instructor has already registered.", ioe.getMessage()); - ______TS("Error: invalid parameter"); String invalidName = "James%20Bond99"; diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts index e512fa76819..3b25ac9d1a4 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts @@ -12,6 +12,7 @@ import { LinkService } from '../../../services/link.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { createMockNgbModalRef } from '../../../test-helpers/mock-ngb-modal-ref'; +import { AccountRequestStatus } from '../../../types/api-output'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; @@ -186,15 +187,24 @@ describe('AdminHomePageComponent', () => { }, ]; jest.spyOn(accountService, 'createAccountRequest').mockReturnValue(of({ - joinLink: 'http://localhost:4200/web/join', + id: 'some.person@example.com%NUS', + email: 'some.person@example.com', + name: 'Some Person', + institute: 'NUS', + status: AccountRequestStatus.APPROVED, + registrationKey: 'registrationKey', + createdAt: 528, })); + jest.spyOn(linkService, 'generateAccountRegistrationLink') + .mockReturnValue('http://localhost:4200/web/join?iscreatingaccount=true&key=registrationKey'); fixture.detectChanges(); const index: number = 0; component.addInstructor(index); expect(component.instructorsConsolidated[index].status).toEqual('SUCCESS'); - expect(component.instructorsConsolidated[index].joinLink).toEqual('http://localhost:4200/web/join'); + expect(component.instructorsConsolidated[index].joinLink) + .toEqual('http://localhost:4200/web/join?iscreatingaccount=true&key=registrationKey'); expect(component.activeRequests).toEqual(0); }); diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts index 1e29bd2bdb8..e6544a0e7b7 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts @@ -8,7 +8,7 @@ import { CourseService } from '../../../services/course.service'; import { LinkService } from '../../../services/link.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { Account, Accounts, Courses, JoinLink } from '../../../types/api-output'; +import { Account, AccountRequest, Accounts, Courses, JoinLink } from '../../../types/api-output'; import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -117,10 +117,10 @@ export class AdminHomePageComponent { this.isAddingInstructors = false; })) .subscribe({ - next: (resp: JoinLink) => { + next: (resp: AccountRequest) => { instructor.status = 'SUCCESS'; instructor.statusCode = 200; - instructor.joinLink = resp.joinLink; + instructor.joinLink = this.linkService.generateAccountRegistrationLink(resp.registrationKey); this.activeRequests -= 1; }, error: (resp: ErrorMessageOutput) => { diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index f278335db55..914a825a21a 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { HttpRequestService } from './http-request.service'; import { ResourceEndpoints } from '../types/api-const'; -import { Account, Accounts, JoinLink, MessageOutput } from '../types/api-output'; +import { Account, AccountRequest, Accounts, JoinLink, MessageOutput } from '../types/api-output'; import { AccountCreateRequest } from '../types/api-request'; /** @@ -29,7 +29,7 @@ export class AccountService { /** * Creates an account request by calling API. */ - createAccountRequest(request: AccountCreateRequest): Observable { + createAccountRequest(request: AccountCreateRequest): Observable { return this.httpRequestService.post(ResourceEndpoints.ACCOUNT_REQUEST, {}, request); } diff --git a/src/web/services/search.service.spec.ts b/src/web/services/search.service.spec.ts index affbf259b4a..e548b693cff 100644 --- a/src/web/services/search.service.spec.ts +++ b/src/web/services/search.service.spec.ts @@ -13,6 +13,7 @@ import createSpyFromClass from '../test-helpers/create-spy-from-class'; import { ResourceEndpoints } from '../types/api-const'; import { AccountRequest, + AccountRequestStatus, Course, FeedbackSession, FeedbackSessionPublishStatus, @@ -184,11 +185,13 @@ describe('SearchService', () => { }; const mockAccountRequest: AccountRequest = { + id: 'test@example.com%Test Institute', registrationKey: 'regkey', createdAt: 1585487897502, name: 'Test Instructor', institute: 'Test Institute', email: 'test@example.com', + status: AccountRequestStatus.APPROVED, }; beforeEach(() => { @@ -294,7 +297,11 @@ describe('SearchService', () => { it('should join account requests accurately when timezone can be guessed and instructor is registered', () => { jest.spyOn(timezoneService, 'guessTimezone').mockReturnValue('Asia/Singapore'); - const accountRequest: AccountRequest = { ...mockAccountRequest, registeredAt: 1685487897502 }; + const accountRequest: AccountRequest = { + ...mockAccountRequest, + registeredAt: 1685487897502, + status: AccountRequestStatus.REGISTERED, + }; const result: AccountRequestSearchResult = service.joinAdminAccountRequest(accountRequest); expect(result.email).toBe('test@example.com'); From f7eaa617f1e129a828bc4eb5b3f2776629ef9a3f Mon Sep 17 00:00:00 2001 From: Xenos F Date: Wed, 27 Mar 2024 11:30:59 +0800 Subject: [PATCH 08/95] [#11878] Upgrade instructor request form UI (#12929) * Add confirmation prompt * Remove old form iframe * Improve declaration view spacing * Edit page heading phrasing for clarity * Create request form * Add validation messages * Fix form validation * Set up form submission confirmation * Create submission acknowledgement view * Fix URL checking regex * Fix initial state * Display placeholder when optional field is empty * Fix code style * Edit comment for clarity * Fix institution and country combination Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> * Fix naming * Remove hard line break * Add explanatory comment for regex * Remove newline * Add newlines at end of file * Clear styles file * Re-add styles file * Include test * Add test cases for requestSubmissionEvent * Improve test case readability * Edit test case name for clarity * Add snapshot tests * Revert "Add snapshot tests" This reverts commit ec7395d4e8bd0d956f3c355b9906ec0ab3ae0f58. * Fix lint errors * Rename methods to be clearer * Disable submit button when not ready to submit --------- Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> --- .../instructor-request-form-model.ts | 8 ++ .../instructor-request-form.component.html | 92 +++++++++++++++++ .../instructor-request-form.component.scss | 22 +++++ .../instructor-request-form.component.spec.ts | 76 ++++++++++++++ .../instructor-request-form.component.ts | 98 +++++++++++++++++++ .../request-page/request-page.component.html | 74 +++++++++++--- .../request-page/request-page.component.scss | 5 + .../request-page/request-page.component.ts | 10 ++ .../request-page/request-page.module.ts | 6 ++ 9 files changed, 380 insertions(+), 11 deletions(-) create mode 100644 src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form-model.ts create mode 100644 src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.html create mode 100644 src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss create mode 100644 src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts create mode 100644 src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form-model.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form-model.ts new file mode 100644 index 00000000000..5b42bddc792 --- /dev/null +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form-model.ts @@ -0,0 +1,8 @@ +export type InstructorRequestFormModel = { + name: string, + institution: string, + country: string, + email: string, + homePage: string, + comments: string, +}; diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.html b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.html new file mode 100644 index 00000000000..a3aa5af576d --- /dev/null +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.html @@ -0,0 +1,92 @@ + +
+
+ +

+ This is the name that will be shown to your students. You may include salutation (Dr. Prof. etc.) +

+ + +
+
+
+ +

+ Please give full name of the university/institution. +

+ + +
+
+
+ +

+ Which country is your university/institution based in? +

+ + +
+
+
+ +

+ Please use the email address given to you by your school/university + (not your personal Gmail/Hotmail address). + Note that this email address will be visible to the students you enroll in TEAMMATES. +

+ + +
+
+
+ + + +
+
+
+ + +
+
+ +
diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss new file mode 100644 index 00000000000..addb0b11c7a --- /dev/null +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss @@ -0,0 +1,22 @@ +label.qn { + font-weight: bold; + font-size: 1rem; + margin-bottom: 0.3rem; +} + +.form-group { + margin-bottom: 0.5rem; +} + +.form-group.required > label::after { + content:"*"; + color: red; +} + +.help-block { + margin-bottom: 0.8rem; +} + +.red-font { + color: red; +} diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts new file mode 100644 index 00000000000..9d56de840b9 --- /dev/null +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts @@ -0,0 +1,76 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ReactiveFormsModule } from '@angular/forms'; +import { By } from '@angular/platform-browser'; +import { first } from 'rxjs'; +import { InstructorRequestFormModel } from './instructor-request-form-model'; +import { InstructorRequestFormComponent } from './instructor-request-form.component'; + +describe('InstructorRequestFormComponent', () => { + let component: InstructorRequestFormComponent; + let fixture: ComponentFixture; + const typicalModel: InstructorRequestFormModel = { + name: 'John Doe', + institution: 'Example Institution', + country: 'Example Country', + email: 'jd@example.edu', + homePage: 'xyz.example.edu/john', + comments: '', + }; + + /** + * Fills in form fields with the given data. + * + * @param data Data to fill form with. + */ + function fillFormWith(data: InstructorRequestFormModel): void { + component.name.setValue(data.name); + component.institution.setValue(data.institution); + component.country.setValue(data.country); + component.email.setValue(data.email); + component.homePage.setValue(data.homePage); + component.comments.setValue(data.comments); + } + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [InstructorRequestFormComponent], + imports: [ReactiveFormsModule], + }); + fixture = TestBed.createComponent(InstructorRequestFormComponent); + component = fixture.componentInstance; + + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should emit requestSubmissionEvent once when submit button is clicked', () => { + jest.spyOn(component.requestSubmissionEvent, 'emit'); + + fillFormWith(typicalModel); + const submitButton = fixture.debugElement.query(By.css('#submit-button')); + submitButton.nativeElement.click(); + + expect(component.requestSubmissionEvent.emit).toHaveBeenCalledTimes(1); + }); + + it('should emit requestSubmissionEvent with the correct data when form is submitted', () => { + // Listen for emitted value + let actualModel: InstructorRequestFormModel | null = null; + component.requestSubmissionEvent.pipe(first()) + .subscribe((data: InstructorRequestFormModel) => { actualModel = data; }); + + fillFormWith(typicalModel); + component.onSubmit(); + + expect(actualModel).toBeTruthy(); + expect(actualModel!.name).toBe(typicalModel.name); + expect(actualModel!.institution).toBe(typicalModel.institution); + expect(actualModel!.country).toBe(typicalModel.country); + expect(actualModel!.email).toBe(typicalModel.email); + expect(actualModel!.homePage).toBe(typicalModel.homePage); + expect(actualModel!.comments).toBe(typicalModel.comments); + }); +}); diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts new file mode 100644 index 00000000000..fff881cc607 --- /dev/null +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts @@ -0,0 +1,98 @@ +import { Component, EventEmitter, Output } from '@angular/core'; +import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { InstructorRequestFormModel } from './instructor-request-form-model'; + +// Use regex to validate URL field as Angular does not have a built-in URL validator +// eslint-disable-next-line +const URL_REGEX = /(https?:\/\/)?(www\.)[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)|(https?:\/\/)?(www\.)?(?!ww)[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/; + +@Component({ + selector: 'tm-instructor-request-form', + templateUrl: './instructor-request-form.component.html', + styleUrls: ['./instructor-request-form.component.scss'], +}) +export class InstructorRequestFormComponent { + + arf = new FormGroup({ + name: new FormControl('', [Validators.required]), + institution: new FormControl('', [Validators.required]), + country: new FormControl('', [Validators.required]), + email: new FormControl('', [Validators.required, Validators.email]), + homePage: new FormControl('', [Validators.pattern(URL_REGEX)]), + comments: new FormControl(''), + }, { updateOn: 'submit' }); + + // Create members for easier access of arf controls + name = this.arf.controls.name; + institution = this.arf.controls.institution; + country = this.arf.controls.country; + email = this.arf.controls.email; + homePage = this.arf.controls.homePage; + comments = this.arf.controls.comments; + + hasSubmitAttempt = false; + + @Output() requestSubmissionEvent = new EventEmitter(); + + checkIsFieldRequired(field: FormControl): boolean { + return field.hasValidator(Validators.required); + } + + checkIsFieldInvalid(field: FormControl): boolean { + return field.invalid; + } + + checkCanSubmit(): boolean { + return true; // TODO: API integration + } + + getFieldValidationClasses(field: FormControl): string { + let str = ''; + if (this.hasSubmitAttempt) { + if (field.invalid) { + str = 'is-invalid'; + } else if (field.value !== '') { + str = 'is-valid'; + } + } + return str; + } + + onSubmit(): void { + this.hasSubmitAttempt = true; + + if (this.arf.invalid) { + // Do not submit form + return; + } + + const name = this.name.value!.trim(); + const email = this.email.value!.trim(); + const country = this.country.value!.trim(); + const institution = this.institution.value!.trim(); + const combinedInstitution = `${institution}, ${country}`; + const homePage = this.homePage.value!; + const comments = this.comments.value!.trim(); + + const submittedData = { + name, + email, + institution: combinedInstitution, + homePage, + comments, + }; + // TODO: connect to API + // eslint-disable-next-line + submittedData; // PLACEHOLDER + + // Pass form input to parent to display confirmation + this.requestSubmissionEvent.emit({ + name, + institution, + country, + email, + homePage, + comments, + }); + } +} diff --git a/src/web/app/pages-static/request-page/request-page.component.html b/src/web/app/pages-static/request-page/request-page.component.html index 6314f2563bd..315ecb5b534 100644 --- a/src/web/app/pages-static/request-page/request-page.component.html +++ b/src/web/app/pages-static/request-page/request-page.component.html @@ -1,14 +1,66 @@

- Request for an Account + Request for an Instructor Account

-
-

- Cannot see the request form below? Click here. -

- -
-
- The URL for the account request form is not set. +
+
+

+ Request for an instructor account using this form if you are an instructor and want to use TEAMMATES to manage peer evaluations and/or other feedback paths of your students. +

+
+
+

+ Note: Students should not use this form to request for TEAMMATES accounts, as students do not need accounts to use TEAMMATES. Instead, TEAMMATES will email students (who have been added to TEAMMATES by a course instructor) an access link when there is a TEAMMATES session available for them to access. +

+ Back to home page + +
+
+ +
+
+
+
+

+ Your request has been submitted successfully: +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Full Name{{submittedFormData.name}}
Institution{{submittedFormData.institution}}
Country{{submittedFormData.country}}
Email{{submittedFormData.email}}
Home Page URL + {{submittedFormData.homePage}} + +
Comments + {{submittedFormData.comments}} + +
+

+ We have sent an acknowledgement email to your email address {{submittedFormData.email}}. + Please check your email inbox or spam folder. + If you do not receive the acknowledgement email within 1 hour, please contact us. +

+
diff --git a/src/web/app/pages-static/request-page/request-page.component.scss b/src/web/app/pages-static/request-page/request-page.component.scss index e69de29bb2d..3d1f1c83751 100644 --- a/src/web/app/pages-static/request-page/request-page.component.scss +++ b/src/web/app/pages-static/request-page/request-page.component.scss @@ -0,0 +1,5 @@ +.empty-field-placeholder::after { + content: "(empty)"; + opacity: 0.5; + font-style: italic; +} diff --git a/src/web/app/pages-static/request-page/request-page.component.ts b/src/web/app/pages-static/request-page/request-page.component.ts index 6cb307baa4b..7f0c2f15524 100644 --- a/src/web/app/pages-static/request-page/request-page.component.ts +++ b/src/web/app/pages-static/request-page/request-page.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; +import { InstructorRequestFormModel } from './instructor-request-form/instructor-request-form-model'; import { environment } from '../../../environments/environment'; /** @@ -13,6 +14,8 @@ import { environment } from '../../../environments/environment'; export class RequestPageComponent { accountRequestFormUrl: SafeResourceUrl | null; + isDeclarationDone: boolean = false; + submittedFormData: InstructorRequestFormModel | null = null; constructor(private sanitizer: DomSanitizer) { this.accountRequestFormUrl = environment.accountRequestFormUrl @@ -20,4 +23,11 @@ export class RequestPageComponent { : null; } + onDeclarationButtonClicked(): void { + this.isDeclarationDone = true; + } + + onRequestSubmitted(data: InstructorRequestFormModel): void { + this.submittedFormData = data; + } } diff --git a/src/web/app/pages-static/request-page/request-page.module.ts b/src/web/app/pages-static/request-page/request-page.module.ts index 9c16ee6fc4b..7333207fc0b 100644 --- a/src/web/app/pages-static/request-page/request-page.module.ts +++ b/src/web/app/pages-static/request-page/request-page.module.ts @@ -1,7 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; +import { InstructorRequestFormComponent } from './instructor-request-form/instructor-request-form.component'; import { RequestPageComponent } from './request-page.component'; +import { TeammatesRouterModule } from '../../components/teammates-router/teammates-router.module'; const routes: Routes = [ { @@ -16,6 +19,7 @@ const routes: Routes = [ @NgModule({ declarations: [ RequestPageComponent, + InstructorRequestFormComponent, ], exports: [ RequestPageComponent, @@ -23,6 +27,8 @@ const routes: Routes = [ imports: [ CommonModule, RouterModule.forChild(routes), + TeammatesRouterModule, + ReactiveFormsModule, ], }) export class RequestPageModule { } From 40613dff7486e2224c1375a218f55f442279a4e9 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Wed, 27 Mar 2024 19:23:23 +0800 Subject: [PATCH 09/95] [#11878] Update Admin Home Page UI for ARF (#12933) * create component for account request table * cherry pick admin home page changes * remove testing code * fix lint and css issues * fix admin home page snaps * update admin home snaps * remove edit approve and reject components * modify css * delete edit and reject modal components * revert spec file changes * integrate new types * fix lint * use enum for status * fix lint * fix css lint * fix lint * fix lint * use enum and remove infinite scroll * remove approve account request code * remove extra div * fix url * modify comments * revert extra formatting * remove plural form and use date pipe * fix naming * fix spec file and update institute formatting * fix lint * combine institute and country columns --- .../account-request-table-model.ts | 14 +++ .../account-request-table.component.html | 83 ++++++++++++++ .../account-request-table.component.scss | 63 +++++++++++ .../account-request-table.component.ts | 105 ++++++++++++++++++ .../account-request-table.module.ts | 26 +++++ .../admin-home-page.component.spec.ts.snap | 18 +++ .../admin-home-page.component.html | 1 + .../admin-home-page.component.spec.ts | 4 + .../admin-home-page.component.ts | 48 +++++++- .../admin-home-page/admin-home-page.module.ts | 6 + .../admin-search-page.component.spec.ts | 15 ++- src/web/services/account.service.ts | 21 +++- src/web/services/search.service.spec.ts | 1 + src/web/services/search.service.ts | 12 +- 14 files changed, 408 insertions(+), 9 deletions(-) create mode 100644 src/web/app/components/account-requests-table/account-request-table-model.ts create mode 100644 src/web/app/components/account-requests-table/account-request-table.component.html create mode 100644 src/web/app/components/account-requests-table/account-request-table.component.scss create mode 100755 src/web/app/components/account-requests-table/account-request-table.component.ts create mode 100644 src/web/app/components/account-requests-table/account-request-table.module.ts diff --git a/src/web/app/components/account-requests-table/account-request-table-model.ts b/src/web/app/components/account-requests-table/account-request-table-model.ts new file mode 100644 index 00000000000..ef8b8732f0b --- /dev/null +++ b/src/web/app/components/account-requests-table/account-request-table-model.ts @@ -0,0 +1,14 @@ +/** + * Model for the row entries in the account requests table. + */ +export interface AccountRequestTableRowModel { + name: string; + email: string; + status: string; + instituteAndCountry: string; + createdAtText: string; + registeredAtText: string; + comments: string; + registrationLink: string; + showLinks: boolean; +} diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html new file mode 100644 index 00000000000..7dcb95031c7 --- /dev/null +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -0,0 +1,83 @@ +
+
+
+ Account Requests Found +
+ + Pending Account Requests + +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameEmailStatusInstitute, CountryCreated AtRegistered AtCommentsOptions
+
+
+ + +
+ 		{{ accountRequest.email }}{{ accountRequest.status }}{{ accountRequest.instituteAndCountry }}{{ accountRequest.createdAtText }}{{ accountRequest.registeredAtText || 'Not Registered Yet' }} +
+ {{ accountRequest.comments }} +
+ 		+
+
+ + + +
+
+ + + +
+
+ +
+
+
+
    +
  • + Account Registration Link + +
    • +
+
+
diff --git a/src/web/app/components/account-requests-table/account-request-table.component.scss b/src/web/app/components/account-requests-table/account-request-table.component.scss new file mode 100644 index 00000000000..ce0f5d400b3 --- /dev/null +++ b/src/web/app/components/account-requests-table/account-request-table.component.scss @@ -0,0 +1,63 @@ +::ng-deep .highlighted-text { + background-color: yellow; +} + +.table-responsive { + overflow: -moz-scrollbars-horizontal; +} + +.table-responsive > table > thead > tr > th { + white-space: nowrap; +} + +/* stylelint-disable property-no-vendor-prefix */ +::-webkit-scrollbar { + -webkit-appearance: none; + width: 1px; +} + +::-webkit-scrollbar-thumb { + border-radius: 0; + background-color: rgb(0 0 0 / 50%); + box-shadow: 0 0 1px rgb(255 255 255 / 50%); +} + + +#search-table-account-request { + border-collapse: collapse; +} + + +#search-table-account-request th:last-child, +#search-table-account-request td:last-child { + min-width: 10vw; + position: sticky; + right: 0; + z-index: 1; + background-color: #F8F9FA; +} + +#search-table-account-request th:last-child::after, +#search-table-account-request td:last-child::after { + content: ""; + position: absolute; + left: -1px; + top: 0; + bottom: 0; + width: 1px; + background: #c8c7c7; + z-index: 1; +} + +#comment-box { + min-height: 5vh; + width: max(800px, 35vw); + max-width: max-content; + word-break: break-word; + word-wrap: break-all; + +} + +.dropdown-item { + border: none; +} diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts new file mode 100755 index 00000000000..dc3ef132795 --- /dev/null +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -0,0 +1,105 @@ +import { Component, Input } from '@angular/core'; +import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { AccountRequestTableRowModel } from './account-request-table-model'; +import { AccountService } from '../../../services/account.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; +import { StatusMessageService } from '../../../services/status-message.service'; +import { MessageOutput } from '../../../types/api-output'; +import { ErrorMessageOutput } from '../../error-message-output'; +import { SimpleModalType } from '../simple-modal/simple-modal-type'; +import { collapseAnim } from '../teammates-common/collapse-anim'; + +/** + * Account requests table component. + */ +@Component({ + selector: 'tm-account-request-table', + templateUrl: './account-request-table.component.html', + styleUrls: ['./account-request-table.component.scss'], + animations: [collapseAnim], +}) + +export class AccountRequestTableComponent { + + @Input() + accountRequests: AccountRequestTableRowModel[] = []; + + @Input() + searchString = ''; + + constructor( + private statusMessageService: StatusMessageService, + private simpleModalService: SimpleModalService, + private accountService: AccountService, + ) {} + + /** + * Shows all account requests' links in the page. + */ + showAllAccountRequestsLinks(): void { + for (const accountRequest of this.accountRequests) { + accountRequest.showLinks = true; + } + } + + /** + * Hides all account requests' links in the page. + */ + hideAllAccountRequestsLinks(): void { + for (const accountRequest of this.accountRequests) { + accountRequest.showLinks = false; + } + } + + resetAccountRequest(accountRequest: AccountRequestTableRowModel): void { + const modalContent = `Are you sure you want to reset the account request for + ${accountRequest.name} with email ${accountRequest.email} from + ${accountRequest.instituteAndCountry}? + An email with the account registration link will also be sent to the instructor.`; + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Reset account request for ${accountRequest.name}?`, SimpleModalType.WARNING, modalContent); + + modalRef.result.then(() => { + this.accountService.resetAccountRequest(accountRequest.email, accountRequest.instituteAndCountry) + .subscribe({ + next: () => { + this.statusMessageService + .showSuccessToast(`Reset successful. An email has been sent to ${accountRequest.email}.`); + accountRequest.registeredAtText = ''; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + }, () => {}); + } + + deleteAccountRequest(accountRequest: AccountRequestTableRowModel): void { + const modalContent: string = `Are you sure you want to delete the account request for + ${accountRequest.name} with email ${accountRequest.email} from + ${accountRequest.instituteAndCountry}?`; + const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( + `Delete account request for ${accountRequest.name}?`, SimpleModalType.DANGER, modalContent); + + modalRef.result.then(() => { + this.accountService.deleteAccountRequest(accountRequest.email, accountRequest.instituteAndCountry) + .subscribe({ + next: (resp: MessageOutput) => { + this.statusMessageService.showSuccessToast(resp.message); + this.accountRequests = this.accountRequests.filter((x: AccountRequestTableRowModel) => x !== accountRequest); + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + }, () => {}); + } + + viewAccountRequest(accountRequest: AccountRequestTableRowModel): void { + const modalContent: string = `Comment: ${accountRequest.comments || ''}`; + const modalRef: NgbModalRef = this.simpleModalService.openInformationModal( + `Comments for ${accountRequest.name} Request`, SimpleModalType.INFO, modalContent); + + modalRef.result.then(() => {}, () => {}); + } +} diff --git a/src/web/app/components/account-requests-table/account-request-table.module.ts b/src/web/app/components/account-requests-table/account-request-table.module.ts new file mode 100644 index 00000000000..1a05086cc4b --- /dev/null +++ b/src/web/app/components/account-requests-table/account-request-table.module.ts @@ -0,0 +1,26 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { NgbTooltipModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { AccountRequestTableComponent } from './account-request-table.component'; +import { Pipes } from '../../pipes/pipes.module'; + +/** + * Module for account requests table. + */ +@NgModule({ + declarations: [ + AccountRequestTableComponent, + ], + exports: [ + AccountRequestTableComponent, + ], + imports: [ + CommonModule, + FormsModule, + NgbTooltipModule, + NgbDropdownModule, + Pipes, + ], +}) +export class AccountRequestTableModule { } diff --git a/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap b/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap index db32b59235a..bc11da02df6 100644 --- a/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap +++ b/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap @@ -2,9 +2,12 @@ exports[`AdminHomePageComponent should snap with default view 1`] = `
Student for the following {{ account.studentCours
+ diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts index 3b25ac9d1a4..00dbb94d783 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.spec.ts @@ -13,8 +13,10 @@ import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { createMockNgbModalRef } from '../../../test-helpers/mock-ngb-modal-ref'; import { AccountRequestStatus } from '../../../types/api-output'; +import { AccountRequestTableModule } from '../../components/account-requests-table/account-request-table.module'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; +import { FormatDateDetailPipe } from '../../components/teammates-common/format-date-detail.pipe'; describe('AdminHomePageComponent', () => { let component: AdminHomePageComponent; @@ -34,12 +36,14 @@ describe('AdminHomePageComponent', () => { FormsModule, HttpClientTestingModule, LoadingSpinnerModule, + AccountRequestTableModule, AjaxLoadingModule, RouterTestingModule, ], providers: [ AccountService, CourseService, + FormatDateDetailPipe, SimpleModalService, StatusMessageService, LinkService, diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts index e6544a0e7b7..efe69122c39 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.ts @@ -1,4 +1,4 @@ -import { Component, TemplateRef, ViewChild } from '@angular/core'; +import { Component, TemplateRef, ViewChild, OnInit } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin, Observable, of, throwError } from 'rxjs'; import { catchError, finalize, map, mergeMap } from 'rxjs/operators'; @@ -8,8 +8,11 @@ import { CourseService } from '../../../services/course.service'; import { LinkService } from '../../../services/link.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { Account, AccountRequest, Accounts, Courses, JoinLink } from '../../../types/api-output'; +import { TimezoneService } from '../../../services/timezone.service'; +import { Account, AccountRequest, Accounts, AccountRequests, Courses, JoinLink } from '../../../types/api-output'; +import { AccountRequestTableRowModel } from '../../components/account-requests-table/account-request-table-model'; import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; +import { FormatDateDetailPipe } from '../../components/teammates-common/format-date-detail.pipe'; import { ErrorMessageOutput } from '../../error-message-output'; /** @@ -20,7 +23,7 @@ import { ErrorMessageOutput } from '../../error-message-output'; templateUrl: './admin-home-page.component.html', styleUrls: ['./admin-home-page.component.scss'], }) -export class AdminHomePageComponent { +export class AdminHomePageComponent implements OnInit { instructorDetails: string = ''; instructorName: string = ''; @@ -28,7 +31,11 @@ export class AdminHomePageComponent { instructorInstitution: string = ''; instructorsConsolidated: InstructorData[] = []; + accountReqs: AccountRequestTableRowModel[] = []; activeRequests: number = 0; + currentPage: number = 1; + pageSize: number = 20; + items$: Observable = of([]); isAddingInstructors: boolean = false; @@ -43,10 +50,16 @@ export class AdminHomePageComponent { private courseService: CourseService, private simpleModalService: SimpleModalService, private statusMessageService: StatusMessageService, + private timezoneService: TimezoneService, private linkService: LinkService, private ngbModal: NgbModal, + private formatDateDetailPipe: FormatDateDetailPipe, ) {} + ngOnInit(): void { + this.fetchAccountRequests(); + } + /** * Validates and adds the instructor details filled with first form. */ @@ -236,6 +249,35 @@ export class AdminHomePageComponent { ); } + private formatAccountRequests(requests: AccountRequests): AccountRequestTableRowModel[] { + const timezone: string = this.timezoneService.guessTimezone() || 'UTC'; + return requests.accountRequests.map((request) => { + return { + name: request.name, + email: request.email, + status: request.status, + instituteAndCountry: request.institute, + createdAtText: this.formatDateDetailPipe.transform(request.createdAt, timezone), + registeredAtText: request.registeredAt + ? this.formatDateDetailPipe.transform(request.registeredAt, timezone) : '', + comments: request.comments || '', + registrationLink: '', + showLinks: false, + }; + }); + } + + fetchAccountRequests(): void { + this.accountService.getPendingAccountRequests().subscribe({ + next: (resp: AccountRequests) => { + this.accountReqs = this.formatAccountRequests(resp); + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + } + resetAccountRequest(i: number): void { const modalContent = `Are you sure you want to reset the account request for ${this.instructorsConsolidated[i].name} with email diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts b/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts index 163b70e981e..d336c46e5ba 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.module.ts @@ -4,8 +4,10 @@ import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { AdminHomePageComponent } from './admin-home-page.component'; import { NewInstructorDataRowComponent } from './new-instructor-data-row/new-instructor-data-row.component'; +import { AccountRequestTableModule } from '../../components/account-requests-table/account-request-table.module'; import { AjaxLoadingModule } from '../../components/ajax-loading/ajax-loading.module'; import { LoadingSpinnerModule } from '../../components/loading-spinner/loading-spinner.module'; +import { FormatDateDetailPipe } from '../../components/teammates-common/format-date-detail.pipe'; const routes: Routes = [ { @@ -29,8 +31,12 @@ const routes: Routes = [ CommonModule, FormsModule, RouterModule.forChild(routes), + AccountRequestTableModule, AjaxLoadingModule, LoadingSpinnerModule, ], + providers: [ + FormatDateDetailPipe, + ], }) export class AdminHomePageModule { } diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts index 6b076b170bd..ba3a2abbad5 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts @@ -19,6 +19,7 @@ import { import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { createMockNgbModalRef } from '../../../test-helpers/mock-ngb-modal-ref'; +import { AccountRequestStatus } from '../../../types/api-output'; const DEFAULT_FEEDBACK_SESSION_GROUP: FeedbackSessionsGroup = { sessionName: { @@ -72,10 +73,12 @@ const DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT: AccountRequestSearchResult = { name: 'name', email: 'email', institute: 'institute', + status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', registeredAtText: null, showLinks: false, + comments: '', }; describe('AdminSearchPageComponent', () => { @@ -239,10 +242,12 @@ describe('AdminSearchPageComponent', () => { name: 'name', email: 'email', institute: 'institute', + status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', registeredAtText: null, showLinks: true, + comments: '', }, ]; @@ -409,18 +414,22 @@ describe('AdminSearchPageComponent', () => { name: 'name1', email: 'email1', institute: 'institute1', + status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink1', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', - registeredAtText: null, - showLinks: true, + registeredAtText: '', + showLinks: false, + comments: '', }, { name: 'name2', email: 'email2', institute: 'institute2', + status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink2', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', registeredAtText: 'Wed, 09 Feb 2022, 10:23 AM +00:00', - showLinks: true, + showLinks: false, + comments: '', }]; jest.spyOn(searchService, 'searchAdmin').mockReturnValue(of({ diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 914a825a21a..8877da6ec29 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -2,7 +2,15 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { HttpRequestService } from './http-request.service'; import { ResourceEndpoints } from '../types/api-const'; -import { Account, AccountRequest, Accounts, JoinLink, MessageOutput } from '../types/api-output'; +import { + Account, + AccountRequest, + Accounts, + AccountRequests, + JoinLink, + MessageOutput, + AccountRequestStatus, +} from '../types/api-output'; import { AccountCreateRequest } from '../types/api-request'; /** @@ -107,4 +115,15 @@ export class AccountService { return this.httpRequestService.get(ResourceEndpoints.ACCOUNTS, paramMap); } + /** + * Gets account requests by calling API. + */ + getPendingAccountRequests(): Observable { + const paramMap = { + status: AccountRequestStatus.PENDING, + }; + + return this.httpRequestService.get(ResourceEndpoints.ACCOUNT_REQUESTS, paramMap); + } + } diff --git a/src/web/services/search.service.spec.ts b/src/web/services/search.service.spec.ts index e548b693cff..a58e525e2a2 100644 --- a/src/web/services/search.service.spec.ts +++ b/src/web/services/search.service.spec.ts @@ -191,6 +191,7 @@ describe('SearchService', () => { name: 'Test Instructor', institute: 'Test Institute', email: 'test@example.com', + comments: 'This is a test account request', status: AccountRequestStatus.APPROVED, }; diff --git a/src/web/services/search.service.ts b/src/web/services/search.service.ts index 7542da645cc..5d4dfdc0d53 100644 --- a/src/web/services/search.service.ts +++ b/src/web/services/search.service.ts @@ -306,16 +306,22 @@ export class SearchService { registeredAtText: '', registrationLink: '', showLinks: false, + status: '', + comments: '', }; - const { registrationKey, createdAt, registeredAt, name, institute, email }: AccountRequest = accountRequest; + const { + registrationKey, createdAt, registeredAt, + name, institute, email, status, comments, + }: AccountRequest = accountRequest; const timezone: string = this.timezoneService.guessTimezone() || 'UTC'; accountRequestResult.createdAtText = this.formatTimestampAsString(createdAt, timezone); accountRequestResult.registeredAtText = registeredAt ? this.formatTimestampAsString(registeredAt, timezone) : null; + accountRequestResult.comments = comments || ''; const registrationLink: string = this.linkService.generateAccountRegistrationLink(registrationKey); - accountRequestResult = { ...accountRequestResult, name, email, institute, registrationLink }; + accountRequestResult = { ...accountRequestResult, name, email, institute, registrationLink, status }; return accountRequestResult; } @@ -466,11 +472,13 @@ export interface AdminSearchResult { export interface AccountRequestSearchResult { name: string; email: string; + status: string; institute: string; createdAtText: string; registeredAtText: string | null; registrationLink: string; showLinks: boolean; + comments: string; } /** From 561837052d6810ac904eb5cd34454e0cb98fa530 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Thu, 28 Mar 2024 00:54:43 +0800 Subject: [PATCH 10/95] [#11878] Admin Search UI Update for ARF (#12945) * update admin search page to use acc req component * fix selector for e2e test * fix spec files and imports * update e2e selector * fix column numbers --- .../e2e/pageobjects/AdminSearchPage.java | 10 +- .../account-request-table.component.html | 2 +- .../admin-search-page.component.spec.ts.snap | 195 +++++++++--------- .../admin-search-page.component.html | 64 +----- .../admin-search-page.component.spec.ts | 29 +-- .../admin-search-page.component.ts | 88 ++------ .../admin-search-page.module.ts | 4 + 7 files changed, 143 insertions(+), 249 deletions(-) diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java index 706e9ab5a20..b0e9049f481 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java @@ -38,9 +38,9 @@ public class AdminSearchPage extends AppPage { private static final int ACCOUNT_REQUEST_COL_NAME = 1; private static final int ACCOUNT_REQUEST_COL_EMAIL = 2; - private static final int ACCOUNT_REQUEST_COL_INSTITUTE = 3; - private static final int ACCOUNT_REQUEST_COL_CREATED_AT = 4; - private static final int ACCOUNT_REQUEST_COL_REGISTERED_AT = 5; + private static final int ACCOUNT_REQUEST_COL_INSTITUTE = 4; + private static final int ACCOUNT_REQUEST_COL_CREATED_AT = 5; + private static final int ACCOUNT_REQUEST_COL_REGISTERED_AT = 6; private static final String EXPANDED_ROWS_HEADER_EMAIL = "Email"; private static final String EXPANDED_ROWS_HEADER_COURSE_JOIN_LINK = "Course Join Link"; @@ -273,7 +273,7 @@ public void resetInstructorGoogleId(InstructorAttributes instructor) { public WebElement getAccountRequestRow(AccountRequestAttributes accountRequest) { String email = accountRequest.getEmail(); String institute = accountRequest.getInstitute(); - List rows = browser.driver.findElements(By.cssSelector("#search-table-account-request tbody tr")); + List rows = browser.driver.findElements(By.cssSelector("tm-account-request-table tbody tr")); for (WebElement row : rows) { List columns = row.findElements(By.tagName("td")); if (removeSpanFromText(columns.get(ACCOUNT_REQUEST_COL_EMAIL - 1) @@ -289,7 +289,7 @@ && removeSpanFromText(columns.get(ACCOUNT_REQUEST_COL_INSTITUTE - 1) public WebElement getAccountRequestRow(AccountRequest accountRequest) { String email = accountRequest.getEmail(); String institute = accountRequest.getInstitute(); - List rows = browser.driver.findElements(By.cssSelector("#search-table-account-request tbody tr")); + List rows = browser.driver.findElements(By.cssSelector("tm-account-request-table tbody tr")); for (WebElement row : rows) { List columns = row.findElements(By.tagName("td")); if (removeSpanFromText(columns.get(ACCOUNT_REQUEST_COL_EMAIL - 1) diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html index 7dcb95031c7..2959ee3b480 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.html +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -68,7 +68,7 @@ - +
  • Account Registration Link diff --git a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap index 4a38f4cbca3..2ffcc3759be 100644 --- a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap +++ b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap @@ -433,119 +433,110 @@ exports[`AdminSearchPageComponent should snap with an expanded account requests 100 characters left
-
+
- - Account Requests Found -
- - + + Pending Account Requests +
-
-
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + - - -
- Name - - Email - - Institute - - Created At - - Registered At - - Options -
- name - - email - - institute - - Tue, 08 Feb 2022, 08:23 AM +00:00 - - Not Registered Yet - -
+
+ Name + + Email + + Status + + Institute, Country + + Created At + + Comments + + Options +
+ name + + email + + PENDING + + institute + - +
- Delete - -
-
-
    +
-
  • - - Account Registration Link - - -
    • - -
    +
    + + + +
    +
    + + + +
    +
    + + + + +
    - + `; diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html index a76f9796f0e..e6573dbff76 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html @@ -203,66 +203,4 @@ -
    -
    - Account Requests Found -
    - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameEmailInstituteCreated AtRegistered AtOptions
    -
    -
    - - -
    -     		{{ accountRequest.email }}{{ accountRequest.institute }}{{ accountRequest.createdAtText }}{{ accountRequest.registeredAtText || 'Not Registered Yet' }} - - Reset Account Request - -
    - -
    -
    -
      -
    • - Account Registration Link - -
      • -
    -
    -
    -
    + diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts index ba3a2abbad5..4697bb518a1 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts @@ -12,7 +12,6 @@ import { AccountService } from '../../../services/account.service'; import { EmailGenerationService } from '../../../services/email-generation.service'; import { InstructorService } from '../../../services/instructor.service'; import { - AccountRequestSearchResult, FeedbackSessionsGroup, InstructorAccountSearchResult, SearchService, StudentAccountSearchResult, } from '../../../services/search.service'; @@ -20,6 +19,7 @@ import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { createMockNgbModalRef } from '../../../test-helpers/mock-ngb-modal-ref'; import { AccountRequestStatus } from '../../../types/api-output'; +import { AccountRequestTableRowModel } from '../../components/account-requests-table/account-request-table-model'; const DEFAULT_FEEDBACK_SESSION_GROUP: FeedbackSessionsGroup = { sessionName: { @@ -69,14 +69,14 @@ const DEFAULT_INSTRUCTOR_SEARCH_RESULT: InstructorAccountSearchResult = { publishedSessions: DEFAULT_FEEDBACK_SESSION_GROUP, }; -const DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT: AccountRequestSearchResult = { +const DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT: AccountRequestTableRowModel = { name: 'name', email: 'email', - institute: 'institute', + instituteAndCountry: 'institute', status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', - registeredAtText: null, + registeredAtText: '', showLinks: false, comments: '', }; @@ -241,11 +241,11 @@ describe('AdminSearchPageComponent', () => { { name: 'name', email: 'email', - institute: 'institute', + instituteAndCountry: 'institute', status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', - registeredAtText: null, + registeredAtText: '', showLinks: true, comments: '', }, @@ -409,11 +409,11 @@ describe('AdminSearchPageComponent', () => { }); it('should display account request results', () => { - const accountRequestResults: AccountRequestSearchResult[] = [ + const accountRequestResults: AccountRequestTableRowModel[] = [ { name: 'name1', email: 'email1', - institute: 'institute1', + instituteAndCountry: 'institute1', status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink1', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', @@ -423,7 +423,7 @@ describe('AdminSearchPageComponent', () => { }, { name: 'name2', email: 'email2', - institute: 'institute2', + instituteAndCountry: 'institute2', status: AccountRequestStatus.PENDING, registrationLink: 'registrationLink2', createdAtText: 'Tue, 08 Feb 2022, 08:23 AM +00:00', @@ -435,10 +435,12 @@ describe('AdminSearchPageComponent', () => { jest.spyOn(searchService, 'searchAdmin').mockReturnValue(of({ students: [], instructors: [], - accountRequests: accountRequestResults, + accountRequests: accountRequestResults.map((result) => ({ + ...result, + institute: result.instituteAndCountry, + })), })); - component.searchQuery = 'name'; const button: any = fixture.debugElement.nativeElement.querySelector('#search-button'); button.click(); @@ -487,8 +489,9 @@ describe('AdminSearchPageComponent', () => { }); it('should show account request links when expand all button clicked', () => { - const accountRequestResult: AccountRequestSearchResult = DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT; + const accountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT; component.accountRequests = [accountRequestResult]; + component.searchQuery = 'test'; // To show the account request table fixture.detectChanges(); const button: any = fixture.debugElement.nativeElement.querySelector('#show-account-request-links'); @@ -954,6 +957,7 @@ describe('AdminSearchPageComponent', () => { it('should show error message when resetting account request is unsuccessful', () => { component.accountRequests = [DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT]; component.accountRequests[0].registeredAtText = 'Wed, 09 Feb 2022, 10:23 AM +00:00'; + component.searchQuery = 'test'; fixture.detectChanges(); jest.spyOn(ngbModal, 'open').mockImplementation(() => { @@ -980,6 +984,7 @@ describe('AdminSearchPageComponent', () => { it('should show success message when resetting account request is successful', () => { component.accountRequests = [DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT]; component.accountRequests[0].registeredAtText = 'Wed, 09 Feb 2022, 10:23 AM +00:00'; + component.searchQuery = 'test'; fixture.detectChanges(); jest.spyOn(ngbModal, 'open').mockImplementation(() => { diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts index 702cbea0791..bf5f023e4b4 100755 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.ts @@ -17,7 +17,10 @@ import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { StudentService } from '../../../services/student.service'; import { ApiConst } from '../../../types/api-const'; -import { Email, MessageOutput, RegenerateKey } from '../../../types/api-output'; +import { Email, RegenerateKey } from '../../../types/api-output'; +import { + AccountRequestTableRowModel, +} from '../../components/account-requests-table/account-request-table-model'; import { SimpleModalType } from '../../components/simple-modal/simple-modal-type'; import { collapseAnim } from '../../components/teammates-common/collapse-anim'; import { ErrorMessageOutput } from '../../error-message-output'; @@ -37,7 +40,7 @@ export class AdminSearchPageComponent { searchString: string = ''; instructors: InstructorAccountSearchResult[] = []; students: StudentAccountSearchResult[] = []; - accountRequests: AccountRequestSearchResult[] = []; + accountRequests: AccountRequestTableRowModel[] = []; characterLimit = 100; constructor( @@ -76,10 +79,9 @@ export class AdminSearchPageComponent { this.instructors = resp.instructors; this.students = resp.students; - this.accountRequests = resp.accountRequests; + this.accountRequests = this.formatAccountRequests(resp.accountRequests); this.hideAllInstructorsLinks(); this.hideAllStudentsLinks(); - this.hideAllAccountRequestsLinks(); // prompt user to use more specific terms if search results limit reached const limit: number = ApiConst.SEARCH_QUERY_SIZE_LIMIT; @@ -109,6 +111,22 @@ export class AdminSearchPageComponent { }); } + private formatAccountRequests(accountRequests: AccountRequestSearchResult[]): AccountRequestTableRowModel[] { + return accountRequests.map((accountRequest: AccountRequestSearchResult): AccountRequestTableRowModel => { + return { + name: accountRequest.name, + email: accountRequest.email, + status: accountRequest.status, + instituteAndCountry: accountRequest.institute, + createdAtText: accountRequest.createdAtText, + registeredAtText: accountRequest.registeredAtText || '', + comments: accountRequest.comments, + registrationLink: accountRequest.registrationLink, + showLinks: accountRequest.showLinks, + }; + }); + } + /** * Shows all instructors' links in the page. */ @@ -145,24 +163,6 @@ export class AdminSearchPageComponent { } } - /** - * Shows all account requests' links in the page. - */ - showAllAccountRequestsLinks(): void { - for (const accountRequest of this.accountRequests) { - accountRequest.showLinks = true; - } - } - - /** - * Hides all account requests' links in the page. - */ - hideAllAccountRequestsLinks(): void { - for (const accountRequest of this.accountRequests) { - accountRequest.showLinks = false; - } - } - /** * Resets the instructor's Google ID. */ @@ -266,50 +266,6 @@ export class AdminSearchPageComponent { }, () => {}); } - resetAccountRequest(accountRequest: AccountRequestSearchResult): void { - const modalContent = `Are you sure you want to reset the account request for - ${accountRequest.name} with email ${accountRequest.email} from - ${accountRequest.institute}? - An email with the account registration link will also be sent to the instructor.`; - const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( - `Reset account request for ${accountRequest.name}?`, SimpleModalType.WARNING, modalContent); - - modalRef.result.then(() => { - this.accountService.resetAccountRequest(accountRequest.email, accountRequest.institute) - .subscribe({ - next: () => { - this.statusMessageService - .showSuccessToast(`Reset successful. An email has been sent to ${accountRequest.email}.`); - accountRequest.registeredAtText = ''; - }, - error: (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }, - }); - }, () => {}); - } - - deleteAccountRequest(accountRequest: AccountRequestSearchResult): void { - const modalContent: string = `Are you sure you want to delete the account request for - ${accountRequest.name} with email ${accountRequest.email} from - ${accountRequest.institute}?`; - const modalRef: NgbModalRef = this.simpleModalService.openConfirmationModal( - `Delete account request for ${accountRequest.name}?`, SimpleModalType.WARNING, modalContent); - - modalRef.result.then(() => { - this.accountService.deleteAccountRequest(accountRequest.email, accountRequest.institute) - .subscribe({ - next: (resp: MessageOutput) => { - this.statusMessageService.showSuccessToast(resp.message); - this.accountRequests = this.accountRequests.filter((x: AccountRequestSearchResult) => x !== accountRequest); - }, - error: (resp: ErrorMessageOutput) => { - this.statusMessageService.showErrorToast(resp.error.message); - }, - }); - }, () => {}); - } - /** * Updates the student's displayed course join and feedback session links with the value of the newKey. */ diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.module.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.module.ts index 06278b7ad5f..6b70a93077a 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.module.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.module.ts @@ -4,6 +4,9 @@ import { FormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AdminSearchPageComponent } from './admin-search-page.component'; +import { + AccountRequestTableModule, +} from '../../components/account-requests-table/account-request-table.module'; import { Pipes } from '../../pipes/pipes.module'; const routes: Routes = [ @@ -27,6 +30,7 @@ const routes: Routes = [ CommonModule, FormsModule, NgbTooltipModule, + AccountRequestTableModule, RouterModule.forChild(routes), Pipes, ], From 0aa7dfbb4d302bb5afaf26ac5945d0bfcc2b93ad Mon Sep 17 00:00:00 2001 From: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> Date: Thu, 28 Mar 2024 10:57:27 +0800 Subject: [PATCH 11/95] [#11878] Add methods to get an account request by ID (#12953) * Add facade logic method to get an account request by ID * Add storage method to get an account request by ID * Add logic method to get an account request by ID --- .../sqllogic/core/AccountRequestsLogicIT.java | 18 +++++++ .../storage/sqlapi/AccountRequestsDbIT.java | 19 +++++++ .../java/teammates/sqllogic/api/Logic.java | 9 ++++ .../sqllogic/core/AccountRequestsLogic.java | 8 +++ .../storage/sqlapi/AccountRequestsDb.java | 8 +++ .../core/AccountRequestsLogicTest.java | 51 +++++++++++++++++++ .../storage/sqlapi/AccountRequestsDbTest.java | 21 ++++++++ 7 files changed, 134 insertions(+) create mode 100644 src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java diff --git a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java index f95a6cfa682..566c967a7e7 100644 --- a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java @@ -1,6 +1,7 @@ package teammates.it.sqllogic.core; import java.time.Instant; +import java.util.UUID; import org.testng.annotations.Test; @@ -20,6 +21,23 @@ public class AccountRequestsLogicIT extends BaseTestCaseWithSqlDatabaseAccess { private AccountRequestsLogic accountRequestsLogic = AccountRequestsLogic.inst(); + @Test + public void testGetAccountRequest_nonExistentAccountRequest_returnsNull() { + UUID id = UUID.randomUUID(); + AccountRequest actualAccountRequest = accountRequestsLogic.getAccountRequest(id); + assertNull(actualAccountRequest); + } + + @Test + public void testGetAccountRequest_existingAccountRequest_getsSuccessfully() throws InvalidParametersException { + AccountRequest expectedAccountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); + UUID id = expectedAccountRequest.getId(); + accountRequestsLogic.createAccountRequest(expectedAccountRequest); + AccountRequest actualAccountRequest = accountRequestsLogic.getAccountRequest(id); + assertEquals(expectedAccountRequest, actualAccountRequest); + } + @Test public void testResetAccountRequest() throws EntityAlreadyExistsException, InvalidParametersException, EntityDoesNotExistException { diff --git a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java index a4c25763e40..e989d6fb3cb 100644 --- a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java @@ -1,11 +1,13 @@ package teammates.it.storage.sqlapi; import java.util.List; +import java.util.UUID; import org.testng.annotations.Test; import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; +import teammates.common.exception.InvalidParametersException; import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess; import teammates.storage.sqlapi.AccountRequestsDb; import teammates.storage.sqlentity.AccountRequest; @@ -72,6 +74,23 @@ public void testCreateReadDeleteAccountRequest() throws Exception { assertNull(actualAccountRequest); } + @Test + public void testGetAccountRequest_nonExistentAccountRequest_returnsNull() { + UUID id = UUID.randomUUID(); + AccountRequest actualAccountRequest = accountRequestDb.getAccountRequest(id); + assertNull(actualAccountRequest); + } + + @Test + public void testGetAccountRequest_existingAccountRequest_getsSuccessfully() throws InvalidParametersException { + AccountRequest expectedAccountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); + UUID id = expectedAccountRequest.getId(); + accountRequestDb.createAccountRequest(expectedAccountRequest); + AccountRequest actualAccountRequest = accountRequestDb.getAccountRequest(id); + assertEquals(expectedAccountRequest, actualAccountRequest); + } + @Test public void testUpdateAccountRequest() throws Exception { ______TS("Update account request, does not exists, exception thrown"); diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index a6f785e442e..75243340fdd 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -95,6 +95,15 @@ public AccountRequest createAccountRequest(String name, String email, String ins return accountRequestLogic.createAccountRequest(name, email, institute, status, comments); } + /** + * Gets the account request with the given {@code id}. + * + * @return account request with the given {@code id}. + */ + public AccountRequest getAccountRequest(UUID id) { + return accountRequestLogic.getAccountRequest(id); + } + /** * Gets the account request with the given email and institute. * diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index 6c0f34efb1a..ef46f0b7fc7 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -1,6 +1,7 @@ package teammates.sqllogic.core; import java.util.List; +import java.util.UUID; import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; @@ -65,6 +66,13 @@ public AccountRequest createAccountRequest(String name, String email, String ins return accountRequestDb.createAccountRequest(toCreate); } + /** + * Gets the account request associated with the {@code id}. + */ + public AccountRequest getAccountRequest(UUID id) { + return accountRequestDb.getAccountRequest(id); + } + /** * Gets account request associated with the {@code email} and {@code institute}. */ diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index e3ced48d6af..6d9f7312fe4 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -55,6 +55,14 @@ public AccountRequest createAccountRequest(AccountRequest accountRequest) throws return accountRequest; } + /** + * Get AccountRequest by {@code id} from the database. + */ + public AccountRequest getAccountRequest(UUID id) { + assert id != null; + return HibernateUtil.get(AccountRequest.class, id); + } + /** * Get AccountRequest by {@code email} and {@code institute} from database. */ diff --git a/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java b/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java new file mode 100644 index 00000000000..6886acc8007 --- /dev/null +++ b/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java @@ -0,0 +1,51 @@ +package teammates.sqllogic.core; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.UUID; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.storage.sqlapi.AccountRequestsDb; +import teammates.storage.sqlentity.AccountRequest; +import teammates.test.BaseTestCase; + +/** + * SUT: {@link AccountRequestsLogic}. + */ +public class AccountRequestsLogicTest extends BaseTestCase { + + private AccountRequestsLogic accountRequestsLogic = AccountRequestsLogic.inst(); + + private AccountRequestsDb accountRequestsDb; + + @BeforeMethod + public void setUpMethod() { + accountRequestsDb = mock(AccountRequestsDb.class); + accountRequestsLogic.initLogicDependencies(accountRequestsDb); + } + + @Test + public void testGetAccountRequest_nonExistentAccountRequest_returnsNull() { + UUID id = UUID.randomUUID(); + when(accountRequestsDb.getAccountRequest(id)).thenReturn(null); + AccountRequest actualAccountRequest = accountRequestsLogic.getAccountRequest(id); + verify(accountRequestsDb).getAccountRequest(id); + assertNull(actualAccountRequest); + } + + @Test + public void testGetAccountRequest_existingAccountRequest_getsSuccessfully() { + AccountRequest expectedAccountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); + UUID id = expectedAccountRequest.getId(); + when(accountRequestsDb.getAccountRequest(id)).thenReturn(expectedAccountRequest); + AccountRequest actualAccountRequest = accountRequestsLogic.getAccountRequest(id); + verify(accountRequestsDb).getAccountRequest(id); + assertEquals(expectedAccountRequest, actualAccountRequest); + } +} diff --git a/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java b/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java index 61f9f8e0d24..31f6cf77873 100644 --- a/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java +++ b/src/test/java/teammates/storage/sqlapi/AccountRequestsDbTest.java @@ -10,6 +10,7 @@ import static org.mockito.Mockito.verify; import java.util.List; +import java.util.UUID; import org.mockito.MockedStatic; import org.testng.annotations.AfterMethod; @@ -70,6 +71,26 @@ public void testCreateAccountRequest_accountRequestAlreadyExists_createsSuccessf mockHibernateUtil.verify(() -> HibernateUtil.persist(accountRequest)); } + @Test + public void testGetAccountRequest_nonExistentAccountRequest_returnsNull() { + UUID id = UUID.randomUUID(); + mockHibernateUtil.when(() -> HibernateUtil.get(AccountRequest.class, id)).thenReturn(null); + AccountRequest actualAccountRequest = accountRequestDb.getAccountRequest(id); + mockHibernateUtil.verify(() -> HibernateUtil.get(AccountRequest.class, id)); + assertNull(actualAccountRequest); + } + + @Test + public void testGetAccountRequest_existingAccountRequest_getsSuccessfully() { + AccountRequest expectedAccountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, "comments"); + UUID id = expectedAccountRequest.getId(); + mockHibernateUtil.when(() -> HibernateUtil.get(AccountRequest.class, id)).thenReturn(expectedAccountRequest); + AccountRequest actualAccountRequest = accountRequestDb.getAccountRequest(id); + mockHibernateUtil.verify(() -> HibernateUtil.get(AccountRequest.class, id)); + assertEquals(expectedAccountRequest, actualAccountRequest); + } + @Test public void testUpdateAccountRequest_invalidEmail_throwsInvalidParametersException() { AccountRequest accountRequestWithInvalidEmail = From 9d0cf375b8e5b6e7c8c348630a4efec91f30532f Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Thu, 28 Mar 2024 23:37:45 +0800 Subject: [PATCH 12/95] Update developers.json (#12958) --- src/web/data/developers.json | 47 +++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/src/web/data/developers.json b/src/web/data/developers.json index 0482ddedcdb..842e83e1356 100644 --- a/src/web/data/developers.json +++ b/src/web/data/developers.json @@ -215,6 +215,10 @@ "name": "Andy Daehn", "username": "andydaehn" }, + { + "name": "Andy", + "username": "Andy-W-Developer" + }, { "multiple": true, "name": "Ang Ji Kai", @@ -450,6 +454,11 @@ "name": "Chin Yong Wei", "username": "vertigogarden" }, + { + "multiple": true, + "name": "Ching Ming Yuan", + "username": "mingyuanc" + }, { "multiple": true, "name": "Chloe Stapleton", @@ -599,11 +608,6 @@ "name": "Dishant Sheth", "username": "dishant-sheth" }, - { - "multiple": true, - "name": "Yeo Di Sheng", - "username": "dishenggg" - }, { "multiple": true, "name": "Divya Pandilla", @@ -1219,6 +1223,10 @@ "name": "Leonardo Vitoriano", "username": "leonardomilv3" }, + { + "name": "Leyan Guan", + "username": "leyguan" + }, { "multiple": true, "name": "Lian Wenhui Florine" @@ -1337,11 +1345,6 @@ "name": "Marlon Calvo", "username": "marloncalvo" }, - { - "multiple": true, - "name": "Tye Jia Jun, Marques", - "username": "marquestye" - }, { "name": "Martin Larsson", "username": "leddy231" @@ -1370,6 +1373,7 @@ "username": "mattlim1207" }, { + "multiple": true, "name": "Maureen Chang", "username": "techMedMau" }, @@ -1412,10 +1416,6 @@ "name": "Miguel Araújo", "username": "miguelarauj1o" }, - { - "name": "Ching Ming Yuan", - "username": "mingyuanc" - }, { "name": "Minsung Joh", "username": "jms5049" @@ -1448,6 +1448,10 @@ "name": "Mukesh Gupta", "username": "mukesh14149" }, + { + "name": "Nada Ayesh", + "username": "nadasuhailAyesh12" + }, { "name": "Naga Rani", "username": "Nagureddy" @@ -2254,6 +2258,11 @@ "name": "Truong Hoang Phuoc", "username": "hoangphuoc25" }, + { + "multiple": true, + "name": "Tye Jia Jun, Marques", + "username": "marquestye" + }, { "username": "u6867511" }, @@ -2335,6 +2344,10 @@ "multiple": true, "name": "Wang Chao" }, + { + "name": "Wang JingTing", + "username": "jingting1412" + }, { "name": "Wang Yuqing", "username": "yuqingw" @@ -2356,6 +2369,7 @@ "username": "a0129998" }, { + "multiple": true, "name": "Xenos Fiorenzo Anong", "username": "xenosf" }, @@ -2412,6 +2426,11 @@ "multiple": true, "name": "Yen Zi Shyun" }, + { + "multiple": true, + "name": "Yeo Di Sheng", + "username": "dishenggg" + }, { "name": "Yi Chen", "username": "g3chenyigmailcom" From ccad41b26b4c62529fda29bc2d4b556e7098c356 Mon Sep 17 00:00:00 2001 From: DS Date: Thu, 28 Mar 2024 23:53:59 +0800 Subject: [PATCH 13/95] [#11843] Create Logic and Db layer for FeedbackSessionLogs (#12914) * Create FeedbackSessionLog entity * fix lint * Create UpdateFeedbackSessionLogsAction * Sort query results from logging service * Update type of feedbackSessionLogType * Fix naming * Fix enum in entity * Update filter to differentiate by session * Add Uri Info * Add tests * Update test case * Update to getOrderedFeedbackSessionLogs * Create skeleton * Implement logic and db layer * fix lint * Update entity * Fix tests * Fix bugs and optimize action * Prevent courseId from being null * Update GCP logs to store ids * Fix tests * Update action to use reference * Add some error handling * Fix tests * Add ids to api output --- .../sqlapi/FeedbackSessionLogsDbIT.java | 170 +++++++++++ .../GetFeedbackSessionLogsActionIT.java | 10 +- .../UpdateFeedbackSessionLogsActionIT.java | 267 ++++++++++++++++++ .../datatransfer/FeedbackSessionLogEntry.java | 35 ++- .../logs/FeedbackSessionAuditLogDetails.java | 22 ++ .../teammates/common/util/HibernateUtil.java | 14 +- .../teammates/logic/api/LogsProcessor.java | 9 + .../external/GoogleCloudLoggingService.java | 15 +- .../logic/external/LocalLoggingService.java | 11 +- .../teammates/logic/external/LogService.java | 7 + .../java/teammates/sqllogic/api/Logic.java | 40 ++- .../core/FeedbackSessionLogsLogic.java | 67 +++++ .../sqllogic/core/FeedbackSessionsLogic.java | 10 + .../teammates/sqllogic/core/LogicStarter.java | 3 + .../teammates/sqllogic/core/UsersLogic.java | 12 + .../storage/sqlapi/FeedbackSessionLogsDb.java | 86 ++++++ .../storage/sqlapi/FeedbackSessionsDb.java | 11 + .../teammates/storage/sqlapi/UsersDb.java | 9 + .../storage/sqlentity/FeedbackSessionLog.java | 44 +-- .../ui/output/FeedbackSessionData.java | 11 + .../java/teammates/ui/output/StudentData.java | 11 + .../CreateFeedbackSessionLogAction.java | 30 +- .../UpdateFeedbackSessionLogsAction.java | 41 +-- .../logic/api/MockLogsProcessor.java | 18 +- .../UpdateFeedbackSessionLogsActionTest.java | 170 ++++++----- .../sqlapi/FeedbackSessionLogsDbTest.java | 46 +++ .../GetFeedbackSessionLogsActionTest.java | 10 +- 27 files changed, 1055 insertions(+), 124 deletions(-) create mode 100644 src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java create mode 100644 src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java create mode 100644 src/main/java/teammates/sqllogic/core/FeedbackSessionLogsLogic.java create mode 100644 src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java create mode 100644 src/test/java/teammates/storage/sqlapi/FeedbackSessionLogsDbTest.java diff --git a/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java new file mode 100644 index 00000000000..14d922e611f --- /dev/null +++ b/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java @@ -0,0 +1,170 @@ +package teammates.it.storage.sqlapi; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.SqlDataBundle; +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.HibernateUtil; +import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess; +import teammates.storage.sqlapi.FeedbackSessionLogsDb; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link FeedbackSessionLogsDb}. + */ +public class FeedbackSessionLogsDbIT extends BaseTestCaseWithSqlDatabaseAccess { + + private final FeedbackSessionLogsDb fslDb = FeedbackSessionLogsDb.inst(); + + private SqlDataBundle typicalDataBundle; + + @Override + @BeforeClass + public void setupClass() { + super.setupClass(); + typicalDataBundle = getTypicalSqlDataBundle(); + } + + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalDataBundle); + HibernateUtil.flushSession(); + } + + @Test + public void test_createFeedbackSessionLog_success() { + Course course = typicalDataBundle.courses.get("course1"); + FeedbackSession feedbackSession = typicalDataBundle.feedbackSessions.get("session1InCourse1"); + Student student = typicalDataBundle.students.get("student1InCourse1"); + + Instant logTimestamp = Instant.parse("2011-01-01T00:00:00Z"); + FeedbackSessionLog expected = new FeedbackSessionLog(student, feedbackSession, FeedbackSessionLogType.ACCESS, + logTimestamp); + + fslDb.createFeedbackSessionLog(expected); + + List actualLogs = fslDb.getOrderedFeedbackSessionLogs(course.getId(), student.getId(), + feedbackSession.getId(), logTimestamp, logTimestamp.plusSeconds(1)); + + assertEquals(actualLogs.size(), 1); + assertEquals(expected, actualLogs.get(0)); + } + + @Test + public void test_getOrderedFeedbackSessionLogs_success() { + Instant startTime = Instant.parse("2011-01-01T00:00:00Z"); + Instant endTime = Instant.parse("2011-01-01T01:00:00Z"); + + Course course1 = typicalDataBundle.courses.get("course1"); + + FeedbackSession session1 = typicalDataBundle.feedbackSessions.get("session1InCourse1"); + FeedbackSession session2 = typicalDataBundle.feedbackSessions.get("session2InTypicalCourse"); + FeedbackSession sessionInAnotherCourse = typicalDataBundle.feedbackSessions.get("ongoingSession1InCourse3"); + + Student student1 = typicalDataBundle.students.get("student1InCourse1"); + Student student2 = typicalDataBundle.students.get("student2InCourse1"); + + FeedbackSessionLog student1Session1Log1 = new FeedbackSessionLog(student1, session1, + FeedbackSessionLogType.ACCESS, startTime); + FeedbackSessionLog student1Session1Log2 = new FeedbackSessionLog(student1, session1, + FeedbackSessionLogType.SUBMISSION, startTime.plusSeconds(1)); + FeedbackSessionLog student1Session1Log3 = new FeedbackSessionLog(student1, session1, + FeedbackSessionLogType.VIEW_RESULT, startTime.plusSeconds(2)); + FeedbackSessionLog student1Session2Log1 = new FeedbackSessionLog(student1, session2, + FeedbackSessionLogType.ACCESS, startTime.plusSeconds(3)); + + FeedbackSessionLog student2Session1Log1 = new FeedbackSessionLog(student2, session1, + FeedbackSessionLogType.ACCESS, startTime.plusSeconds(4)); + FeedbackSessionLog student2Session2Log1 = new FeedbackSessionLog(student2, session2, + FeedbackSessionLogType.ACCESS, startTime.plusSeconds(5)); + + FeedbackSessionLog student1AnotherCourseLog1 = new FeedbackSessionLog(student1, sessionInAnotherCourse, + FeedbackSessionLogType.ACCESS, startTime.plusSeconds(6)); + + FeedbackSessionLog outOfRangeLog1 = new FeedbackSessionLog(student1, session1, FeedbackSessionLogType.ACCESS, + startTime.minusSeconds(1)); + FeedbackSessionLog outOfRangeLog2 = new FeedbackSessionLog(student1, session1, FeedbackSessionLogType.ACCESS, + endTime); + + List newLogs = new ArrayList<>(); + newLogs.add(student1Session1Log1); + newLogs.add(student1Session1Log2); + newLogs.add(student1Session1Log3); + newLogs.add(student1Session2Log1); + + newLogs.add(student2Session1Log1); + newLogs.add(student2Session2Log1); + + newLogs.add(student1AnotherCourseLog1); + + newLogs.add(outOfRangeLog1); + newLogs.add(outOfRangeLog2); + + for (FeedbackSessionLog log : newLogs) { + fslDb.createFeedbackSessionLog(log); + } + + ______TS("Return logs belonging to a course in time range"); + List expectedLogs = new ArrayList<>(); + expectedLogs.add(student1Session1Log1); + expectedLogs.add(student1Session1Log2); + expectedLogs.add(student1Session1Log3); + expectedLogs.add(student1Session2Log1); + + expectedLogs.add(student2Session1Log1); + expectedLogs.add(student2Session2Log1); + + List actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), null, null, + startTime, endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("Return logs belonging to a student in time range"); + expectedLogs = new ArrayList<>(); + expectedLogs.add(student1Session1Log1); + expectedLogs.add(student1Session1Log2); + expectedLogs.add(student1Session1Log3); + expectedLogs.add(student1Session2Log1); + + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), student1.getId(), null, startTime, endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("Return logs belonging to a feedback session in time range"); + expectedLogs = new ArrayList<>(); + expectedLogs.add(student1Session2Log1); + expectedLogs.add(student2Session2Log1); + + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), null, session2.getId(), startTime, endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("Return logs belonging to a student in a feedback session in time range"); + expectedLogs = new ArrayList<>(); + expectedLogs.add(student2Session2Log1); + + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), student2.getId(), session2.getId(), startTime, + endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("No logs in time range, return empty list"); + expectedLogs = new ArrayList<>(); + + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), null, null, endTime.plusSeconds(3600), + endTime.plusSeconds(7200)); + + assertEquals(expectedLogs, actualLogs); + } +} diff --git a/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java b/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java index 2ee319637ae..9aca4fed202 100644 --- a/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java @@ -60,15 +60,15 @@ protected void testExecute() { long startTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() - 1) * 24 * 60 * 60 * 1000; long invalidStartTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() + 1) * 24 * 60 * 60 * 1000; - mockLogsProcessor.insertFeedbackSessionLog(student1Email, fsa1Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa1Name, FeedbackSessionLogType.ACCESS.getLabel(), startTime); - mockLogsProcessor.insertFeedbackSessionLog(student1Email, fsa2Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa2Name, FeedbackSessionLogType.ACCESS.getLabel(), startTime + 1000); - mockLogsProcessor.insertFeedbackSessionLog(student1Email, fsa2Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa2Name, FeedbackSessionLogType.SUBMISSION.getLabel(), startTime + 2000); - mockLogsProcessor.insertFeedbackSessionLog(student2Email, fsa1Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student2Email, fsa1Name, FeedbackSessionLogType.ACCESS.getLabel(), startTime + 3000); - mockLogsProcessor.insertFeedbackSessionLog(student2Email, fsa1Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student2Email, fsa1Name, FeedbackSessionLogType.SUBMISSION.getLabel(), startTime + 4000); ______TS("Failure case: not enough parameters"); diff --git a/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java new file mode 100644 index 00000000000..ce30c978426 --- /dev/null +++ b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java @@ -0,0 +1,267 @@ +package teammates.it.ui.webapi; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.FeedbackSessionLogEntry; +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.Const; +import teammates.common.util.HibernateUtil; +import teammates.common.util.TimeHelper; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; +import teammates.storage.sqlsearch.SearchManagerFactory; +import teammates.ui.webapi.UpdateFeedbackSessionLogsAction; + +/** + * SUT: {@link UpdateFeedbackSessionLogsAction}. + */ +public class UpdateFeedbackSessionLogsActionIT extends BaseActionIT { + + static final int COLLECTION_TIME_PERIOD = 60; // represents one hour + static final long SPAM_FILTER = 2000L; // in ms + + Student student1InCourse1; + Student student2InCourse1; + Student student1InCourse3; + + Course course1; + Course course3; + + FeedbackSession session1InCourse1; + FeedbackSession session2InCourse1; + FeedbackSession session1InCourse3; + + Instant endTime; + Instant startTime; + + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalBundle); + HibernateUtil.flushSession(); + SearchManagerFactory.getStudentSearchManager().resetCollections(); + + endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); + startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); + + course1 = typicalBundle.courses.get("course1"); + course3 = typicalBundle.courses.get("course3"); + + student1InCourse1 = typicalBundle.students.get("student1InCourse1"); + student2InCourse1 = typicalBundle.students.get("student2InCourse1"); + student1InCourse3 = typicalBundle.students.get("student1InCourse3"); + + session1InCourse1 = typicalBundle.feedbackSessions.get("session1InCourse1"); + session2InCourse1 = typicalBundle.feedbackSessions.get("session2InTypicalCourse"); + session1InCourse3 = typicalBundle.feedbackSessions.get("ongoingSession1InCourse3"); + + mockLogsProcessor.getOrderedFeedbackSessionLogs("", "GET", 0, 0, "DELETE").clear(); + } + + @Override + String getActionUri() { + return Const.CronJobURIs.AUTOMATED_FEEDBACK_SESSION_LOGS_PROCESSING; + } + + @Override + String getRequestMethod() { + return GET; + } + + @Test + @Override + protected void testExecute() { + ______TS("No spam all logs added"); + // Different Types + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.SUBMISSION.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.VIEW_RESULT.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + + // Different feedback sessions + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(600).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session2InCourse1.getId(), session2InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(600).toEpochMilli()); + + // Different Student + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(900).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student2InCourse1.getId(), + student2InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(900).toEpochMilli()); + + // Different course + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(1200).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course3.getId(), student1InCourse3.getId(), + student1InCourse3.getEmail(), + session1InCourse3.getId(), session1InCourse3.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(1200).toEpochMilli()); + + // Gap is larger than spam filter + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + + UpdateFeedbackSessionLogsAction action = getAction(); + getJsonResult(action); + + // method returns all logs regardless of params + List expected = mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, ""); + List actual = logic.getOrderedFeedbackSessionLogs(course1.getId(), null, null, startTime, + endTime); + List actualCourse3 = logic.getOrderedFeedbackSessionLogs(course3.getId(), null, null, + startTime, endTime); + actual.addAll(actualCourse3); + assertTrue(isEqual(expected, actual)); + } + + @Test + protected void testExecute_recentLogsWithSpam_someLogsCreated() { + // Gap is smaller than spam filter + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER - 2).toEpochMilli()); + + // Filters multiple logs within one spam window + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER - 1).toEpochMilli()); + + // Correctly adds new log after filtering + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + + // Filters out spam in the new window + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 2).toEpochMilli()); + + UpdateFeedbackSessionLogsAction action = getAction(); + action.execute(); + + List expected = new ArrayList<>(); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); + + List actual = logic.getOrderedFeedbackSessionLogs(course1.getId(), null, null, startTime, + endTime); + assertTrue(isEqual(expected, actual)); + } + + @Test + protected void testExecute_badLogs_otherLogsCreated() { + UUID badUuid = UUID.fromString("00000000-0000-0000-0000-000000000000"); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(900).toEpochMilli()); + + // bad student id + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), badUuid, student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(600).toEpochMilli()); + + // bad session id + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + badUuid, session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(600).toEpochMilli()); + + UpdateFeedbackSessionLogsAction action = getAction(); + action.execute(); + + List expected = new ArrayList<>(); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), + student1InCourse1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(900).toEpochMilli())); + + List actual = logic.getOrderedFeedbackSessionLogs(course1.getId(), null, null, startTime, + endTime); + assertTrue(isEqual(expected, actual)); + } + + @Test + @Override + protected void testAccessControl() throws Exception { + Course course = typicalBundle.courses.get("course1"); + verifyOnlyAdminCanAccess(course); + } + + private Boolean isEqual(List expected, List actual) { + + assertEquals(expected.size(), actual.size()); + + for (int i = 0; i < expected.size(); i++) { + FeedbackSessionLogEntry expectedEntry = expected.get(i); + FeedbackSessionLog actualLog = actual.get(i); + + assertEquals(expectedEntry.getStudentId(), actualLog.getStudent().getId()); + + assertEquals(expectedEntry.getFeedbackSessionId(), actualLog.getFeedbackSession().getId()); + + assertEquals(expectedEntry.getFeedbackSessionLogType(), actualLog.getFeedbackSessionLogType().getLabel()); + + assertEquals(expectedEntry.getTimestamp(), actualLog.getTimestamp().toEpochMilli()); + } + + return true; + } +} diff --git a/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java b/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java index ea95a6a951d..d0aef5ce481 100644 --- a/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java +++ b/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java @@ -1,26 +1,57 @@ package teammates.common.datatransfer; +import java.util.UUID; + /** * Represents a log entry of a feedback session. */ public class FeedbackSessionLogEntry implements Comparable { + private final String courseId; + private final UUID studentId; private final String studentEmail; + private final UUID feedbackSessionId; private final String feedbackSessionName; private final String feedbackSessionLogType; private final long timestamp; - public FeedbackSessionLogEntry(String studentEmail, String feedbackSessionName, - String feedbackSessionLogType, long timestamp) { + public FeedbackSessionLogEntry(String courseId, String studentEmail, + String feedbackSessionName, String feedbackSessionLogType, long timestamp) { + this.courseId = courseId; + this.studentId = null; + this.studentEmail = studentEmail; + this.feedbackSessionId = null; + this.feedbackSessionName = feedbackSessionName; + this.feedbackSessionLogType = feedbackSessionLogType; + this.timestamp = timestamp; + } + + public FeedbackSessionLogEntry(String courseId, UUID studentId, String studentEmail, UUID feedbackSessionId, + String feedbackSessionName, String feedbackSessionLogType, long timestamp) { + this.courseId = courseId; + this.studentId = studentId; this.studentEmail = studentEmail; + this.feedbackSessionId = feedbackSessionId; this.feedbackSessionName = feedbackSessionName; this.feedbackSessionLogType = feedbackSessionLogType; this.timestamp = timestamp; } + public String getCourseId() { + return courseId; + } + + public UUID getStudentId() { + return studentId; + } + public String getStudentEmail() { return studentEmail; } + public UUID getFeedbackSessionId() { + return feedbackSessionId; + } + public String getFeedbackSessionName() { return feedbackSessionName; } diff --git a/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java b/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java index 0563cada134..f3e765eb03e 100644 --- a/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java +++ b/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java @@ -10,8 +10,12 @@ public class FeedbackSessionAuditLogDetails extends LogDetails { @Nullable private String courseId; @Nullable + private String feedbackSessionId; + @Nullable private String feedbackSessionName; @Nullable + private String studentId; + @Nullable private String studentEmail; private String accessType; @@ -51,11 +55,29 @@ public void setAccessType(String accessType) { this.accessType = accessType; } + public String getFeedbackSessionId() { + return feedbackSessionId; + } + + public void setFeedbackSessionId(String feedbackSessionId) { + this.feedbackSessionId = feedbackSessionId; + } + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId; + } + @Override public void hideSensitiveInformation() { courseId = null; feedbackSessionName = null; studentEmail = null; + studentId = null; + feedbackSessionId = null; } } diff --git a/src/main/java/teammates/common/util/HibernateUtil.java b/src/main/java/teammates/common/util/HibernateUtil.java index 694a3b5c9c1..5935e872340 100644 --- a/src/main/java/teammates/common/util/HibernateUtil.java +++ b/src/main/java/teammates/common/util/HibernateUtil.java @@ -19,6 +19,7 @@ import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.FeedbackResponseComment; import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Notification; import teammates.storage.sqlentity.ReadNotification; @@ -91,7 +92,8 @@ public final class HibernateUtil { FeedbackRankRecipientsResponse.class, FeedbackRubricResponse.class, FeedbackTextResponse.class, - FeedbackResponseComment.class); + FeedbackResponseComment.class, + FeedbackSessionLog.class); private HibernateUtil() { // Utility class @@ -267,4 +269,14 @@ public static void executeDelete(CriteriaDelete cd) { HibernateUtil.getCurrentSession().createMutationQuery(cd).executeUpdate(); } + /** + * Return a reference to the persistent instance with the given class and + * identifier,making the assumption that the instance is still persistent in the + * database. + * @see Session#getReference(Class, Object) + */ + public static T getReference(Class entityType, Object id) { + return HibernateUtil.getCurrentSession().getReference(entityType, id); + } + } diff --git a/src/main/java/teammates/logic/api/LogsProcessor.java b/src/main/java/teammates/logic/api/LogsProcessor.java index 2f95021e441..1aca48e7147 100644 --- a/src/main/java/teammates/logic/api/LogsProcessor.java +++ b/src/main/java/teammates/logic/api/LogsProcessor.java @@ -2,6 +2,7 @@ import java.time.Instant; import java.util.List; +import java.util.UUID; import teammates.common.datatransfer.FeedbackSessionLogEntry; import teammates.common.datatransfer.QueryLogsResults; @@ -50,6 +51,14 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam service.createFeedbackSessionLog(courseId, email, fsName, fslType); } + /** + * Creates a feedback session log. + */ + public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, + String fslType) { + service.createFeedbackSessionLog(courseId, studentId, email, fsId, fsName, fslType); + } + /** * Gets the feedback session logs as filtered by the given parameters ordered by ascending timestamp. * @param email Can be null diff --git a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java index e48dbe6dad8..6d49eb3f26a 100644 --- a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java +++ b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; import com.google.api.gax.paging.Page; @@ -114,6 +115,14 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam // However, this method is not removed as it is necessary to assist in local testing. } + @Override + public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, + String fslType) { + // This method is not necessary for production usage because a feedback session log + // is already separately created through the standardized logging infrastructure. + // However, this method is not removed as it is necessary to assist in local testing. + } + @Override public List getOrderedFeedbackSessionLogs(String courseId, String email, long startTime, long endTime, String fsName) { @@ -154,8 +163,10 @@ public List getOrderedFeedbackSessionLogs(String course continue; } - FeedbackSessionLogEntry fslEntry = new FeedbackSessionLogEntry(details.getStudentEmail(), - details.getFeedbackSessionName(), details.getAccessType(), timestamp); + FeedbackSessionLogEntry fslEntry = new FeedbackSessionLogEntry(details.getCourseId(), + UUID.fromString(details.getStudentId()), details.getStudentEmail(), + UUID.fromString(details.getFeedbackSessionId()), details.getFeedbackSessionName(), + details.getAccessType(), timestamp); fsLogEntries.add(fslEntry); } diff --git a/src/main/java/teammates/logic/external/LocalLoggingService.java b/src/main/java/teammates/logic/external/LocalLoggingService.java index 16c04a3d0d0..ac6c4c10fc2 100644 --- a/src/main/java/teammates/logic/external/LocalLoggingService.java +++ b/src/main/java/teammates/logic/external/LocalLoggingService.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -203,7 +204,15 @@ private boolean isRequestFilterSatisfied(LogDetails details, String actionClassF @Override public void createFeedbackSessionLog(String courseId, String email, String fsName, String fslType) { - FeedbackSessionLogEntry logEntry = new FeedbackSessionLogEntry(email, fsName, + FeedbackSessionLogEntry logEntry = new FeedbackSessionLogEntry(courseId, email, + fsName, fslType, Instant.now().toEpochMilli()); + FEEDBACK_SESSION_LOG_ENTRIES.computeIfAbsent(courseId, k -> new ArrayList<>()).add(logEntry); + } + + @Override + public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, + String fslType) { + FeedbackSessionLogEntry logEntry = new FeedbackSessionLogEntry(courseId, studentId, email, fsId, fsName, fslType, Instant.now().toEpochMilli()); FEEDBACK_SESSION_LOG_ENTRIES.computeIfAbsent(courseId, k -> new ArrayList<>()).add(logEntry); } diff --git a/src/main/java/teammates/logic/external/LogService.java b/src/main/java/teammates/logic/external/LogService.java index ac79d13ab9d..ab0b705fef4 100644 --- a/src/main/java/teammates/logic/external/LogService.java +++ b/src/main/java/teammates/logic/external/LogService.java @@ -1,6 +1,7 @@ package teammates.logic.external; import java.util.List; +import java.util.UUID; import teammates.common.datatransfer.FeedbackSessionLogEntry; import teammates.common.datatransfer.QueryLogsResults; @@ -21,6 +22,12 @@ public interface LogService { */ void createFeedbackSessionLog(String courseId, String email, String fsName, String fslType); + /** + * Creates a feedback session log. + */ + void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, + String fslType); + /** * Gets the feedback session logs as filtered by the given parameters ordered by ascending timestamp. */ diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 5cd50a10268..a6a52777d4f 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -29,6 +29,7 @@ import teammates.sqllogic.core.FeedbackQuestionsLogic; import teammates.sqllogic.core.FeedbackResponseCommentsLogic; import teammates.sqllogic.core.FeedbackResponsesLogic; +import teammates.sqllogic.core.FeedbackSessionLogsLogic; import teammates.sqllogic.core.FeedbackSessionsLogic; import teammates.sqllogic.core.NotificationsLogic; import teammates.sqllogic.core.UsageStatisticsLogic; @@ -69,6 +70,7 @@ public class Logic { final FeedbackResponsesLogic feedbackResponsesLogic = FeedbackResponsesLogic.inst(); final FeedbackResponseCommentsLogic feedbackResponseCommentsLogic = FeedbackResponseCommentsLogic.inst(); final FeedbackSessionsLogic feedbackSessionsLogic = FeedbackSessionsLogic.inst(); + final FeedbackSessionLogsLogic feedbackSessionLogsLogic = FeedbackSessionLogsLogic.inst(); final UsageStatisticsLogic usageStatisticsLogic = UsageStatisticsLogic.inst(); final UsersLogic usersLogic = UsersLogic.inst(); final NotificationsLogic notificationsLogic = NotificationsLogic.inst(); @@ -443,6 +445,15 @@ public FeedbackSession getFeedbackSession(String feedbackSessionName, String cou return feedbackSessionsLogic.getFeedbackSession(feedbackSessionName, courseId); } + /** + * Gets a feedback session reference. + * + * @return Returns a proxy for the feedback session. + */ + public FeedbackSession getFeedbackSessionReference(UUID id) { + return feedbackSessionsLogic.getFeedbackSessionReference(id); + } + /** * Gets a feedback session from the recycle bin. * @@ -924,6 +935,16 @@ public Student getStudent(UUID id) { return usersLogic.getStudent(id); } + /** + * Gets student reference associated with {@code id}. + * + * @param id Id of Student. + * @return Returns a proxy for the Student. + */ + public Student getStudentReference(UUID id) { + return usersLogic.getStudentReference(id); + } + /** * Gets student associated with {@code courseId} and {@code email}. */ @@ -1600,8 +1621,21 @@ public List getFeedbackSessionsOpeningWithinTimeLimit() { /** * Create feedback session logs. */ - public void createFeedbackSessionLogs(List feedbackSessionLogs) - throws EntityAlreadyExistsException, InvalidParametersException { - // TODO: implement logic layer + public void createFeedbackSessionLogs(List feedbackSessionLogs) { + feedbackSessionLogsLogic.createFeedbackSessionLogs(feedbackSessionLogs); + } + + /** + * Gets the feedback session logs as filtered by the given parameters ordered by + * ascending timestamp. Logs with the same timestamp will be ordered by the + * student's email. + * + * @param studentId Can be null + * @param feedbackSessionId Can be null + */ + public List getOrderedFeedbackSessionLogs(String courseId, UUID studentId, + UUID feedbackSessionId, Instant startTime, Instant endTime) { + return feedbackSessionLogsLogic.getOrderedFeedbackSessionLogs(courseId, studentId, feedbackSessionId, startTime, + endTime); } } diff --git a/src/main/java/teammates/sqllogic/core/FeedbackSessionLogsLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackSessionLogsLogic.java new file mode 100644 index 00000000000..8ea0c4f3fe5 --- /dev/null +++ b/src/main/java/teammates/sqllogic/core/FeedbackSessionLogsLogic.java @@ -0,0 +1,67 @@ +package teammates.sqllogic.core; + +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +import org.hibernate.ObjectNotFoundException; + +import teammates.common.util.Logger; +import teammates.storage.sqlapi.FeedbackSessionLogsDb; +import teammates.storage.sqlentity.FeedbackSessionLog; + +/** + * Handles operations related to feedback sessions. + * + * @see FeedbackSessionLog + * @see FeedbackSessionLogsDb + */ +public final class FeedbackSessionLogsLogic { + + private static final Logger log = Logger.getLogger(); + + private static final FeedbackSessionLogsLogic instance = new FeedbackSessionLogsLogic(); + + private static final String ERROR_FAILED_TO_CREATE_LOG = "Failed to create session activity log"; + + private FeedbackSessionLogsDb fslDb; + + private FeedbackSessionLogsLogic() { + // prevent initialization + } + + public static FeedbackSessionLogsLogic inst() { + return instance; + } + + void initLogicDependencies(FeedbackSessionLogsDb fslDb) { + this.fslDb = fslDb; + } + + /** + * Creates feedback session logs. + */ + public void createFeedbackSessionLogs(List fsLogs) { + for (FeedbackSessionLog fsLog : fsLogs) { + try { + fslDb.createFeedbackSessionLog(fsLog); + } catch (ObjectNotFoundException e) { + log.severe(String.format(ERROR_FAILED_TO_CREATE_LOG), e); + } + } + } + + /** + * Gets the feedback session logs as filtered by the given parameters ordered by + * ascending timestamp. Logs with the same timestamp will be ordered by the + * student's email. + * + * @param studentId Can be null + * @param feedbackSessionId Can be null + */ + public List getOrderedFeedbackSessionLogs(String courseId, UUID studentId, + UUID feedbackSessionId, Instant startTime, Instant endTime) { + return fslDb.getOrderedFeedbackSessionLogs(courseId, studentId, feedbackSessionId, startTime, + endTime); + } +} diff --git a/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java index 84ea61b2a0c..a707990d083 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java @@ -87,6 +87,16 @@ public FeedbackSession getFeedbackSession(String feedbackSessionName, String cou return fsDb.getFeedbackSession(feedbackSessionName, courseId); } + /** + * Gets a feedback session reference. + * + * @return Returns a proxy for the feedback session. + */ + public FeedbackSession getFeedbackSessionReference(UUID id) { + assert id != null; + return fsDb.getFeedbackSessionReference(id); + } + /** * Gets all feedback sessions of a course, except those that are soft-deleted. */ diff --git a/src/main/java/teammates/sqllogic/core/LogicStarter.java b/src/main/java/teammates/sqllogic/core/LogicStarter.java index b474cac8980..4ae35a61a52 100644 --- a/src/main/java/teammates/sqllogic/core/LogicStarter.java +++ b/src/main/java/teammates/sqllogic/core/LogicStarter.java @@ -11,6 +11,7 @@ import teammates.storage.sqlapi.FeedbackQuestionsDb; import teammates.storage.sqlapi.FeedbackResponseCommentsDb; import teammates.storage.sqlapi.FeedbackResponsesDb; +import teammates.storage.sqlapi.FeedbackSessionLogsDb; import teammates.storage.sqlapi.FeedbackSessionsDb; import teammates.storage.sqlapi.NotificationsDb; import teammates.storage.sqlapi.UsageStatisticsDb; @@ -33,6 +34,7 @@ public static void initializeDependencies() { DataBundleLogic dataBundleLogic = DataBundleLogic.inst(); DeadlineExtensionsLogic deadlineExtensionsLogic = DeadlineExtensionsLogic.inst(); FeedbackSessionsLogic fsLogic = FeedbackSessionsLogic.inst(); + FeedbackSessionLogsLogic fslLogic = FeedbackSessionLogsLogic.inst(); FeedbackResponsesLogic frLogic = FeedbackResponsesLogic.inst(); FeedbackResponseCommentsLogic frcLogic = FeedbackResponseCommentsLogic.inst(); FeedbackQuestionsLogic fqLogic = FeedbackQuestionsLogic.inst(); @@ -48,6 +50,7 @@ public static void initializeDependencies() { notificationsLogic, usersLogic); deadlineExtensionsLogic.initLogicDependencies(DeadlineExtensionsDb.inst(), fsLogic); fsLogic.initLogicDependencies(FeedbackSessionsDb.inst(), coursesLogic, frLogic, fqLogic, usersLogic); + fslLogic.initLogicDependencies(FeedbackSessionLogsDb.inst()); frLogic.initLogicDependencies(FeedbackResponsesDb.inst(), usersLogic, fqLogic, frcLogic); frcLogic.initLogicDependencies(FeedbackResponseCommentsDb.inst()); fqLogic.initLogicDependencies(FeedbackQuestionsDb.inst(), coursesLogic, frLogic, usersLogic, fsLogic); diff --git a/src/main/java/teammates/sqllogic/core/UsersLogic.java b/src/main/java/teammates/sqllogic/core/UsersLogic.java index e0486616a69..bfac68a3f36 100644 --- a/src/main/java/teammates/sqllogic/core/UsersLogic.java +++ b/src/main/java/teammates/sqllogic/core/UsersLogic.java @@ -482,6 +482,18 @@ public Student getStudent(UUID id) { return usersDb.getStudent(id); } + /** + * Gets student reference associated with {@code id}. + * + * @param id Id of Student. + * @return Returns a proxy for the Student. + */ + public Student getStudentReference(UUID id) { + assert id != null; + + return usersDb.getStudentReference(id); + } + /** * Gets the student with the specified email. */ diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java new file mode 100644 index 00000000000..c9f6af098ff --- /dev/null +++ b/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java @@ -0,0 +1,86 @@ +package teammates.storage.sqlapi; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import teammates.common.util.HibernateUtil; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; + +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + +/** + * Handles CRUD operations for feedback session logs. + * + * @see FeedbackSessionLog + */ +public final class FeedbackSessionLogsDb extends EntitiesDb { + + private static final FeedbackSessionLogsDb instance = new FeedbackSessionLogsDb(); + + private FeedbackSessionLogsDb() { + // prevent initialization + } + + public static FeedbackSessionLogsDb inst() { + return instance; + } + + /** + * Gets the feedback session logs as filtered by the given parameters ordered by + * ascending timestamp. Logs with the same timestamp will be ordered by the + * student's email. + * + * @param studentId Can be null + * @param feedbackSessionId Can be null + */ + public List getOrderedFeedbackSessionLogs(String courseId, UUID studentId, + UUID feedbackSessionId, Instant startTime, Instant endTime) { + + assert courseId != null; + assert startTime != null; + assert endTime != null; + + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cr = cb.createQuery(FeedbackSessionLog.class); + Root root = cr.from(FeedbackSessionLog.class); + Join feedbackSessionJoin = root.join("feedbackSession"); + Join studentJoin = root.join("student"); + + List predicates = new ArrayList<>(); + + if (studentId != null) { + predicates.add(cb.equal(studentJoin.get("id"), studentId)); + } + + if (feedbackSessionId != null) { + predicates.add(cb.equal(feedbackSessionJoin.get("id"), feedbackSessionId)); + } + + predicates.add(cb.equal(feedbackSessionJoin.get("course").get("id"), courseId)); + predicates.add(cb.greaterThanOrEqualTo(root.get("timestamp"), startTime)); + predicates.add(cb.lessThan(root.get("timestamp"), endTime)); + + cr.select(root).where(predicates.toArray(new Predicate[0])).orderBy(cb.asc(root.get("timestamp")), + cb.asc(studentJoin.get("email"))); + return HibernateUtil.createQuery(cr).getResultList(); + } + + /** + * Creates feedback session logs. + */ + public FeedbackSessionLog createFeedbackSessionLog(FeedbackSessionLog log) { + assert log != null; + + persist(log); + + return log; + } +} diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java index 389407e9f28..078d453da2c 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java @@ -65,6 +65,17 @@ public FeedbackSession getFeedbackSession(String feedbackSessionName, String cou return HibernateUtil.createQuery(cq).getResultStream().findFirst().orElse(null); } + /** + * Gets a feedback session reference. + * + * @return Returns a proxy for the feedback session. + */ + public FeedbackSession getFeedbackSessionReference(UUID id) { + assert id != null; + + return HibernateUtil.getReference(FeedbackSession.class, id); + } + /** * Gets a soft-deleted feedback session. * diff --git a/src/main/java/teammates/storage/sqlapi/UsersDb.java b/src/main/java/teammates/storage/sqlapi/UsersDb.java index 5d3b8571071..3621f5c6224 100644 --- a/src/main/java/teammates/storage/sqlapi/UsersDb.java +++ b/src/main/java/teammates/storage/sqlapi/UsersDb.java @@ -146,6 +146,15 @@ public Student getStudent(UUID id) { return HibernateUtil.get(Student.class, id); } + /** + * Gets a student reference by its {@code id}. + */ + public Student getStudentReference(UUID id) { + assert id != null; + + return HibernateUtil.getReference(Student.class, id); + } + /** * Gets a student by {@code regKey}. */ diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java index 61d54f3c8a1..9c6a7ed2825 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java @@ -6,6 +6,9 @@ import java.util.Objects; import java.util.UUID; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import teammates.common.datatransfer.logs.FeedbackSessionLogType; import jakarta.persistence.Column; @@ -13,6 +16,8 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; /** @@ -24,11 +29,15 @@ public class FeedbackSessionLog extends BaseEntity { @Id private UUID id; - @Column(nullable = false) - private String studentEmail; + @ManyToOne + @JoinColumn(name = "studentId") + @NotFound(action = NotFoundAction.IGNORE) + private Student student; - @Column(nullable = false) - private String feedbackSessionName; + @ManyToOne + @JoinColumn(name = "sessionId") + @NotFound(action = NotFoundAction.IGNORE) + private FeedbackSession feedbackSession; @Column(nullable = false) @Enumerated(EnumType.STRING) @@ -41,11 +50,11 @@ protected FeedbackSessionLog() { // required by Hibernate } - public FeedbackSessionLog(String email, String feedbackSessionName, FeedbackSessionLogType feedbackSessionLogType, - Instant timestamp) { + public FeedbackSessionLog(Student student, FeedbackSession feedbackSession, + FeedbackSessionLogType feedbackSessionLogType, Instant timestamp) { this.setId(UUID.randomUUID()); - this.studentEmail = email; - this.feedbackSessionName = feedbackSessionName; + this.student = student; + this.feedbackSession = feedbackSession; this.feedbackSessionLogType = feedbackSessionLogType; this.timestamp = timestamp; } @@ -58,20 +67,20 @@ public void setId(UUID id) { this.id = id; } - public String getStudentEmail() { - return studentEmail; + public Student getStudent() { + return student; } - public void setStudentEmail(String email) { - this.studentEmail = email; + public void setStudent(Student student) { + this.student = student; } - public String getFeedbackSessionName() { - return feedbackSessionName; + public FeedbackSession getFeedbackSession() { + return feedbackSession; } - public void setFeedbackSessionName(String feedbackSessionName) { - this.feedbackSessionName = feedbackSessionName; + public void setFeedbackSession(FeedbackSession feedbackSession) { + this.feedbackSession = feedbackSession; } public FeedbackSessionLogType getFeedbackSessionLogType() { @@ -92,8 +101,7 @@ public void setTimestamp(Instant timestamp) { @Override public String toString() { - return "FeedbackSessionLog [id=" + id + ", email=" + studentEmail + ", feedbackSessionName=" - + feedbackSessionName + return "FeedbackSessionLog [id=" + id + ", student=" + student + ", feedbackSession=" + feedbackSession + ", feedbackSessionLogType=" + feedbackSessionLogType.getLabel() + ", timestamp=" + timestamp + "]"; } diff --git a/src/main/java/teammates/ui/output/FeedbackSessionData.java b/src/main/java/teammates/ui/output/FeedbackSessionData.java index 9b529f1b5b2..b5aef354d88 100644 --- a/src/main/java/teammates/ui/output/FeedbackSessionData.java +++ b/src/main/java/teammates/ui/output/FeedbackSessionData.java @@ -3,6 +3,7 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -20,6 +21,10 @@ * The API output format of {@link FeedbackSessionAttributes}. */ public class FeedbackSessionData extends ApiOutput { + + @Nullable + private final UUID feedbackSessionId; + private final String courseId; private final String timeZone; private final String feedbackSessionName; @@ -60,6 +65,7 @@ public class FeedbackSessionData extends ApiOutput { public FeedbackSessionData(FeedbackSessionAttributes feedbackSessionAttributes) { String timeZone = feedbackSessionAttributes.getTimeZone(); + this.feedbackSessionId = null; this.courseId = feedbackSessionAttributes.getCourseId(); this.timeZone = timeZone; this.feedbackSessionName = feedbackSessionAttributes.getFeedbackSessionName(); @@ -148,6 +154,7 @@ public FeedbackSessionData(FeedbackSession feedbackSession) { assert feedbackSession != null; assert feedbackSession.getCourse() != null; String timeZone = feedbackSession.getCourse().getTimeZone(); + this.feedbackSessionId = feedbackSession.getId(); this.courseId = feedbackSession.getCourse().getId(); this.timeZone = timeZone; this.feedbackSessionName = feedbackSession.getName(); @@ -252,6 +259,10 @@ public FeedbackSessionData(FeedbackSession feedbackSession, Instant extendedDead } } + public UUID getFeedbackSessionId() { + return feedbackSessionId; + } + public String getCourseId() { return courseId; } diff --git a/src/main/java/teammates/ui/output/StudentData.java b/src/main/java/teammates/ui/output/StudentData.java index 933b9e9d025..21138ae9026 100644 --- a/src/main/java/teammates/ui/output/StudentData.java +++ b/src/main/java/teammates/ui/output/StudentData.java @@ -1,5 +1,7 @@ package teammates.ui.output; +import java.util.UUID; + import javax.annotation.Nullable; import teammates.common.datatransfer.attributes.StudentAttributes; @@ -10,6 +12,9 @@ */ public class StudentData extends ApiOutput { + @Nullable + private final UUID studentId; + private final String email; private final String courseId; @@ -29,6 +34,7 @@ public class StudentData extends ApiOutput { private final String sectionName; public StudentData(StudentAttributes studentAttributes) { + this.studentId = null; this.email = studentAttributes.getEmail(); this.courseId = studentAttributes.getCourse(); this.name = studentAttributes.getName(); @@ -39,6 +45,7 @@ public StudentData(StudentAttributes studentAttributes) { } public StudentData(Student student) { + this.studentId = student.getId(); this.email = student.getEmail(); this.courseId = student.getCourseId(); this.name = student.getName(); @@ -48,6 +55,10 @@ public StudentData(Student student) { this.sectionName = student.getSectionName(); } + public UUID getStudentId() { + return studentId; + } + public String getEmail() { return email; } diff --git a/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java b/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java index cf77994aa9f..69b5e43d0e6 100644 --- a/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java +++ b/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java @@ -1,9 +1,13 @@ package teammates.ui.webapi; +import java.util.UUID; + import teammates.common.datatransfer.logs.FeedbackSessionAuditLogDetails; import teammates.common.datatransfer.logs.FeedbackSessionLogType; import teammates.common.util.Const; import teammates.common.util.Logger; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Student; /** * Action: creates a feedback session log for the purposes of tracking and auditing. @@ -35,15 +39,35 @@ public JsonResult execute() { String studentEmail = getNonNullRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); // Skip rigorous validations to avoid incurring extra db reads and to keep the endpoint light - // Necessary to assist local testing. For production usage, this will be a no-op. - logsProcessor.createFeedbackSessionLog(courseId, studentEmail, fsName, fslType); - FeedbackSessionAuditLogDetails details = new FeedbackSessionAuditLogDetails(); details.setCourseId(courseId); details.setFeedbackSessionName(fsName); details.setStudentEmail(studentEmail); details.setAccessType(fslType); + if (isCourseMigrated(courseId)) { + // TODO: remove unnecessary db reads after updating the front end + Student student = sqlLogic.getStudentForEmail(courseId, studentEmail); + FeedbackSession feedbackSession = sqlLogic.getFeedbackSession(fsName, courseId); + UUID studentId = null; + UUID fsId = null; + + if (student != null) { + studentId = student.getId(); + details.setStudentId(studentId.toString()); + } + + if (feedbackSession != null) { + fsId = feedbackSession.getId(); + details.setFeedbackSessionId(fsId.toString()); + } + // Necessary to assist local testing. For production usage, this will be a no-op. + logsProcessor.createFeedbackSessionLog(courseId, studentId, studentEmail, fsId, fsName, fslType); + } else { + // Necessary to assist local testing. For production usage, this will be a no-op. + logsProcessor.createFeedbackSessionLog(courseId, null, studentEmail, null, fsName, fslType); + } + log.event("Feedback session audit event: " + fslType, details); return new JsonResult("Successful"); diff --git a/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java b/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java index 568852dd032..164db9fa344 100644 --- a/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java @@ -6,23 +6,23 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import teammates.common.datatransfer.FeedbackSessionLogEntry; import teammates.common.datatransfer.logs.FeedbackSessionLogType; -import teammates.common.exception.EntityAlreadyExistsException; -import teammates.common.exception.InvalidParametersException; -import teammates.common.util.Logger; import teammates.common.util.TimeHelper; +import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; /** - * Process feedback session logs in the past defined time period and store in the database. + * Process feedback session logs from GCP in the past defined time period and + * store in the database. */ public class UpdateFeedbackSessionLogsAction extends AdminOnlyAction { static final int COLLECTION_TIME_PERIOD = 60; // represents one hour static final long SPAM_FILTER = 2000L; // in ms - private static final Logger log = Logger.getLogger(); @Override public JsonResult execute() { @@ -34,30 +34,35 @@ public JsonResult execute() { List logEntries = logsProcessor.getOrderedFeedbackSessionLogs(null, null, startTime.toEpochMilli(), endTime.toEpochMilli(), null); - Map>> lastSavedTimestamps = new HashMap<>(); + Map>>> lastSavedTimestamps = new HashMap<>(); for (FeedbackSessionLogEntry logEntry : logEntries) { - String email = logEntry.getStudentEmail(); - String fbSessionName = logEntry.getFeedbackSessionName(); + + if (!isCourseMigrated(logEntry.getCourseId())) { + continue; + } + + String courseId = logEntry.getCourseId(); + UUID studentId = logEntry.getStudentId(); + UUID fbSessionId = logEntry.getFeedbackSessionId(); String type = logEntry.getFeedbackSessionLogType(); Long timestamp = logEntry.getTimestamp(); - lastSavedTimestamps.putIfAbsent(email, new HashMap<>()); - lastSavedTimestamps.get(email).putIfAbsent(fbSessionName, new HashMap<>()); - Long lastSaved = lastSavedTimestamps.get(email).get(fbSessionName).getOrDefault(type, 0L); + lastSavedTimestamps.computeIfAbsent(studentId, k -> new HashMap<>()); + lastSavedTimestamps.get(studentId).computeIfAbsent(courseId, k -> new HashMap<>()); + lastSavedTimestamps.get(studentId).get(courseId).computeIfAbsent(fbSessionId, k -> new HashMap<>()); + Long lastSaved = lastSavedTimestamps.get(studentId).get(courseId).get(fbSessionId).getOrDefault(type, 0L); if (Math.abs(timestamp - lastSaved) > SPAM_FILTER) { - lastSavedTimestamps.get(email).get(fbSessionName).put(type, timestamp); - FeedbackSessionLog fslEntity = new FeedbackSessionLog(email, fbSessionName, + lastSavedTimestamps.get(studentId).get(courseId).get(fbSessionId).put(type, timestamp); + Student student = sqlLogic.getStudentReference(studentId); + FeedbackSession feedbackSession = sqlLogic.getFeedbackSessionReference(fbSessionId); + FeedbackSessionLog fslEntity = new FeedbackSessionLog(student, feedbackSession, FeedbackSessionLogType.valueOfLabel(type), Instant.ofEpochMilli(timestamp)); filteredLogs.add(fslEntity); } } - try { - sqlLogic.createFeedbackSessionLogs(filteredLogs); - } catch (InvalidParametersException | EntityAlreadyExistsException e) { - log.severe("Unexpected error", e); - } + sqlLogic.createFeedbackSessionLogs(filteredLogs); return new JsonResult("Successful"); } diff --git a/src/test/java/teammates/logic/api/MockLogsProcessor.java b/src/test/java/teammates/logic/api/MockLogsProcessor.java index f07a15d7701..fbff7904f4d 100644 --- a/src/test/java/teammates/logic/api/MockLogsProcessor.java +++ b/src/test/java/teammates/logic/api/MockLogsProcessor.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.UUID; import teammates.common.datatransfer.FeedbackSessionLogEntry; import teammates.common.datatransfer.QueryLogsResults; @@ -23,9 +24,19 @@ public class MockLogsProcessor extends LogsProcessor { /** * Simulates insertion of feedback session logs. */ - public void insertFeedbackSessionLog(String studentEmail, String feedbackSessionName, + public void insertFeedbackSessionLog(String courseId, String studentEmail, String feedbackSessionName, String fslType, long timestamp) { - feedbackSessionLogs.add(new FeedbackSessionLogEntry(studentEmail, feedbackSessionName, fslType, timestamp)); + feedbackSessionLogs + .add(new FeedbackSessionLogEntry(courseId, studentEmail, feedbackSessionName, fslType, timestamp)); + } + + /** + * Simulates insertion of feedback session logs. + */ + public void insertFeedbackSessionLog(String courseId, UUID studentId, String studentEmail, + UUID feedbackSessionId, String feedbackSessionName, String fslType, long timestamp) { + feedbackSessionLogs.add(new FeedbackSessionLogEntry(courseId, studentId, studentEmail, feedbackSessionId, + feedbackSessionName, fslType, timestamp)); } /** @@ -97,7 +108,8 @@ public QueryLogsResults queryLogs(QueryLogsParams queryLogsParams) { } @Override - public void createFeedbackSessionLog(String courseId, String email, String fsName, String fslType) { + public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, + String fslType) { // No-op } diff --git a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java index d244f7eeb62..72a8ec36802 100644 --- a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java +++ b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java @@ -1,12 +1,15 @@ package teammates.sqlui.webapi; import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -17,7 +20,10 @@ import teammates.common.exception.InvalidParametersException; import teammates.common.util.Const; import teammates.common.util.TimeHelper; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; import teammates.ui.webapi.UpdateFeedbackSessionLogsAction; /** @@ -29,11 +35,15 @@ public class UpdateFeedbackSessionLogsActionTest static final int COLLECTION_TIME_PERIOD = 60; // represents one hour static final long SPAM_FILTER = 2000L; // in ms - String student1 = "student1"; - String student2 = "student2"; + Student student1; + Student student2; - String feedbackSession1 = "fs1"; - String feedbackSession2 = "fs2"; + Course course1; + Course course2; + + FeedbackSession session1InCourse1; + FeedbackSession session2InCourse1; + FeedbackSession session1InCourse2; Instant endTime; Instant startTime; @@ -52,6 +62,42 @@ String getRequestMethod() { void setUp() { endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); + + course1 = getTypicalCourse(); + course1.setId("course1"); + + course2 = getTypicalCourse(); + course2.setId("course2"); + + student1 = getTypicalStudent(); + student1.setEmail("student1@teammates.tmt"); + student1.setId(UUID.randomUUID()); + + student2 = getTypicalStudent(); + student2.setEmail("student2@teammates.tmt"); + student2.setId(UUID.randomUUID()); + + session1InCourse1 = getTypicalFeedbackSessionForCourse(course1); + session1InCourse1.setName("session1"); + session1InCourse1.setId(UUID.randomUUID()); + + session2InCourse1 = getTypicalFeedbackSessionForCourse(course1); + session2InCourse1.setName("session2"); + session2InCourse1.setId(UUID.randomUUID()); + + session1InCourse2 = getTypicalFeedbackSessionForCourse(course2); + session1InCourse2.setName("session1"); + session1InCourse2.setId(UUID.randomUUID()); + + reset(mockLogic); + + when(mockLogic.getStudentReference(student1.getId())).thenReturn(student1); + when(mockLogic.getStudentReference(student2.getId())).thenReturn(student2); + + when(mockLogic.getFeedbackSessionReference(session1InCourse1.getId())).thenReturn(session1InCourse1); + when(mockLogic.getFeedbackSessionReference(session2InCourse1.getId())).thenReturn(session2InCourse1); + when(mockLogic.getFeedbackSessionReference(session1InCourse2.getId())).thenReturn(session1InCourse2); + mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, "").clear(); } @@ -61,95 +107,102 @@ public void testExecute_noRecentLogs_noLogsCreated() UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); - verify(mockLogic) - .createFeedbackSessionLogs(argThat(filteredLogs -> filteredLogs.size() == 0)); + verify(mockLogic).createFeedbackSessionLogs(argThat(filteredLogs -> filteredLogs.size() == 0)); } @Test public void testExecute_recentLogsNoSpam_allLogsCreated() throws EntityAlreadyExistsException, InvalidParametersException { // Different Types - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(300).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.SUBMISSION.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.SUBMISSION.getLabel(), startTime.plusSeconds(300).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.VIEW_RESULT.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.VIEW_RESULT.getLabel(), startTime.plusSeconds(300).toEpochMilli()); // Different feedback sessions - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(600).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession2, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session2InCourse1.getId(), session2InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(600).toEpochMilli()); // Different Student - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(900).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(student2, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student2.getId(), student2.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(900).toEpochMilli()); + // Different course + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(1200).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course2.getId(), student1.getId(), student1.getEmail(), + session1InCourse2.getId(), session1InCourse2.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(1200).toEpochMilli()); + // Gap is larger than spam filter - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); // method returns all logs regardless of params - List expected = - mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, ""); + List expected = mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, ""); - verify(mockLogic).createFeedbackSessionLogs( - argThat(filteredLogs -> isEqualExceptId(expected, filteredLogs))); + verify(mockLogic).createFeedbackSessionLogs(argThat(filteredLogs -> isEqual(expected, filteredLogs))); } @Test public void testExecute_recentLogsWithSpam_someLogsCreated() throws EntityAlreadyExistsException, InvalidParametersException { // Gap is smaller than spam filter - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER - 2).toEpochMilli()); // Filters multiple logs within one spam window - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER - 1).toEpochMilli()); // Correctly adds new log after filtering - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); // Filters out spam in the new window - mockLogsProcessor.insertFeedbackSessionLog(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 2).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); List expected = new ArrayList<>(); - expected.add(new FeedbackSessionLogEntry(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli())); - expected.add(new FeedbackSessionLogEntry(student1, feedbackSession1, - FeedbackSessionLogType.ACCESS.getLabel(), + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1.getId(), student1.getEmail(), + session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); - verify(mockLogic).createFeedbackSessionLogs( - argThat(filteredLogs -> isEqualExceptId(expected, filteredLogs))); + verify(mockLogic).createFeedbackSessionLogs(argThat(filteredLogs -> isEqual(expected, filteredLogs))); } @Test @@ -176,30 +229,21 @@ public void testSpecificAccessControl_loggedOut_cannotAccess() { verifyCannotAccess(); } - private Boolean isEqualExceptId(List expected, - List actual) { - if (expected.size() != actual.size()) { - return false; - } + private Boolean isEqual(List expected, List actual) { + + assertEquals(expected.size(), actual.size()); for (int i = 0; i < expected.size(); i++) { FeedbackSessionLogEntry expectedEntry = expected.get(i); FeedbackSessionLog actualLog = actual.get(i); - if (!expectedEntry.getStudentEmail().equals(actualLog.getStudentEmail())) { - return false; - } - if (!expectedEntry.getFeedbackSessionName() - .equals(actualLog.getFeedbackSessionName())) { - return false; - } - if (!expectedEntry.getFeedbackSessionLogType() - .equals(actualLog.getFeedbackSessionLogType().getLabel())) { - return false; - } - if (expectedEntry.getTimestamp() != actualLog.getTimestamp().toEpochMilli()) { - return false; - } + assertEquals(expectedEntry.getStudentId(), actualLog.getStudent().getId()); + + assertEquals(expectedEntry.getFeedbackSessionId(), actualLog.getFeedbackSession().getId()); + + assertEquals(expectedEntry.getFeedbackSessionLogType(), actualLog.getFeedbackSessionLogType().getLabel()); + + assertEquals(expectedEntry.getTimestamp(), actualLog.getTimestamp().toEpochMilli()); } return true; diff --git a/src/test/java/teammates/storage/sqlapi/FeedbackSessionLogsDbTest.java b/src/test/java/teammates/storage/sqlapi/FeedbackSessionLogsDbTest.java new file mode 100644 index 00000000000..ee6bf29b1ff --- /dev/null +++ b/src/test/java/teammates/storage/sqlapi/FeedbackSessionLogsDbTest.java @@ -0,0 +1,46 @@ +package teammates.storage.sqlapi; + +import static org.mockito.Mockito.mockStatic; + +import java.time.Instant; + +import org.mockito.MockedStatic; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.HibernateUtil; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.test.BaseTestCase; + +/** + * SUT: {@code FeedbackSessionLogsDb}. + */ +public class FeedbackSessionLogsDbTest extends BaseTestCase { + + private FeedbackSessionLogsDb feedbackSessionLogsDb = FeedbackSessionLogsDb.inst(); + + private MockedStatic mockHibernateUtil; + + @BeforeMethod + public void setUpMethod() { + mockHibernateUtil = mockStatic(HibernateUtil.class); + } + + @AfterMethod + public void teardownMethod() { + mockHibernateUtil.close(); + } + + @Test + public void testCreateFeedbackSessionLog_success() { + + FeedbackSessionLog logToAdd = new FeedbackSessionLog(getTypicalStudent(), + getTypicalFeedbackSessionForCourse(getTypicalCourse()), FeedbackSessionLogType.ACCESS, + Instant.parse("2011-01-01T00:00:00Z")); + feedbackSessionLogsDb.createFeedbackSessionLog(logToAdd); + + mockHibernateUtil.verify(() -> HibernateUtil.persist(logToAdd)); + } +} diff --git a/src/test/java/teammates/ui/webapi/GetFeedbackSessionLogsActionTest.java b/src/test/java/teammates/ui/webapi/GetFeedbackSessionLogsActionTest.java index c668a9394f8..41b1b0421bc 100644 --- a/src/test/java/teammates/ui/webapi/GetFeedbackSessionLogsActionTest.java +++ b/src/test/java/teammates/ui/webapi/GetFeedbackSessionLogsActionTest.java @@ -48,15 +48,15 @@ protected void testExecute() { long startTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() - 1) * 24 * 60 * 60 * 1000; long invalidStartTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() + 1) * 24 * 60 * 60 * 1000; - mockLogsProcessor.insertFeedbackSessionLog(student1Email, fsa1Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa1Name, FeedbackSessionLogType.ACCESS.getLabel(), startTime); - mockLogsProcessor.insertFeedbackSessionLog(student1Email, fsa2Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa2Name, FeedbackSessionLogType.ACCESS.getLabel(), startTime + 1000); - mockLogsProcessor.insertFeedbackSessionLog(student1Email, fsa2Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa2Name, FeedbackSessionLogType.SUBMISSION.getLabel(), startTime + 2000); - mockLogsProcessor.insertFeedbackSessionLog(student2Email, fsa1Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student2Email, fsa1Name, FeedbackSessionLogType.ACCESS.getLabel(), startTime + 3000); - mockLogsProcessor.insertFeedbackSessionLog(student2Email, fsa1Name, + mockLogsProcessor.insertFeedbackSessionLog(courseId, student2Email, fsa1Name, FeedbackSessionLogType.SUBMISSION.getLabel(), startTime + 4000); ______TS("Failure case: not enough parameters"); From c4fe140451319096228eafe318476083ce256224 Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Fri, 29 Mar 2024 00:28:37 +0800 Subject: [PATCH 14/95] Merge pull request #12960 from TEAMMATES/master (#12961) From f6329eb10233e07143153782451605524216c901 Mon Sep 17 00:00:00 2001 From: Xenos F Date: Fri, 29 Mar 2024 01:22:35 +0800 Subject: [PATCH 15/95] [#11878] Add snapshot tests for instructor request form UI (#12942) * Add snapshot tests * Change double quotes to single quotes --- .../request-page.component.spec.ts.snap | 181 +++++++++++++++ ...ructor-request-form.component.spec.ts.snap | 209 ++++++++++++++++++ .../instructor-request-form.component.spec.ts | 4 + .../request-page.component.spec.ts | 27 +++ 4 files changed, 421 insertions(+) create mode 100644 src/web/app/pages-static/request-page/__snapshots__/request-page.component.spec.ts.snap create mode 100644 src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap diff --git a/src/web/app/pages-static/request-page/__snapshots__/request-page.component.spec.ts.snap b/src/web/app/pages-static/request-page/__snapshots__/request-page.component.spec.ts.snap new file mode 100644 index 00000000000..aab4f634f16 --- /dev/null +++ b/src/web/app/pages-static/request-page/__snapshots__/request-page.component.spec.ts.snap @@ -0,0 +1,181 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`RequestPageComponent should render correctly after form is submitted 1`] = ` + +

    + Request for an Instructor Account +

    +
    +

    + Your request has been submitted successfully: +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Full Name + + Jane Smith +
    + Institution + + University of Example +
    + Country + + Example Republic +
    + Email + + js@exampleu.edu +
    + Home Page URL + + u.exampleu.edu/jsmith +
    + Comments + + +
    +

    + We have sent an acknowledgement email to your email address + + js@exampleu.edu + + . Please check your email inbox or spam folder. If you do not receive the acknowledgement email within 1 hour, please + + contact + + us. +

    +
    +
    +     +`; + +exports[`RequestPageComponent should render correctly after instructor declaration is done 1`] = ` + +

    + Request for an Instructor Account +

    +
    +

    + Request for an instructor account using this form if you are an instructor and want to use TEAMMATES to manage peer evaluations and/or other feedback paths of your students. +

    +
    +
    + +
    +
    +
    +
    +     +`; + +exports[`RequestPageComponent should render correctly before instructor declaration is done 1`] = ` + +

    + Request for an Instructor Account +

    +
    +

    + Request for an instructor account using this form if you are an instructor and want to use TEAMMATES to manage peer evaluations and/or other feedback paths of your students. +

    +
    +
    +

    + Note: + + Students should not use this form to request for TEAMMATES accounts + + , as students do not need accounts to use TEAMMATES. Instead, TEAMMATES will email students (who have been added to TEAMMATES by a course instructor) an access link when there is a TEAMMATES session available for them to access. +

    + + Back to home page + + +
    +
    +
    +
    +     +`; diff --git a/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap b/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap new file mode 100644 index 00000000000..cae64607d64 --- /dev/null +++ b/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap @@ -0,0 +1,209 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`InstructorRequestFormComponent should render correctly 1`] = ` + +
    +
    + +

    + This is the name that will be shown to your students. You may include salutation (Dr. Prof. etc.) +

    + + +
    +
    +
    + +

    + Please give full name of the university/institution. +

    + + +
    +
    +
    + +

    + Which country is your university/institution based in? +

    + + +
    +
    +
    + +

    + Please use the email address + + given to you by your school/university + + (not your personal Gmail/Hotmail address). Note that this email address will be visible to the students you enroll in TEAMMATES. +

    + + +
    +
    +
    + + +
    +
    +
    + + + [attr.aria-invalid]="comments.invalid">

    -
    diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss index addb0b11c7a..3e5249ca353 100644 --- a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.scss @@ -20,3 +20,7 @@ label.qn { .red-font { color: red; } + +.error-box { + margin: 1rem 0; +} diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts index 67e0e3b94b7..3a5f4fba2b8 100644 --- a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts @@ -1,21 +1,34 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { first } from 'rxjs'; +import { Observable, first } from 'rxjs'; import { InstructorRequestFormModel } from './instructor-request-form-model'; import { InstructorRequestFormComponent } from './instructor-request-form.component'; +import { AccountService } from '../../../../services/account.service'; +import { AccountCreateRequest } from '../../../../types/api-request'; describe('InstructorRequestFormComponent', () => { let component: InstructorRequestFormComponent; let fixture: ComponentFixture; + let accountService: AccountService; const typicalModel: InstructorRequestFormModel = { name: 'John Doe', institution: 'Example Institution', country: 'Example Country', email: 'jd@example.edu', - homePage: 'xyz.example.edu/john', comments: '', }; + const typicalCreateRequest: AccountCreateRequest = { + instructorEmail: typicalModel.email, + instructorName: typicalModel.name, + instructorInstitution: `${typicalModel.institution}, ${typicalModel.country}`, + }; + + const accountServiceStub: Partial = { + createAccountRequest: () => new Observable((subscriber) => { + subscriber.next(); + }), + }; /** * Fills in form fields with the given data. @@ -27,19 +40,24 @@ describe('InstructorRequestFormComponent', () => { component.institution.setValue(data.institution); component.country.setValue(data.country); component.email.setValue(data.email); - component.homePage.setValue(data.homePage); component.comments.setValue(data.comments); } - beforeEach(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [InstructorRequestFormComponent], imports: [ReactiveFormsModule], - }); + providers: [{ provide: AccountService, useValue: accountServiceStub }], + }) + .compileComponents(); + })); + + beforeEach(() => { fixture = TestBed.createComponent(InstructorRequestFormComponent); component = fixture.componentInstance; - + accountService = TestBed.inject(AccountService); fixture.detectChanges(); + jest.clearAllMocks(); }); it('should create', () => { @@ -50,17 +68,20 @@ describe('InstructorRequestFormComponent', () => { expect(fixture).toMatchSnapshot(); }); - it('should emit requestSubmissionEvent once when submit button is clicked', () => { - jest.spyOn(component.requestSubmissionEvent, 'emit'); + it('should run onSubmit() when submit button is clicked', () => { + jest.spyOn(component, 'onSubmit'); fillFormWith(typicalModel); const submitButton = fixture.debugElement.query(By.css('#submit-button')); submitButton.nativeElement.click(); - expect(component.requestSubmissionEvent.emit).toHaveBeenCalledTimes(1); + expect(component.onSubmit).toHaveBeenCalledTimes(1); }); it('should emit requestSubmissionEvent with the correct data when form is submitted', () => { + jest.spyOn(accountService, 'createAccountRequest').mockReturnValue( + new Observable((subscriber) => { subscriber.next(); })); + // Listen for emitted value let actualModel: InstructorRequestFormModel | null = null; component.requestSubmissionEvent.pipe(first()) @@ -74,7 +95,17 @@ describe('InstructorRequestFormComponent', () => { expect(actualModel!.institution).toBe(typicalModel.institution); expect(actualModel!.country).toBe(typicalModel.country); expect(actualModel!.email).toBe(typicalModel.email); - expect(actualModel!.homePage).toBe(typicalModel.homePage); expect(actualModel!.comments).toBe(typicalModel.comments); }); + + it('should send the correct request data when form is submitted', () => { + jest.spyOn(accountService, 'createAccountRequest').mockReturnValue( + new Observable((subscriber) => { subscriber.next(); })); + + fillFormWith(typicalModel); + component.onSubmit(); + + expect(accountService.createAccountRequest).toHaveBeenCalledTimes(1); + expect(accountService.createAccountRequest).toHaveBeenCalledWith(expect.objectContaining(typicalCreateRequest)); + }); }); diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts index fff881cc607..02b2ae00fd2 100644 --- a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts @@ -1,10 +1,11 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { finalize } from 'rxjs'; import { InstructorRequestFormModel } from './instructor-request-form-model'; - -// Use regex to validate URL field as Angular does not have a built-in URL validator -// eslint-disable-next-line -const URL_REGEX = /(https?:\/\/)?(www\.)[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)|(https?:\/\/)?(www\.)?(?!ww)[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/; +import { AccountService } from '../../../../services/account.service'; +import { AccountCreateRequest } from '../../../../types/api-request'; +import { FormValidator } from '../../../../types/form-validator'; +import { ErrorMessageOutput } from '../../../error-message-output'; @Component({ selector: 'tm-instructor-request-form', @@ -13,12 +14,35 @@ const URL_REGEX = /(https?:\/\/)?(www\.)[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4 }) export class InstructorRequestFormComponent { + constructor(private accountService: AccountService) {} + + // Create members to be accessed in template + readonly STUDENT_NAME_MAX_LENGTH = FormValidator.STUDENT_NAME_MAX_LENGTH; + readonly INSTITUTION_NAME_MAX_LENGTH = FormValidator.INSTITUTION_NAME_MAX_LENGTH; + readonly COUNTRY_NAME_MAX_LENGTH = FormValidator.COUNTRY_NAME_MAX_LENGTH; + readonly EMAIL_MAX_LENGTH = FormValidator.EMAIL_MAX_LENGTH; + arf = new FormGroup({ - name: new FormControl('', [Validators.required]), - institution: new FormControl('', [Validators.required]), - country: new FormControl('', [Validators.required]), - email: new FormControl('', [Validators.required, Validators.email]), - homePage: new FormControl('', [Validators.pattern(URL_REGEX)]), + name: new FormControl('', [ + Validators.required, + Validators.maxLength(FormValidator.STUDENT_NAME_MAX_LENGTH), + Validators.pattern(FormValidator.NAME_REGEX), + ]), + institution: new FormControl('', [ + Validators.required, + Validators.maxLength(FormValidator.INSTITUTION_NAME_MAX_LENGTH), + Validators.pattern(FormValidator.NAME_REGEX), + ]), + country: new FormControl('', [ + Validators.required, + Validators.maxLength(FormValidator.COUNTRY_NAME_MAX_LENGTH), + Validators.pattern(FormValidator.NAME_REGEX), + ]), + email: new FormControl('', [ + Validators.required, + Validators.pattern(FormValidator.EMAIL_REGEX), + Validators.maxLength(FormValidator.EMAIL_MAX_LENGTH), + ]), comments: new FormControl(''), }, { updateOn: 'submit' }); @@ -27,23 +51,20 @@ export class InstructorRequestFormComponent { institution = this.arf.controls.institution; country = this.arf.controls.country; email = this.arf.controls.email; - homePage = this.arf.controls.homePage; comments = this.arf.controls.comments; hasSubmitAttempt = false; - + isLoading = false; @Output() requestSubmissionEvent = new EventEmitter(); + serverErrorMessage = ''; + checkIsFieldRequired(field: FormControl): boolean { return field.hasValidator(Validators.required); } - checkIsFieldInvalid(field: FormControl): boolean { - return field.invalid; - } - - checkCanSubmit(): boolean { - return true; // TODO: API integration + get canSubmit(): boolean { + return !this.isLoading; } getFieldValidationClasses(field: FormControl): string { @@ -60,39 +81,50 @@ export class InstructorRequestFormComponent { onSubmit(): void { this.hasSubmitAttempt = true; + this.isLoading = true; + this.serverErrorMessage = ''; if (this.arf.invalid) { + this.isLoading = false; // Do not submit form return; } const name = this.name.value!.trim(); const email = this.email.value!.trim(); + const comments = this.comments.value!.trim(); + + // Combine country and institution const country = this.country.value!.trim(); const institution = this.institution.value!.trim(); const combinedInstitution = `${institution}, ${country}`; - const homePage = this.homePage.value!; - const comments = this.comments.value!.trim(); - const submittedData = { - name, - email, - institution: combinedInstitution, - homePage, - comments, + const requestData: AccountCreateRequest = { + instructorEmail: email, + instructorName: name, + instructorInstitution: combinedInstitution, }; - // TODO: connect to API - // eslint-disable-next-line - submittedData; // PLACEHOLDER - - // Pass form input to parent to display confirmation - this.requestSubmissionEvent.emit({ - name, - institution, - country, - email, - homePage, - comments, - }); + + if (comments) { + requestData.instructorComments = comments; + } + + this.accountService.createAccountRequest(requestData) + .pipe(finalize(() => { this.isLoading = false; })) + .subscribe({ + next: () => { + // Pass form input to parent to display confirmation + this.requestSubmissionEvent.emit({ + name, + institution, + country, + email, + comments, + }); + }, + error: (resp: ErrorMessageOutput) => { + this.serverErrorMessage = resp.error.message; + }, + }); } } diff --git a/src/web/app/pages-static/request-page/request-page.component.html b/src/web/app/pages-static/request-page/request-page.component.html index 315ecb5b534..877da7af395 100644 --- a/src/web/app/pages-static/request-page/request-page.component.html +++ b/src/web/app/pages-static/request-page/request-page.component.html @@ -41,13 +41,6 @@

    Email {{submittedFormData.email}} - - Home Page URL - - {{submittedFormData.homePage}} - - - Comments diff --git a/src/web/app/pages-static/request-page/request-page.component.spec.ts b/src/web/app/pages-static/request-page/request-page.component.spec.ts index 07b1c5d5dd2..9f4c3042247 100644 --- a/src/web/app/pages-static/request-page/request-page.component.spec.ts +++ b/src/web/app/pages-static/request-page/request-page.component.spec.ts @@ -42,7 +42,6 @@ describe('RequestPageComponent', () => { institution: 'University of Example', country: 'Example Republic', email: 'js@exampleu.edu', - homePage: 'u.exampleu.edu/jsmith', comments: '', }; fixture.detectChanges(); diff --git a/src/web/app/pages-static/request-page/request-page.module.ts b/src/web/app/pages-static/request-page/request-page.module.ts index 7333207fc0b..12a9d337875 100644 --- a/src/web/app/pages-static/request-page/request-page.module.ts +++ b/src/web/app/pages-static/request-page/request-page.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; +import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; import { InstructorRequestFormComponent } from './instructor-request-form/instructor-request-form.component'; import { RequestPageComponent } from './request-page.component'; import { TeammatesRouterModule } from '../../components/teammates-router/teammates-router.module'; @@ -29,6 +30,7 @@ const routes: Routes = [ RouterModule.forChild(routes), TeammatesRouterModule, ReactiveFormsModule, + NgbAlertModule, ], }) export class RequestPageModule { } diff --git a/src/web/types/const.spec.ts b/src/web/types/const.spec.ts index f5f403835ec..6bc4e7112ec 100644 --- a/src/web/types/const.spec.ts +++ b/src/web/types/const.spec.ts @@ -1,4 +1,4 @@ -import { ApiConst } from './api-const'; +import { ApiConst, ApiStringConst } from './api-const'; import { FeedbackQuestionType } from './api-output'; import { DEFAULT_INSTRUCTOR_PRIVILEGE, @@ -68,6 +68,12 @@ describe('Constants', () => { expect(typeof ApiConst.NO_VALUE).toEqual('number'); }); + // Here we test that the constants are strings + it('should generate string constants correctly', () => { + expect(typeof ApiStringConst.EMAIL_REGEX).toEqual('string'); + expect(() => new RegExp(ApiStringConst.EMAIL_REGEX)).not.toThrow(); + }); + // Here we test that: // 1. The string is parseable to JSON // 2. The question type is correct diff --git a/src/web/types/form-validator.ts b/src/web/types/form-validator.ts index c2f44cf5beb..ea18815ca5d 100644 --- a/src/web/types/form-validator.ts +++ b/src/web/types/form-validator.ts @@ -1,4 +1,4 @@ -import { ApiConst } from './api-const'; +import { ApiConst, ApiStringConst } from './api-const'; /** * Represents the root FormValidator object of all form fields. @@ -33,4 +33,35 @@ export enum FormValidator { * Max length for the 'E-mail Address` field. */ EMAIL_MAX_LENGTH = ApiConst.EMAIL_MAX_LENGTH, + + /** + * Regex used to verify emails in the back-end. + */ + EMAIL_REGEX = ApiStringConst.EMAIL_REGEX, + + /** + * Regex used to verify names. + * + * Based on back-end's `FieldValidator.REGEX_NAME`. + * The back-end regex is not converted to use here as the pattern syntax is not accepted in JS. + */ + NAME_REGEX = '^[a-zA-Z0-9][^|%]*$', + + /** + * Regex used to verify country names. + * + * Based on back-end's `FieldValidator.REGEX_NAME`, but without needing to start with alphanumeric + * as the country is added to the end of the combined institute string. + */ + COUNTRY_REGEX = '^[^|%]*$', + + /** + * Max length for institution name in account request. (to be combined with country) + */ + INSTITUTION_NAME_MAX_LENGTH = 86, + + /** + * Max length for country in account request. (to be combined with institution name) + */ + COUNTRY_NAME_MAX_LENGTH = 40, } From a98630d6fe89136c4953bba2fd7b887e2e57b011 Mon Sep 17 00:00:00 2001 From: DS Date: Fri, 5 Apr 2024 20:25:45 +0800 Subject: [PATCH 27/95] [#11843] Update GetFeedbackSessionLogsAction to use SQL db (#12938) * Create FeedbackSessionLog entity * fix lint * Create UpdateFeedbackSessionLogsAction * Sort query results from logging service * Update type of feedbackSessionLogType * Fix naming * Fix enum in entity * Update filter to differentiate by session * Add Uri Info * Add tests * Update test case * Update to getOrderedFeedbackSessionLogs * Create skeleton * Implement logic and db layer * fix lint * Update entity * Fix tests * Update action to use fslDb * Fix tests * Update DbIT to use databundle * Fix bugs and optimize action * Prevent courseId from being null * Update GCP logs to store ids * Fix tests * Update action to use reference * Add some error handling * Fix tests * Add ids to api output * Fix lint * Update cron.yaml * Tidy up code * Update comments --- .../core/FeedbackSessionLogsLogicIT.java | 131 +++++++ .../sqlapi/FeedbackSessionLogsDbIT.java | 104 ++---- .../GetFeedbackSessionLogsActionIT.java | 77 ++-- src/it/resources/data/typicalDataBundle.json | 79 +++++ src/main/appengine/cron.yaml | 4 + .../common/datatransfer/SqlDataBundle.java | 2 + .../sqllogic/core/DataBundleLogic.java | 24 +- .../teammates/sqllogic/core/LogicStarter.java | 2 +- .../storage/sqlentity/FeedbackSessionLog.java | 4 + .../ui/output/FeedbackSessionLogData.java | 31 +- .../output/FeedbackSessionLogEntryData.java | 7 +- .../ui/output/FeedbackSessionLogsData.java | 8 +- .../webapi/GetFeedbackSessionLogsAction.java | 106 +++--- .../GetFeedbackSessionLogsActionTest.java | 330 ++++++++++++++++++ 14 files changed, 740 insertions(+), 169 deletions(-) create mode 100644 src/it/java/teammates/it/sqllogic/core/FeedbackSessionLogsLogicIT.java create mode 100644 src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java diff --git a/src/it/java/teammates/it/sqllogic/core/FeedbackSessionLogsLogicIT.java b/src/it/java/teammates/it/sqllogic/core/FeedbackSessionLogsLogicIT.java new file mode 100644 index 00000000000..1007cd50328 --- /dev/null +++ b/src/it/java/teammates/it/sqllogic/core/FeedbackSessionLogsLogicIT.java @@ -0,0 +1,131 @@ +package teammates.it.sqllogic.core; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.SqlDataBundle; +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.HibernateUtil; +import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess; +import teammates.sqllogic.core.FeedbackSessionLogsLogic; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link FeedbackSessionLogsLogic}. + */ +public class FeedbackSessionLogsLogicIT extends BaseTestCaseWithSqlDatabaseAccess { + + private FeedbackSessionLogsLogic fslLogic = FeedbackSessionLogsLogic.inst(); + + private SqlDataBundle typicalDataBundle; + + @Override + @BeforeClass + public void setupClass() { + super.setupClass(); + typicalDataBundle = getTypicalSqlDataBundle(); + } + + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalDataBundle); + HibernateUtil.flushSession(); + HibernateUtil.clearSession(); + } + + @Test + public void test_createFeedbackSessionLog_success() { + Course course = typicalDataBundle.courses.get("course1"); + FeedbackSession fs = typicalDataBundle.feedbackSessions.get("session1InCourse1"); + Student student = typicalDataBundle.students.get("student1InCourse1"); + Instant timestamp = Instant.now(); + FeedbackSessionLog newLog1 = new FeedbackSessionLog(student, fs, FeedbackSessionLogType.ACCESS, timestamp); + FeedbackSessionLog newLog2 = new FeedbackSessionLog(student, fs, FeedbackSessionLogType.SUBMISSION, timestamp); + FeedbackSessionLog newLog3 = new FeedbackSessionLog(student, fs, FeedbackSessionLogType.VIEW_RESULT, timestamp); + List expected = List.of(newLog1, newLog2, newLog3); + + fslLogic.createFeedbackSessionLogs(expected); + + List actual = fslLogic.getOrderedFeedbackSessionLogs(course.getId(), student.getId(), + fs.getId(), timestamp, timestamp.plusSeconds(1)); + + assertEquals(expected, actual); + } + + @Test + public void test_getOrderedFeedbackSessionLogs_success() { + Instant startTime = Instant.parse("2012-01-01T12:00:00Z"); + Instant endTime = Instant.parse("2012-01-01T23:59:59Z"); + Course course = typicalDataBundle.courses.get("course1"); + Student student1 = typicalDataBundle.students.get("student1InCourse1"); + FeedbackSession fs1 = typicalDataBundle.feedbackSessions.get("session1InCourse1"); + + FeedbackSessionLog student1Session1Log1 = typicalDataBundle.feedbackSessionLogs.get("student1Session1Log1"); + FeedbackSessionLog student1Session2Log1 = typicalDataBundle.feedbackSessionLogs.get("student1Session2Log1"); + FeedbackSessionLog student1Session2Log2 = typicalDataBundle.feedbackSessionLogs.get("student1Session2Log2"); + FeedbackSessionLog student2Session1Log1 = typicalDataBundle.feedbackSessionLogs.get("student2Session1Log1"); + FeedbackSessionLog student2Session1Log2 = typicalDataBundle.feedbackSessionLogs.get("student2Session1Log2"); + + ______TS("Return logs belonging to a course in time range"); + List expectedLogs = List.of( + student1Session1Log1, + student1Session2Log1, + student1Session2Log2, + student2Session1Log1, + student2Session1Log2); + + List actualLogs = fslLogic.getOrderedFeedbackSessionLogs(course.getId(), null, null, + startTime, endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("Return logs belonging to a student in a course in time range"); + expectedLogs = List.of( + student1Session1Log1, + student1Session2Log1, + student1Session2Log2); + + actualLogs = fslLogic.getOrderedFeedbackSessionLogs(course.getId(), student1.getId(), null, startTime, + endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("Return logs belonging to a feedback session in time range"); + expectedLogs = List.of( + student1Session1Log1, + student2Session1Log1, + student2Session1Log2); + + actualLogs = fslLogic.getOrderedFeedbackSessionLogs(course.getId(), null, fs1.getId(), startTime, endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("Return logs belonging to a student in a feedback session in time range"); + expectedLogs = List.of(student1Session1Log1); + + actualLogs = fslLogic.getOrderedFeedbackSessionLogs(course.getId(), student1.getId(), fs1.getId(), + startTime, + endTime); + + assertEquals(expectedLogs, actualLogs); + + ______TS("No logs in time range, return empty list"); + expectedLogs = new ArrayList<>(); + + actualLogs = fslLogic.getOrderedFeedbackSessionLogs(course.getId(), null, null, endTime.plusSeconds(3600), + endTime.plusSeconds(7200)); + + assertEquals(expectedLogs, actualLogs); + } + +} diff --git a/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java index 14d922e611f..30b5276893b 100644 --- a/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/FeedbackSessionLogsDbIT.java @@ -63,98 +63,56 @@ public void test_createFeedbackSessionLog_success() { @Test public void test_getOrderedFeedbackSessionLogs_success() { - Instant startTime = Instant.parse("2011-01-01T00:00:00Z"); - Instant endTime = Instant.parse("2011-01-01T01:00:00Z"); - - Course course1 = typicalDataBundle.courses.get("course1"); - - FeedbackSession session1 = typicalDataBundle.feedbackSessions.get("session1InCourse1"); - FeedbackSession session2 = typicalDataBundle.feedbackSessions.get("session2InTypicalCourse"); - FeedbackSession sessionInAnotherCourse = typicalDataBundle.feedbackSessions.get("ongoingSession1InCourse3"); - + Instant startTime = Instant.parse("2012-01-01T12:00:00Z"); + Instant endTime = Instant.parse("2012-01-01T23:59:59Z"); + Course course = typicalDataBundle.courses.get("course1"); Student student1 = typicalDataBundle.students.get("student1InCourse1"); - Student student2 = typicalDataBundle.students.get("student2InCourse1"); - - FeedbackSessionLog student1Session1Log1 = new FeedbackSessionLog(student1, session1, - FeedbackSessionLogType.ACCESS, startTime); - FeedbackSessionLog student1Session1Log2 = new FeedbackSessionLog(student1, session1, - FeedbackSessionLogType.SUBMISSION, startTime.plusSeconds(1)); - FeedbackSessionLog student1Session1Log3 = new FeedbackSessionLog(student1, session1, - FeedbackSessionLogType.VIEW_RESULT, startTime.plusSeconds(2)); - FeedbackSessionLog student1Session2Log1 = new FeedbackSessionLog(student1, session2, - FeedbackSessionLogType.ACCESS, startTime.plusSeconds(3)); - - FeedbackSessionLog student2Session1Log1 = new FeedbackSessionLog(student2, session1, - FeedbackSessionLogType.ACCESS, startTime.plusSeconds(4)); - FeedbackSessionLog student2Session2Log1 = new FeedbackSessionLog(student2, session2, - FeedbackSessionLogType.ACCESS, startTime.plusSeconds(5)); - - FeedbackSessionLog student1AnotherCourseLog1 = new FeedbackSessionLog(student1, sessionInAnotherCourse, - FeedbackSessionLogType.ACCESS, startTime.plusSeconds(6)); - - FeedbackSessionLog outOfRangeLog1 = new FeedbackSessionLog(student1, session1, FeedbackSessionLogType.ACCESS, - startTime.minusSeconds(1)); - FeedbackSessionLog outOfRangeLog2 = new FeedbackSessionLog(student1, session1, FeedbackSessionLogType.ACCESS, - endTime); - - List newLogs = new ArrayList<>(); - newLogs.add(student1Session1Log1); - newLogs.add(student1Session1Log2); - newLogs.add(student1Session1Log3); - newLogs.add(student1Session2Log1); - - newLogs.add(student2Session1Log1); - newLogs.add(student2Session2Log1); + FeedbackSession fs1 = typicalDataBundle.feedbackSessions.get("session1InCourse1"); - newLogs.add(student1AnotherCourseLog1); - - newLogs.add(outOfRangeLog1); - newLogs.add(outOfRangeLog2); - - for (FeedbackSessionLog log : newLogs) { - fslDb.createFeedbackSessionLog(log); - } + FeedbackSessionLog student1Session1Log1 = typicalDataBundle.feedbackSessionLogs.get("student1Session1Log1"); + FeedbackSessionLog student1Session2Log1 = typicalDataBundle.feedbackSessionLogs.get("student1Session2Log1"); + FeedbackSessionLog student1Session2Log2 = typicalDataBundle.feedbackSessionLogs.get("student1Session2Log2"); + FeedbackSessionLog student2Session1Log1 = typicalDataBundle.feedbackSessionLogs.get("student2Session1Log1"); + FeedbackSessionLog student2Session1Log2 = typicalDataBundle.feedbackSessionLogs.get("student2Session1Log2"); ______TS("Return logs belonging to a course in time range"); - List expectedLogs = new ArrayList<>(); - expectedLogs.add(student1Session1Log1); - expectedLogs.add(student1Session1Log2); - expectedLogs.add(student1Session1Log3); - expectedLogs.add(student1Session2Log1); - - expectedLogs.add(student2Session1Log1); - expectedLogs.add(student2Session2Log1); - - List actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), null, null, + List expectedLogs = List.of( + student1Session1Log1, + student1Session2Log1, + student1Session2Log2, + student2Session1Log1, + student2Session1Log2 + ); + + List actualLogs = fslDb.getOrderedFeedbackSessionLogs(course.getId(), null, null, startTime, endTime); assertEquals(expectedLogs, actualLogs); ______TS("Return logs belonging to a student in time range"); - expectedLogs = new ArrayList<>(); - expectedLogs.add(student1Session1Log1); - expectedLogs.add(student1Session1Log2); - expectedLogs.add(student1Session1Log3); - expectedLogs.add(student1Session2Log1); + expectedLogs = List.of( + student1Session1Log1, + student1Session2Log1, + student1Session2Log2); - actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), student1.getId(), null, startTime, endTime); + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course.getId(), student1.getId(), null, startTime, endTime); assertEquals(expectedLogs, actualLogs); ______TS("Return logs belonging to a feedback session in time range"); - expectedLogs = new ArrayList<>(); - expectedLogs.add(student1Session2Log1); - expectedLogs.add(student2Session2Log1); + expectedLogs = List.of( + student1Session1Log1, + student2Session1Log1, + student2Session1Log2); - actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), null, session2.getId(), startTime, endTime); + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course.getId(), null, fs1.getId(), startTime, endTime); assertEquals(expectedLogs, actualLogs); ______TS("Return logs belonging to a student in a feedback session in time range"); - expectedLogs = new ArrayList<>(); - expectedLogs.add(student2Session2Log1); + expectedLogs = List.of(student1Session1Log1); - actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), student2.getId(), session2.getId(), startTime, + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course.getId(), student1.getId(), fs1.getId(), startTime, endTime); assertEquals(expectedLogs, actualLogs); @@ -162,7 +120,7 @@ public void test_getOrderedFeedbackSessionLogs_success() { ______TS("No logs in time range, return empty list"); expectedLogs = new ArrayList<>(); - actualLogs = fslDb.getOrderedFeedbackSessionLogs(course1.getId(), null, null, endTime.plusSeconds(3600), + actualLogs = fslDb.getOrderedFeedbackSessionLogs(course.getId(), null, null, endTime.plusSeconds(3600), endTime.plusSeconds(7200)); assertEquals(expectedLogs, actualLogs); diff --git a/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java b/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java index 9aca4fed202..9413be9d691 100644 --- a/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java @@ -41,7 +41,7 @@ protected String getRequestMethod() { return GET; } - @Test + @Test(enabled = false) @Override protected void testExecute() { JsonResult actionOutput; @@ -49,27 +49,13 @@ protected void testExecute() { Course course = typicalBundle.courses.get("course1"); String courseId = course.getId(); FeedbackSession fsa1 = typicalBundle.feedbackSessions.get("session1InCourse1"); - FeedbackSession fsa2 = typicalBundle.feedbackSessions.get("session2InTypicalCourse"); String fsa1Name = fsa1.getName(); - String fsa2Name = fsa2.getName(); Student student1 = typicalBundle.students.get("student1InCourse1"); Student student2 = typicalBundle.students.get("student2InCourse1"); String student1Email = student1.getEmail(); String student2Email = student2.getEmail(); - long endTime = Instant.now().toEpochMilli(); + long endTime = Instant.parse("2012-01-02T12:00:00Z").toEpochMilli(); long startTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() - 1) * 24 * 60 * 60 * 1000; - long invalidStartTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() + 1) * 24 * 60 * 60 * 1000; - - mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa1Name, - FeedbackSessionLogType.ACCESS.getLabel(), startTime); - mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa2Name, - FeedbackSessionLogType.ACCESS.getLabel(), startTime + 1000); - mockLogsProcessor.insertFeedbackSessionLog(courseId, student1Email, fsa2Name, - FeedbackSessionLogType.SUBMISSION.getLabel(), startTime + 2000); - mockLogsProcessor.insertFeedbackSessionLog(courseId, student2Email, fsa1Name, - FeedbackSessionLogType.ACCESS.getLabel(), startTime + 3000); - mockLogsProcessor.insertFeedbackSessionLog(courseId, student2Email, fsa1Name, - FeedbackSessionLogType.SUBMISSION.getLabel(), startTime + 4000); ______TS("Failure case: not enough parameters"); verifyHttpParameterFailure( @@ -117,13 +103,6 @@ protected void testExecute() { }; verifyHttpParameterFailure(paramsInvalid4); - ______TS("Failure case: start time is before earliest search time"); - verifyHttpParameterFailure( - Const.ParamsNames.COURSE_ID, courseId, - Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(invalidStartTime), - Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime) - ); - ______TS("Success case: should group by feedback session"); String[] paramsSuccessful1 = { Const.ParamsNames.COURSE_ID, courseId, @@ -168,8 +147,56 @@ protected void testExecute() { Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; - getJsonResult(getAction(paramsSuccessful2)); - // No need to check output again here, it will be exactly the same as the previous case + actionOutput = getJsonResult(getAction(paramsSuccessful2)); + fslData = (FeedbackSessionLogsData) actionOutput.getOutput(); + fsLogs = fslData.getFeedbackSessionLogs(); + + assertEquals(fsLogs.size(), 6); + assertEquals(fsLogs.get(2).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(3).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(4).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(5).getFeedbackSessionLogEntries().size(), 0); + + fsLogEntries1 = fsLogs.get(0).getFeedbackSessionLogEntries(); + fsLogEntries2 = fsLogs.get(1).getFeedbackSessionLogEntries(); + + assertEquals(fsLogEntries1.size(), 1); + assertEquals(fsLogEntries1.get(0).getStudentData().getEmail(), student1Email); + assertEquals(fsLogEntries1.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + + assertEquals(fsLogEntries2.size(), 2); + assertEquals(fsLogEntries2.get(0).getStudentData().getEmail(), student1Email); + assertEquals(fsLogEntries2.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries2.get(1).getStudentData().getEmail(), student1Email); + assertEquals(fsLogEntries2.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); + + ______TS("Success case: should accept feedback session"); + String[] paramsSuccessful3 = { + Const.ParamsNames.COURSE_ID, courseId, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fsa1Name, + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + actionOutput = getJsonResult(getAction(paramsSuccessful3)); + fslData = (FeedbackSessionLogsData) actionOutput.getOutput(); + fsLogs = fslData.getFeedbackSessionLogs(); + + assertEquals(fsLogs.size(), 6); + assertEquals(fsLogs.get(1).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(2).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(3).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(4).getFeedbackSessionLogEntries().size(), 0); + assertEquals(fsLogs.get(5).getFeedbackSessionLogEntries().size(), 0); + + fsLogEntries1 = fsLogs.get(0).getFeedbackSessionLogEntries(); + + assertEquals(fsLogEntries1.size(), 3); + assertEquals(fsLogEntries1.get(0).getStudentData().getEmail(), student1Email); + assertEquals(fsLogEntries1.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries1.get(1).getStudentData().getEmail(), student2Email); + assertEquals(fsLogEntries1.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries1.get(2).getStudentData().getEmail(), student2Email); + assertEquals(fsLogEntries1.get(2).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); // TODO: if we restrict the range from start to end time, it should be tested here as well } diff --git a/src/it/resources/data/typicalDataBundle.json b/src/it/resources/data/typicalDataBundle.json index 2372b2fa35f..fcb1dc4ab16 100644 --- a/src/it/resources/data/typicalDataBundle.json +++ b/src/it/resources/data/typicalDataBundle.json @@ -1363,5 +1363,84 @@ "id": "00000000-0000-4000-8000-000000001101" } } + }, + "feedbackSessionLogs": { + "student1Session1Log1": { + "id": "00000000-0000-4000-8000-000000001301", + "student": { + "id" : "00000000-0000-4000-8000-000000000601" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000701" + }, + "feedbackSessionLogType": "ACCESS", + "timestamp": "2012-01-01T12:00:00Z" + }, + "student1Session2Log1": { + "id": "00000000-0000-4000-8000-000000001302", + "student": { + "id" : "00000000-0000-4000-8000-000000000601" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000702" + }, + "feedbackSessionLogType": "ACCESS", + "timestamp": "2012-01-01T12:00:01Z" + }, + "student1Session2Log2": { + "id": "00000000-0000-4000-8000-000000001303", + "student": { + "id" : "00000000-0000-4000-8000-000000000601" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000702" + }, + "feedbackSessionLogType": "SUBMISSION", + "timestamp": "2012-01-01T12:00:02Z" + }, + "student2Session1Log1": { + "id": "00000000-0000-4000-8000-000000001304", + "student": { + "id" : "00000000-0000-4000-8000-000000000602" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000701" + }, + "feedbackSessionLogType": "ACCESS", + "timestamp": "2012-01-01T12:00:03Z" + }, + "student2Session1Log2": { + "id": "00000000-0000-4000-8000-000000001305", + "student": { + "id" : "00000000-0000-4000-8000-000000000602" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000701" + }, + "feedbackSessionLogType": "SUBMISSION", + "timestamp": "2012-01-01T12:00:04Z" + }, + "student1InAnotherCourse": { + "id": "00000000-0000-4000-8000-000000001306", + "student": { + "id" : "00000000-0000-4000-8000-000000000601" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000707" + }, + "feedbackSessionLogType": "ACCESS", + "timestamp": "2012-01-01T12:00:05Z" + }, + "outOfRangeLog": { + "id": "00000000-0000-4000-8000-000000001307", + "student": { + "id" : "00000000-0000-4000-8000-000000000602" + }, + "feedbackSession": { + "id" : "00000000-0000-4000-8000-000000000701" + }, + "feedbackSessionLogType": "ACCESS", + "timestamp": "2010-01-01T00:00:00Z" + } } } diff --git a/src/main/appengine/cron.yaml b/src/main/appengine/cron.yaml index 07a94809826..996ff3d8401 100644 --- a/src/main/appengine/cron.yaml +++ b/src/main/appengine/cron.yaml @@ -33,3 +33,7 @@ cron: schedule: 'every 5 minutes synchronized' timezone: 'Asia/Singapore' description: 'Compile severe logs and sends out email notifications.' +- url: '/auto/updateFeedbackSessionLogs' + schedule: 'every 60 minutes from 00:15 to 23:59' + timezone: 'Asia/Singapore' + description: 'Process feedback session activity logs from logging service and store in the database.' diff --git a/src/main/java/teammates/common/datatransfer/SqlDataBundle.java b/src/main/java/teammates/common/datatransfer/SqlDataBundle.java index d3a027b2775..b411b4ea094 100644 --- a/src/main/java/teammates/common/datatransfer/SqlDataBundle.java +++ b/src/main/java/teammates/common/datatransfer/SqlDataBundle.java @@ -11,6 +11,7 @@ import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.FeedbackResponseComment; import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Notification; import teammates.storage.sqlentity.ReadNotification; @@ -37,6 +38,7 @@ public class SqlDataBundle { public Map feedbackQuestions = new LinkedHashMap<>(); public Map feedbackResponses = new LinkedHashMap<>(); public Map feedbackResponseComments = new LinkedHashMap<>(); + public Map feedbackSessionLogs = new LinkedHashMap<>(); public Map notifications = new LinkedHashMap<>(); public Map readNotifications = new LinkedHashMap<>(); } diff --git a/src/main/java/teammates/sqllogic/core/DataBundleLogic.java b/src/main/java/teammates/sqllogic/core/DataBundleLogic.java index 6b7376a7e9b..2dcfb9ac899 100644 --- a/src/main/java/teammates/sqllogic/core/DataBundleLogic.java +++ b/src/main/java/teammates/sqllogic/core/DataBundleLogic.java @@ -1,5 +1,6 @@ package teammates.sqllogic.core; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -19,6 +20,7 @@ import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.FeedbackResponseComment; import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Notification; import teammates.storage.sqlentity.ReadNotification; @@ -41,6 +43,7 @@ public final class DataBundleLogic { private CoursesLogic coursesLogic; private DeadlineExtensionsLogic deadlineExtensionsLogic; private FeedbackSessionsLogic fsLogic; + private FeedbackSessionLogsLogic fslLogic; private FeedbackQuestionsLogic fqLogic; private FeedbackResponsesLogic frLogic; private FeedbackResponseCommentsLogic frcLogic; @@ -56,16 +59,15 @@ public static DataBundleLogic inst() { } void initLogicDependencies(AccountsLogic accountsLogic, AccountRequestsLogic accountRequestsLogic, - CoursesLogic coursesLogic, - DeadlineExtensionsLogic deadlineExtensionsLogic, FeedbackSessionsLogic fsLogic, - FeedbackQuestionsLogic fqLogic, FeedbackResponsesLogic frLogic, - FeedbackResponseCommentsLogic frcLogic, - NotificationsLogic notificationsLogic, UsersLogic usersLogic) { + CoursesLogic coursesLogic, DeadlineExtensionsLogic deadlineExtensionsLogic, FeedbackSessionsLogic fsLogic, + FeedbackSessionLogsLogic fslLogic, FeedbackQuestionsLogic fqLogic, FeedbackResponsesLogic frLogic, + FeedbackResponseCommentsLogic frcLogic, NotificationsLogic notificationsLogic, UsersLogic usersLogic) { this.accountsLogic = accountsLogic; this.accountRequestsLogic = accountRequestsLogic; this.coursesLogic = coursesLogic; this.deadlineExtensionsLogic = deadlineExtensionsLogic; this.fsLogic = fsLogic; + this.fslLogic = fslLogic; this.fqLogic = fqLogic; this.frLogic = frLogic; this.frcLogic = frcLogic; @@ -97,6 +99,7 @@ public static SqlDataBundle deserializeDataBundle(String jsonString) { Collection instructors = dataBundle.instructors.values(); Collection students = dataBundle.students.values(); Collection sessions = dataBundle.feedbackSessions.values(); + Collection sessionLogs = dataBundle.feedbackSessionLogs.values(); Collection questions = dataBundle.feedbackQuestions.values(); Collection responses = dataBundle.feedbackResponses.values(); Collection responseComments = dataBundle.feedbackResponseComments.values(); @@ -215,6 +218,14 @@ public static SqlDataBundle deserializeDataBundle(String jsonString) { student.generateNewRegistrationKey(); } + for (FeedbackSessionLog log : sessionLogs) { + log.setId(UUID.randomUUID()); + FeedbackSession fs = sessionsMap.get(log.getFeedbackSession().getId()); + log.setFeedbackSession(fs); + Student student = (Student) usersMap.get(log.getStudent().getId()); + log.setStudent(student); + } + for (Notification notification : notifications) { UUID placeholderId = notification.getId(); notification.setId(UUID.randomUUID()); @@ -262,6 +273,7 @@ public SqlDataBundle persistDataBundle(SqlDataBundle dataBundle) Collection instructors = dataBundle.instructors.values(); Collection students = dataBundle.students.values(); Collection sessions = dataBundle.feedbackSessions.values(); + Collection sessionLogs = dataBundle.feedbackSessionLogs.values(); Collection questions = dataBundle.feedbackQuestions.values(); Collection responses = dataBundle.feedbackResponses.values(); Collection responseComments = dataBundle.feedbackResponseComments.values(); @@ -318,6 +330,8 @@ public SqlDataBundle persistDataBundle(SqlDataBundle dataBundle) usersLogic.createStudent(student); } + fslLogic.createFeedbackSessionLogs(new ArrayList<>(sessionLogs)); + for (ReadNotification readNotification : readNotifications) { accountsLogic.updateReadNotifications(readNotification.getAccount().getGoogleId(), readNotification.getNotification().getId(), readNotification.getNotification().getEndTime()); diff --git a/src/main/java/teammates/sqllogic/core/LogicStarter.java b/src/main/java/teammates/sqllogic/core/LogicStarter.java index 4ae35a61a52..ba67aff710a 100644 --- a/src/main/java/teammates/sqllogic/core/LogicStarter.java +++ b/src/main/java/teammates/sqllogic/core/LogicStarter.java @@ -46,7 +46,7 @@ public static void initializeDependencies() { accountsLogic.initLogicDependencies(AccountsDb.inst(), notificationsLogic, usersLogic, coursesLogic); coursesLogic.initLogicDependencies(CoursesDb.inst(), fsLogic, usersLogic); dataBundleLogic.initLogicDependencies(accountsLogic, accountRequestsLogic, coursesLogic, - deadlineExtensionsLogic, fsLogic, fqLogic, frLogic, frcLogic, + deadlineExtensionsLogic, fsLogic, fslLogic, fqLogic, frLogic, frcLogic, notificationsLogic, usersLogic); deadlineExtensionsLogic.initLogicDependencies(DeadlineExtensionsDb.inst(), fsLogic); fsLogic.initLogicDependencies(FeedbackSessionsDb.inst(), coursesLogic, frLogic, fqLogic, usersLogic); diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java index 9c6a7ed2825..15daeb607b5 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java @@ -8,6 +8,8 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; import teammates.common.datatransfer.logs.FeedbackSessionLogType; @@ -32,11 +34,13 @@ public class FeedbackSessionLog extends BaseEntity { @ManyToOne @JoinColumn(name = "studentId") @NotFound(action = NotFoundAction.IGNORE) + @OnDelete(action = OnDeleteAction.CASCADE) private Student student; @ManyToOne @JoinColumn(name = "sessionId") @NotFound(action = NotFoundAction.IGNORE) + @OnDelete(action = OnDeleteAction.CASCADE) private FeedbackSession feedbackSession; @Column(nullable = false) diff --git a/src/main/java/teammates/ui/output/FeedbackSessionLogData.java b/src/main/java/teammates/ui/output/FeedbackSessionLogData.java index 0825b0b5894..7afc398f0bf 100644 --- a/src/main/java/teammates/ui/output/FeedbackSessionLogData.java +++ b/src/main/java/teammates/ui/output/FeedbackSessionLogData.java @@ -8,6 +8,7 @@ import teammates.common.datatransfer.attributes.FeedbackSessionAttributes; import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Student; /** @@ -17,19 +18,24 @@ public class FeedbackSessionLogData { private final FeedbackSessionData feedbackSessionData; private final List feedbackSessionLogEntries; - // Remove generic types after migration is done (i.e. can just use FeedbackSession and Student) - public FeedbackSessionLogData(S feedbackSession, List logEntries, + // Remove generic types after migration is done (i.e. can just use FeedbackSession, Student, FeedbackSessionLog) + public FeedbackSessionLogData(S feedbackSession, List logEntries, Map studentsMap) { if (feedbackSession instanceof FeedbackSessionAttributes) { FeedbackSessionAttributes fs = (FeedbackSessionAttributes) feedbackSession; FeedbackSessionData fsData = new FeedbackSessionData(fs); List fsLogEntryDatas = logEntries.stream() .map(log -> { - T student = studentsMap.get(log.getStudentEmail()); - if (student instanceof StudentAttributes) { - return new FeedbackSessionLogEntryData(log, (StudentAttributes) student); + if (log instanceof FeedbackSessionLogEntry) { + FeedbackSessionLogEntry convertedLog = (FeedbackSessionLogEntry) log; + T student = studentsMap.get(convertedLog.getStudentEmail()); + if (student instanceof StudentAttributes) { + return new FeedbackSessionLogEntryData(convertedLog, (StudentAttributes) student); + } else { + throw new IllegalArgumentException("Invalid student type"); + } } else { - throw new IllegalArgumentException("Invalid student type"); + throw new IllegalArgumentException("Invalid log type"); } }) .collect(Collectors.toList()); @@ -40,11 +46,16 @@ public FeedbackSessionLogData(S feedbackSession, List fsLogEntryDatas = logEntries.stream() .map(log -> { - T student = studentsMap.get(log.getStudentEmail()); - if (student instanceof Student) { - return new FeedbackSessionLogEntryData(log, (Student) student); + if (log instanceof FeedbackSessionLog) { + FeedbackSessionLog convertedLog = (FeedbackSessionLog) log; + T student = studentsMap.get(convertedLog.getStudent().getEmail()); + if (student instanceof Student) { + return new FeedbackSessionLogEntryData(convertedLog, (Student) student); + } else { + throw new IllegalArgumentException("Invalid student type"); + } } else { - throw new IllegalArgumentException("Invalid student type"); + throw new IllegalArgumentException("Invalid log type"); } }) .collect(Collectors.toList()); diff --git a/src/main/java/teammates/ui/output/FeedbackSessionLogEntryData.java b/src/main/java/teammates/ui/output/FeedbackSessionLogEntryData.java index a70eaa7b505..99669d10e33 100644 --- a/src/main/java/teammates/ui/output/FeedbackSessionLogEntryData.java +++ b/src/main/java/teammates/ui/output/FeedbackSessionLogEntryData.java @@ -3,6 +3,7 @@ import teammates.common.datatransfer.FeedbackSessionLogEntry; import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Student; /** @@ -22,10 +23,10 @@ public FeedbackSessionLogEntryData(FeedbackSessionLogEntry logEntry, StudentAttr this.timestamp = timestamp; } - public FeedbackSessionLogEntryData(FeedbackSessionLogEntry logEntry, Student student) { + public FeedbackSessionLogEntryData(FeedbackSessionLog logEntry, Student student) { StudentData studentData = new StudentData(student); - FeedbackSessionLogType logType = FeedbackSessionLogType.valueOfLabel(logEntry.getFeedbackSessionLogType()); - long timestamp = logEntry.getTimestamp(); + FeedbackSessionLogType logType = logEntry.getFeedbackSessionLogType(); + long timestamp = logEntry.getTimestamp().toEpochMilli(); this.studentData = studentData; this.feedbackSessionLogType = logType; this.timestamp = timestamp; diff --git a/src/main/java/teammates/ui/output/FeedbackSessionLogsData.java b/src/main/java/teammates/ui/output/FeedbackSessionLogsData.java index 3926e252817..b6f722dc770 100644 --- a/src/main/java/teammates/ui/output/FeedbackSessionLogsData.java +++ b/src/main/java/teammates/ui/output/FeedbackSessionLogsData.java @@ -4,8 +4,6 @@ import java.util.Map; import java.util.stream.Collectors; -import teammates.common.datatransfer.FeedbackSessionLogEntry; - /** * The API output format for logs on all feedback sessions in a course. */ @@ -13,13 +11,13 @@ public class FeedbackSessionLogsData extends ApiOutput { private final List feedbackSessionLogs; - // Remove generic types after migration is done (i.e. can just use FeedbackSession and Student) - public FeedbackSessionLogsData(Map> groupedEntries, + // Remove generic types after migration is done (i.e. can just use FeedbackSession and Student, FeedbackSessionLog) + public FeedbackSessionLogsData(Map> groupedEntries, Map studentsMap, Map sessionsMap) { this.feedbackSessionLogs = groupedEntries.entrySet().stream() .map(entry -> { T feedbackSession = sessionsMap.get(entry.getKey()); - List logEntries = entry.getValue(); + List logEntries = entry.getValue(); return new FeedbackSessionLogData(feedbackSession, logEntries, studentsMap); }) .collect(Collectors.toList()); diff --git a/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java b/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java index bddaeb6c780..8a3a5514514 100644 --- a/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java +++ b/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java @@ -1,5 +1,6 @@ package teammates.ui.webapi; +import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -17,6 +18,7 @@ import teammates.common.util.TimeHelper; import teammates.storage.sqlentity.Course; import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Student; import teammates.ui.output.FeedbackSessionLogsData; @@ -65,36 +67,6 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { @Override public JsonResult execute() { - String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); - String email = getRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); - String feedbackSessionName = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); - - if (isCourseMigrated(courseId)) { - if (sqlLogic.getCourse(courseId) == null) { - throw new EntityNotFoundException("Course not found"); - } - - if (email != null && sqlLogic.getStudentForEmail(courseId, email) == null) { - throw new EntityNotFoundException("Student not found"); - } - - if (feedbackSessionName != null && sqlLogic.getFeedbackSession(feedbackSessionName, courseId) == null) { - throw new EntityNotFoundException("Feedback session not found"); - } - } else { - if (logic.getCourse(courseId) == null) { - throw new EntityNotFoundException("Course not found"); - } - - if (email != null && logic.getStudentForEmail(courseId, email) == null) { - throw new EntityNotFoundException("Student not found"); - } - - if (feedbackSessionName != null && logic.getFeedbackSession(feedbackSessionName, courseId) == null) { - throw new EntityNotFoundException("Feedback session not found"); - } - } - String fslTypes = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE); List convertedFslTypes = new ArrayList<>(); if (fslTypes != null) { @@ -126,51 +98,81 @@ public JsonResult execute() { throw new InvalidHttpParameterException("The end time should be after the start time."); } - long earliestSearchTime = TimeHelper.getInstantDaysOffsetBeforeNow(Const.LOGS_RETENTION_PERIOD.toDays()) - .toEpochMilli(); - if (startTime < earliestSearchTime) { - throw new InvalidHttpParameterException( - "The earliest date you can search for is " + Const.LOGS_RETENTION_PERIOD.toDays() + " days before today." - ); + String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); + + if (!isCourseMigrated(courseId)) { + long earliestSearchTime = TimeHelper.getInstantDaysOffsetBeforeNow(Const.LOGS_RETENTION_PERIOD.toDays()) + .toEpochMilli(); + if (startTime < earliestSearchTime) { + throw new InvalidHttpParameterException("The earliest date you can search for is " + + Const.LOGS_RETENTION_PERIOD.toDays() + " days before today."); + } } - List fsLogEntries = - logsProcessor.getOrderedFeedbackSessionLogs(courseId, email, startTime, endTime, feedbackSessionName); + String email = getRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); + String feedbackSessionName = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); if (isCourseMigrated(courseId)) { + // TODO: replace null ids with value from request after FE changes and enable test + if (sqlLogic.getCourse(courseId) == null) { + throw new EntityNotFoundException("Course not found"); + } + + if (email != null && sqlLogic.getStudentForEmail(courseId, email) == null) { + throw new EntityNotFoundException("Student not found"); + } + + if (feedbackSessionName != null && sqlLogic.getFeedbackSession(feedbackSessionName, courseId) == null) { + throw new EntityNotFoundException("Feedback session not found"); + } + + List fsLogEntries = sqlLogic.getOrderedFeedbackSessionLogs(courseId, null, + null, Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime)); Map studentsMap = new HashMap<>(); Map sessionsMap = new HashMap<>(); List feedbackSessions = sqlLogic.getFeedbackSessionsForCourse(courseId); feedbackSessions.forEach(fs -> sessionsMap.put(fs.getName(), fs)); fsLogEntries = fsLogEntries.stream().filter(logEntry -> { - String logType = logEntry.getFeedbackSessionLogType(); - FeedbackSessionLogType convertedLogType = FeedbackSessionLogType.valueOfLabel(logType); - if (convertedLogType == null || fslTypes != null && !convertedFslTypes.contains(convertedLogType)) { + FeedbackSessionLogType logType = logEntry.getFeedbackSessionLogType(); + if (logType == null || fslTypes != null && !convertedFslTypes.contains(logType)) { // If the feedback session log type retrieved from the log is invalid // or not the type being queried, ignore the log return false; } - if (!studentsMap.containsKey(logEntry.getStudentEmail())) { - Student student = sqlLogic.getStudentForEmail(courseId, logEntry.getStudentEmail()); + if (!studentsMap.containsKey(logEntry.getStudent().getEmail())) { + Student student = sqlLogic.getStudentForEmail(courseId, logEntry.getStudent().getEmail()); if (student == null) { // If the student email retrieved from the log is invalid, ignore the log return false; } - studentsMap.put(logEntry.getStudentEmail(), student); + studentsMap.put(student.getEmail(), student); } // If the feedback session retrieved from the log is invalid, ignore the log - return sessionsMap.containsKey(logEntry.getFeedbackSessionName()); + return sessionsMap.containsKey(logEntry.getFeedbackSession().getName()); }).collect(Collectors.toList()); - Map> groupedEntries = - groupFeedbackSessionLogEntries(fsLogEntries); + Map> groupedEntries = groupFeedbackSessionLogs(fsLogEntries); feedbackSessions.forEach(fs -> groupedEntries.putIfAbsent(fs.getName(), new ArrayList<>())); FeedbackSessionLogsData fslData = new FeedbackSessionLogsData(groupedEntries, studentsMap, sessionsMap); return new JsonResult(fslData); } else { + if (logic.getCourse(courseId) == null) { + throw new EntityNotFoundException("Course not found"); + } + + if (email != null && logic.getStudentForEmail(courseId, email) == null) { + throw new EntityNotFoundException("Student not found"); + } + + if (feedbackSessionName != null && logic.getFeedbackSession(feedbackSessionName, courseId) == null) { + throw new EntityNotFoundException("Feedback session not found"); + } + + List fsLogEntries = + logsProcessor.getOrderedFeedbackSessionLogs(courseId, email, startTime, endTime, feedbackSessionName); Map studentsMap = new HashMap<>(); Map sessionsMap = new HashMap<>(); List feedbackSessions = logic.getFeedbackSessionsForCourse(courseId); @@ -215,4 +217,14 @@ private Map> groupFeedbackSessionLogEntrie } return groupedEntries; } + + private Map> groupFeedbackSessionLogs( + List fsLogEntries) { + Map> groupedEntries = new LinkedHashMap<>(); + for (FeedbackSessionLog fsLogEntry : fsLogEntries) { + String fsName = fsLogEntry.getFeedbackSession().getName(); + groupedEntries.computeIfAbsent(fsName, k -> new ArrayList<>()).add(fsLogEntry); + } + return groupedEntries; + } } diff --git a/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java b/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java new file mode 100644 index 00000000000..5c50ecf1638 --- /dev/null +++ b/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java @@ -0,0 +1,330 @@ +package teammates.sqlui.webapi; + +import static org.mockito.Mockito.when; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.InstructorPrivileges; +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.Const; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; +import teammates.ui.output.FeedbackSessionLogData; +import teammates.ui.output.FeedbackSessionLogEntryData; +import teammates.ui.output.FeedbackSessionLogsData; +import teammates.ui.webapi.GetFeedbackSessionLogsAction; +import teammates.ui.webapi.JsonResult; + +/** + * SUT: {@link GetFeedbackSessionLogsAction}. + */ +public class GetFeedbackSessionLogsActionTest extends BaseActionTest { + + private Course course; + + private Student student1; + private Student student2; + + private FeedbackSession fs1; + + private long startTime; + private long endTime; + + private String googleId = "google-id"; + + @Override + String getActionUri() { + return Const.ResourceURIs.SESSION_LOGS; + } + + @Override + String getRequestMethod() { + return GET; + } + + @BeforeMethod + void setUp() { + FeedbackSession fs2; + endTime = Instant.now().toEpochMilli(); + startTime = endTime - (Const.LOGS_RETENTION_PERIOD.toDays() - 1) * 24 * 60 * 60 * 1000; + + course = getTypicalCourse(); + + student1 = getTypicalStudent(); + student1.setEmail("student1@teammates.tmt"); + student1.setTeam(getTypicalTeam()); + + student2 = getTypicalStudent(); + student2.setEmail("student2@teammates.tmt"); + student2.setTeam(getTypicalTeam()); + + fs1 = getTypicalFeedbackSessionForCourse(course); + fs1.setName("fs1"); + fs1.setCreatedAt(Instant.now()); + + fs2 = getTypicalFeedbackSessionForCourse(course); + fs2.setName("fs2"); + fs2.setCreatedAt(Instant.now()); + + when(mockLogic.getCourse(course.getId())).thenReturn(course); + when(mockLogic.getFeedbackSession(fs1.getName(), course.getId())).thenReturn(fs1); + when(mockLogic.getStudentForEmail(course.getId(), student1.getEmail())).thenReturn(student1); + when(mockLogic.getStudentForEmail(course.getId(), student2.getEmail())).thenReturn(student2); + + List feedbackSessions = new ArrayList<>(); + feedbackSessions.add(fs1); + feedbackSessions.add(fs2); + when(mockLogic.getFeedbackSessionsForCourse(course.getId())).thenReturn(feedbackSessions); + + FeedbackSessionLog student1Session1Log1 = new FeedbackSessionLog(student1, fs1, FeedbackSessionLogType.ACCESS, + Instant.ofEpochMilli(startTime)); + FeedbackSessionLog student1Session2Log1 = new FeedbackSessionLog(student1, fs2, FeedbackSessionLogType.ACCESS, + Instant.ofEpochMilli(startTime + 1000)); + FeedbackSessionLog student1Session2Log2 = new FeedbackSessionLog(student1, fs2, + FeedbackSessionLogType.SUBMISSION, Instant.ofEpochMilli(startTime + 2000)); + FeedbackSessionLog student2Session1Log1 = new FeedbackSessionLog(student2, fs1, FeedbackSessionLogType.ACCESS, + Instant.ofEpochMilli(startTime + 3000)); + FeedbackSessionLog student2Session1Log2 = new FeedbackSessionLog(student2, fs1, + FeedbackSessionLogType.SUBMISSION, Instant.ofEpochMilli(startTime + 4000)); + + List allLogsInCourse = new ArrayList<>(); + allLogsInCourse.add(student1Session1Log1); + allLogsInCourse.add(student1Session2Log1); + allLogsInCourse.add(student1Session2Log2); + allLogsInCourse.add(student2Session1Log1); + allLogsInCourse.add(student2Session1Log2); + when(mockLogic.getOrderedFeedbackSessionLogs(course.getId(), null, null, Instant.ofEpochMilli(startTime), + Instant.ofEpochMilli(endTime))).thenReturn(allLogsInCourse); + + List student1Logs = new ArrayList<>(); + student1Logs.add(student1Session1Log1); + student1Logs.add(student1Session2Log1); + student1Logs.add(student1Session2Log2); + when(mockLogic.getOrderedFeedbackSessionLogs(course.getId(), student1.getId(), null, + Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime))).thenReturn(student1Logs); + + List fs1Logs = new ArrayList<>(); + fs1Logs.add(student1Session1Log1); + fs1Logs.add(student2Session1Log1); + fs1Logs.add(student2Session1Log2); + when(mockLogic.getOrderedFeedbackSessionLogs(course.getId(), null, fs1.getId(), + Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime))).thenReturn(fs1Logs); + + List student1Fs1Logs = new ArrayList<>(); + student1Fs1Logs.add(student1Session1Log1); + when(mockLogic.getOrderedFeedbackSessionLogs(course.getId(), student1.getId(), fs1.getId(), + Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime))).thenReturn(student1Fs1Logs); + } + + @Test(enabled = false) + protected void testExecute() { + JsonResult actionOutput; + + ______TS("Failure case: not enough parameters"); + verifyHttpParameterFailure( + Const.ParamsNames.COURSE_ID, course.getId()); + + verifyHttpParameterFailure( + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime)); + verifyHttpParameterFailure( + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime)); + + ______TS("Failure case: invalid course id"); + String[] paramsInvalid1 = { + Const.ParamsNames.COURSE_ID, "fake-course-id", + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + verifyEntityNotFound(paramsInvalid1); + + ______TS("Failure case: invalid student email"); + String[] paramsInvalid2 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.STUDENT_EMAIL, "fake-student-email@gmail.com", + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + verifyEntityNotFound(paramsInvalid2); + + ______TS("Failure case: invalid start or end times"); + String[] paramsInvalid3 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, "abc", + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + verifyHttpParameterFailure(paramsInvalid3); + + String[] paramsInvalid4 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, " ", + }; + verifyHttpParameterFailure(paramsInvalid4); + + ______TS("Success case: should group by feedback session"); + String[] paramsSuccessful1 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + + actionOutput = getJsonResult(getAction(paramsSuccessful1)); + + FeedbackSessionLogsData fslData = (FeedbackSessionLogsData) actionOutput.getOutput(); + List fsLogs = fslData.getFeedbackSessionLogs(); + + // Course has 2 feedback sessions + assertEquals(fsLogs.size(), 2); + + List fsLogEntries1 = fsLogs.get(0).getFeedbackSessionLogEntries(); + List fsLogEntries2 = fsLogs.get(1).getFeedbackSessionLogEntries(); + + assertEquals(fsLogEntries1.size(), 3); + assertEquals(fsLogEntries1.get(0).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries1.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries1.get(1).getStudentData().getEmail(), student2.getEmail()); + assertEquals(fsLogEntries1.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries1.get(2).getStudentData().getEmail(), student2.getEmail()); + assertEquals(fsLogEntries1.get(2).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); + + assertEquals(fsLogEntries2.size(), 2); + assertEquals(fsLogEntries2.get(0).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries2.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries2.get(1).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries2.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); + + ______TS("Success case: should accept optional email"); + String[] paramsSuccessful2 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + actionOutput = getJsonResult(getAction(paramsSuccessful2)); + fslData = (FeedbackSessionLogsData) actionOutput.getOutput(); + fsLogs = fslData.getFeedbackSessionLogs(); + + assertEquals(fsLogs.size(), 2); + + fsLogEntries1 = fsLogs.get(0).getFeedbackSessionLogEntries(); + fsLogEntries2 = fsLogs.get(1).getFeedbackSessionLogEntries(); + + assertEquals(fsLogEntries1.size(), 1); + assertEquals(fsLogEntries1.get(0).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries1.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + + assertEquals(fsLogEntries2.size(), 2); + assertEquals(fsLogEntries2.get(0).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries2.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries2.get(1).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries2.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); + + ______TS("Success case: should accept optional feedback session"); + String[] paramsSuccessful3 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + actionOutput = getJsonResult(getAction(paramsSuccessful3)); + fslData = (FeedbackSessionLogsData) actionOutput.getOutput(); + fsLogs = fslData.getFeedbackSessionLogs(); + + assertEquals(fsLogs.size(), 2); + assertEquals(fsLogs.get(1).getFeedbackSessionLogEntries().size(), 0); + + fsLogEntries1 = fsLogs.get(0).getFeedbackSessionLogEntries(); + + assertEquals(fsLogEntries1.size(), 3); + assertEquals(fsLogEntries1.get(0).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries1.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries1.get(1).getStudentData().getEmail(), student2.getEmail()); + assertEquals(fsLogEntries1.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + assertEquals(fsLogEntries1.get(2).getStudentData().getEmail(), student2.getEmail()); + assertEquals(fsLogEntries1.get(2).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); + + ______TS("Success case: should accept all optional params"); + String[] paramsSuccessful4 = { + Const.ParamsNames.COURSE_ID, course.getId(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), + Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), + }; + actionOutput = getJsonResult(getAction(paramsSuccessful4)); + fslData = (FeedbackSessionLogsData) actionOutput.getOutput(); + fsLogs = fslData.getFeedbackSessionLogs(); + + assertEquals(fsLogs.size(), 2); + assertEquals(fsLogs.get(1).getFeedbackSessionLogEntries().size(), 0); + + fsLogEntries1 = fsLogs.get(0).getFeedbackSessionLogEntries(); + + assertEquals(fsLogEntries1.size(), 1); + assertEquals(fsLogEntries1.get(0).getStudentData().getEmail(), student1.getEmail()); + assertEquals(fsLogEntries1.get(0).getFeedbackSessionLogType(), FeedbackSessionLogType.ACCESS); + + // TODO: if we restrict the range from start to end time, it should be tested + // here as well + } + + @Test + void testSpecificAccessControl_instructorWithInvalidPermission_cannotAccess() { + + Instructor instructor = new Instructor(course, "name", "instructoremail@tm.tmt", + false, "", null, new InstructorPrivileges()); + + loginAsInstructor(googleId); + when(mockLogic.getCourse(course.getId())).thenReturn(course); + when(mockLogic.getInstructorByGoogleId(course.getId(), googleId)).thenReturn(instructor); + + String[] params = { + Const.ParamsNames.COURSE_ID, course.getId(), + }; + + verifyCannotAccess(params); + } + + @Test + void testSpecificAccessControl_instructorWithPermission_canAccess() { + InstructorPrivileges instructorPrivileges = new InstructorPrivileges(); + instructorPrivileges.updatePrivilege(Const.InstructorPermissions.CAN_MODIFY_SESSION, true); + instructorPrivileges.updatePrivilege(Const.InstructorPermissions.CAN_MODIFY_STUDENT, true); + instructorPrivileges.updatePrivilege(Const.InstructorPermissions.CAN_MODIFY_INSTRUCTOR, true); + Instructor instructor = new Instructor(course, "name", "instructoremail@tm.tmt", + false, "", null, instructorPrivileges); + + loginAsInstructor(googleId); + when(mockLogic.getCourse(course.getId())).thenReturn(course); + when(mockLogic.getInstructorByGoogleId(course.getId(), googleId)).thenReturn(instructor); + + String[] params = { + Const.ParamsNames.COURSE_ID, course.getId(), + }; + + verifyCanAccess(params); + } + + @Test + void testSpecificAccessControl_notInstructor_cannotAccess() { + String[] params = { + Const.ParamsNames.COURSE_ID, course.getId(), + }; + loginAsStudent(googleId); + verifyCannotAccess(params); + + logoutUser(); + verifyCannotAccess(params); + } +} From 5779d2f365abad11ed259714c8422bc66f82db1e Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:44:15 +0800 Subject: [PATCH 28/95] [#11878] Create Update Account Request Action (#12982) * create update action and IT * update javadocs * update tests * add more tests * simplify logic * remove unused string * fix test * allow null comments * add more tests * use EntityNotFoundException * cleanup after create account requests test * remove unncessary check --- .../webapi/CreateAccountRequestActionIT.java | 15 ++ .../webapi/UpdateAccountRequestActionIT.java | 223 ++++++++++++++++++ .../request/AccountRequestUpdateRequest.java | 63 +++++ .../teammates/ui/webapi/ActionFactory.java | 1 + .../ui/webapi/UpdateAccountRequestAction.java | 75 ++++++ .../ui/webapi/GetActionClassesActionTest.java | 1 + 6 files changed, 378 insertions(+) create mode 100644 src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java create mode 100644 src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java create mode 100644 src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java diff --git a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java index f73bf03f24a..85449452b5f 100644 --- a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java @@ -1,5 +1,8 @@ package teammates.it.ui.webapi; +import java.util.List; + +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -221,4 +224,16 @@ protected void testAccessControl() throws Exception { verifyAccessibleWithoutLogin(); } + @Override + @AfterMethod + protected void tearDown() { + HibernateUtil.beginTransaction(); + List accountRequests = logic.getPendingAccountRequests(); + for (AccountRequest ar : accountRequests) { + logic.deleteAccountRequest(ar.getEmail(), ar.getInstitute()); + } + accountRequests = logic.getPendingAccountRequests(); + HibernateUtil.commitTransaction(); + assert accountRequests.isEmpty(); + } } diff --git a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java new file mode 100644 index 00000000000..207c042be41 --- /dev/null +++ b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java @@ -0,0 +1,223 @@ +package teammates.it.ui.webapi; + +import java.util.UUID; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.common.util.FieldValidator; +import teammates.common.util.HibernateUtil; +import teammates.common.util.StringHelperExtension; +import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.ui.output.AccountRequestData; +import teammates.ui.request.AccountRequestUpdateRequest; +import teammates.ui.request.InvalidHttpRequestBodyException; +import teammates.ui.webapi.EntityNotFoundException; +import teammates.ui.webapi.InvalidHttpParameterException; +import teammates.ui.webapi.JsonResult; +import teammates.ui.webapi.UpdateAccountRequestAction; + +/** + * SUT: {@link UpdateAccountRequestAction}. + */ +public class UpdateAccountRequestActionIT extends BaseActionIT { + + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalBundle); + HibernateUtil.flushSession(); + } + + @Override + protected String getActionUri() { + return Const.ResourceURIs.ACCOUNT_REQUEST; + } + + @Override + protected String getRequestMethod() { + return PUT; + } + + @Override + @Test + public void testExecute() throws Exception { + ______TS("edit fields of an account request"); + AccountRequest accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + accountRequest.setStatus(AccountRequestStatus.PENDING); + UUID id = accountRequest.getId(); + String name = "newName"; + String email = "newEmail@email.com"; + String institute = "newInstitute"; + String comments = "newComments"; + AccountRequestStatus status = accountRequest.getStatus(); + + AccountRequestUpdateRequest requestBody = new AccountRequestUpdateRequest(name, email, institute, status, comments); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + UpdateAccountRequestAction action = getAction(requestBody, params); + JsonResult result = action.execute(); + + assertEquals(result.getStatusCode(), 200); + AccountRequestData data = (AccountRequestData) result.getOutput(); + + assertEquals(name, data.getName()); + assertEquals(email, data.getEmail()); + assertEquals(institute, data.getInstitute()); + assertEquals(status, data.getStatus()); + assertEquals(comments, data.getComments()); + verifyNoEmailsSent(); + + ______TS("approve a pending account request"); + accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor2"); + accountRequest.setStatus(AccountRequestStatus.PENDING); + requestBody = new AccountRequestUpdateRequest(accountRequest.getName(), accountRequest.getEmail(), + accountRequest.getInstitute(), AccountRequestStatus.APPROVED, accountRequest.getComments()); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, accountRequest.getId().toString()}; + action = getAction(requestBody, params); + result = getJsonResult(action, 200); + data = (AccountRequestData) result.getOutput(); + + assertEquals(accountRequest.getName(), data.getName()); + assertEquals(accountRequest.getEmail(), data.getEmail()); + assertEquals(accountRequest.getInstitute(), data.getInstitute()); + assertEquals(AccountRequestStatus.APPROVED, data.getStatus()); + assertEquals(accountRequest.getComments(), data.getComments()); + verifyNumberOfEmailsSent(1); + + ______TS("already registered account request has no email sent when approved"); + accountRequest = typicalBundle.accountRequests.get("instructor2"); + requestBody = new AccountRequestUpdateRequest(name, email, institute, AccountRequestStatus.APPROVED, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, accountRequest.getId().toString()}; + + action = getAction(requestBody, params); + result = getJsonResult(action, 200); + data = (AccountRequestData) result.getOutput(); + + assertEquals(name, data.getName()); + assertEquals(email, data.getEmail()); + assertEquals(institute, data.getInstitute()); + assertEquals(AccountRequestStatus.REGISTERED, data.getStatus()); + assertEquals(comments, data.getComments()); + verifyNumberOfEmailsSent(0); + + ______TS("non-existent but valid uuid"); + requestBody = new AccountRequestUpdateRequest("name", "email", + "institute", AccountRequestStatus.PENDING, "comments"); + String validUuid = UUID.randomUUID().toString(); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, validUuid}; + + EntityNotFoundException enfe = verifyEntityNotFound(requestBody, params); + + assertEquals(String.format("Account request with id = %s not found", validUuid), enfe.getMessage()); + + ______TS("invalid uuid"); + requestBody = new AccountRequestUpdateRequest("name", "email", + "institute", AccountRequestStatus.PENDING, "comments"); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, "invalid"}; + + InvalidHttpParameterException ihpe = verifyHttpParameterFailure(requestBody, params); + + assertEquals("Invalid UUID string: invalid", ihpe.getMessage()); + + ______TS("invalid email"); + accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + id = accountRequest.getId(); + email = "newEmail"; + status = accountRequest.getStatus(); + + requestBody = new AccountRequestUpdateRequest(name, email, institute, status, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + InvalidHttpRequestBodyException ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals(getPopulatedErrorMessage(FieldValidator.EMAIL_ERROR_MESSAGE, email, + FieldValidator.EMAIL_FIELD_NAME, FieldValidator.REASON_INCORRECT_FORMAT, FieldValidator.EMAIL_MAX_LENGTH), + ihrbe.getMessage()); + + ______TS("invalid name alphanumeric"); + name = "@$@#$#@#@$#@$"; + email = "newEmail@email.com"; + + requestBody = new AccountRequestUpdateRequest(name, email, institute, status, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals(getPopulatedErrorMessage(FieldValidator.INVALID_NAME_ERROR_MESSAGE, name, + FieldValidator.PERSON_NAME_FIELD_NAME, FieldValidator.REASON_START_WITH_NON_ALPHANUMERIC_CHAR), + ihrbe.getMessage()); + + ______TS("invalid name too long"); + name = StringHelperExtension.generateStringOfLength(FieldValidator.PERSON_NAME_MAX_LENGTH + 1); + + requestBody = new AccountRequestUpdateRequest(name, email, institute, status, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals(getPopulatedErrorMessage(FieldValidator.SIZE_CAPPED_NON_EMPTY_STRING_ERROR_MESSAGE, name, + FieldValidator.PERSON_NAME_FIELD_NAME, FieldValidator.REASON_TOO_LONG, + FieldValidator.PERSON_NAME_MAX_LENGTH), ihrbe.getMessage()); + + ______TS("null email value"); + name = "newName"; + + requestBody = new AccountRequestUpdateRequest(name, null, institute, status, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals("email cannot be null", ihrbe.getMessage()); + + ______TS("null name value"); + requestBody = new AccountRequestUpdateRequest(null, email, institute, status, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals("name cannot be null", ihrbe.getMessage()); + + ______TS("null status value"); + requestBody = new AccountRequestUpdateRequest(name, email, institute, null, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals("status cannot be null", ihrbe.getMessage()); + + ______TS("null institute value"); + requestBody = new AccountRequestUpdateRequest(name, email, null, status, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals("institute cannot be null", ihrbe.getMessage()); + + ______TS("allow null comments in request"); + requestBody = new AccountRequestUpdateRequest(name, email, institute, status, null); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + action = getAction(requestBody, params); + result = getJsonResult(action, 200); + data = (AccountRequestData) result.getOutput(); + + assertEquals(name, data.getName()); + assertEquals(email, data.getEmail()); + assertEquals(institute, data.getInstitute()); + assertEquals(null, data.getComments()); + } + + @Override + @Test + protected void testAccessControl() throws InvalidParametersException, EntityAlreadyExistsException { + Course course = typicalBundle.courses.get("course1"); + verifyOnlyAdminCanAccess(course); + } +} diff --git a/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java b/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java new file mode 100644 index 00000000000..cc653d79ddb --- /dev/null +++ b/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java @@ -0,0 +1,63 @@ +package teammates.ui.request; + +import javax.annotation.Nullable; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.util.SanitizationHelper; + +/** + * The create request for an account request update request. + */ +public class AccountRequestUpdateRequest extends BasicRequest { + private String name; + private String email; + private String institute; + private AccountRequestStatus status; + + @Nullable + private String comments; + + public AccountRequestUpdateRequest(String name, String email, String institute, AccountRequestStatus status, + String comments) { + this.name = SanitizationHelper.sanitizeName(name); + this.email = SanitizationHelper.sanitizeEmail(email); + this.institute = SanitizationHelper.sanitizeName(institute); + this.status = status; + if (comments != null) { + this.comments = SanitizationHelper.sanitizeTextField(comments); + } + } + + @Override + public void validate() throws InvalidHttpRequestBodyException { + assertTrue(name != null, "name cannot be null"); + assertTrue(email != null, "email cannot be null"); + assertTrue(institute != null, "institute cannot be null"); + assertTrue(status != null, "status cannot be null"); + assertTrue(status == AccountRequestStatus.APPROVED + || status == AccountRequestStatus.REJECTED + || status == AccountRequestStatus.PENDING + || status == AccountRequestStatus.REGISTERED, + "status must be one of the following: APPROVED, REJECTED, PENDING, REGISTERED"); + } + + public String getName() { + return this.name; + } + + public String getEmail() { + return this.email; + } + + public String getInstitute() { + return this.institute; + } + + public AccountRequestStatus getStatus() { + return this.status; + } + + public String getComments() { + return this.comments; + } +} diff --git a/src/main/java/teammates/ui/webapi/ActionFactory.java b/src/main/java/teammates/ui/webapi/ActionFactory.java index 72d16ad9973..169d4ae5b07 100644 --- a/src/main/java/teammates/ui/webapi/ActionFactory.java +++ b/src/main/java/teammates/ui/webapi/ActionFactory.java @@ -50,6 +50,7 @@ public final class ActionFactory { map(ResourceURIs.ACCOUNT_REQUEST, GET, GetAccountRequestAction.class); map(ResourceURIs.ACCOUNT_REQUEST, POST, CreateAccountRequestAction.class); map(ResourceURIs.ACCOUNT_REQUEST, DELETE, DeleteAccountRequestAction.class); + map(ResourceURIs.ACCOUNT_REQUEST, PUT, UpdateAccountRequestAction.class); map(ResourceURIs.ACCOUNT_REQUESTS, GET, GetAccountRequestsAction.class); map(ResourceURIs.ACCOUNT_REQUEST_RESET, PUT, ResetAccountRequestAction.class); map(ResourceURIs.ACCOUNTS, GET, GetAccountsAction.class); diff --git a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java new file mode 100644 index 00000000000..761a18abd8f --- /dev/null +++ b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java @@ -0,0 +1,75 @@ +package teammates.ui.webapi; + +import java.util.UUID; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.EntityDoesNotExistException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.common.util.EmailWrapper; +import teammates.storage.sqlentity.AccountRequest; +import teammates.ui.output.AccountRequestData; +import teammates.ui.request.AccountRequestUpdateRequest; +import teammates.ui.request.InvalidHttpRequestBodyException; + +/** + * Updates an account request. + */ +public class UpdateAccountRequestAction extends AdminOnlyAction { + + static final String ACCOUNT_REQUEST_NOT_FOUND = "Account request with id = %s not found"; + + @Override + public JsonResult execute() throws InvalidOperationException, InvalidHttpRequestBodyException { + String id = getNonNullRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID); + UUID accountRequestId; + + try { + accountRequestId = UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new InvalidHttpParameterException(e.getMessage(), e); + } + + AccountRequest accountRequest = sqlLogic.getAccountRequest(accountRequestId); + + if (accountRequest == null) { + String errorMessage = String.format(ACCOUNT_REQUEST_NOT_FOUND, accountRequestId.toString()); + throw new EntityNotFoundException(errorMessage); + } + + AccountRequestUpdateRequest accountRequestUpdateRequest = + getAndValidateRequestBody(AccountRequestUpdateRequest.class); + + if (accountRequestUpdateRequest.getStatus() == AccountRequestStatus.APPROVED + && (accountRequest.getStatus() == AccountRequestStatus.PENDING + || accountRequest.getStatus() == AccountRequestStatus.REJECTED)) { + try { + // should not need to update other fields for an approval + accountRequest.setStatus(accountRequestUpdateRequest.getStatus()); + accountRequest = sqlLogic.updateAccountRequest(accountRequest); + EmailWrapper email = sqlEmailGenerator.generateNewInstructorAccountJoinEmail( + accountRequest.getRegistrationUrl(), accountRequest.getEmail(), accountRequest.getName()); + emailSender.sendEmail(email); + } catch (InvalidParametersException e) { + throw new InvalidHttpRequestBodyException(e); + } catch (EntityDoesNotExistException e) { + throw new EntityNotFoundException(e); + } + } else { + try { + accountRequest.setName(accountRequestUpdateRequest.getName()); + accountRequest.setEmail(accountRequestUpdateRequest.getEmail()); + accountRequest.setInstitute(accountRequestUpdateRequest.getInstitute()); + accountRequest.setStatus(accountRequest.getStatus()); + accountRequest.setComments(accountRequestUpdateRequest.getComments()); + sqlLogic.updateAccountRequest(accountRequest); + } catch (InvalidParametersException e) { + throw new InvalidHttpRequestBodyException(e); + } catch (EntityDoesNotExistException e) { + throw new EntityNotFoundException(e); + } + } + + return new JsonResult(new AccountRequestData(accountRequest)); + } +} diff --git a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java index 752a74d9101..89ace4cdf78 100644 --- a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java +++ b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java @@ -87,6 +87,7 @@ protected void testExecute() { GetAccountRequestAction.class, DeleteAccountRequestAction.class, GetAccountRequestsAction.class, + UpdateAccountRequestAction.class, GetAccountAction.class, GetAccountsAction.class, FeedbackSessionPublishedRemindersAction.class, From 028c953a04f9563522cc5444aef7926bd536a165 Mon Sep 17 00:00:00 2001 From: Nicolas <25302138+NicolasCwy@users.noreply.github.com> Date: Sat, 6 Apr 2024 10:52:46 +0800 Subject: [PATCH 29/95] [#12048] Update liquibase configuration (#12930) * Update gradle config * Update liquibase config for v9 * Turn off table generate for prod * Update of changelog file * Add configuration for generating changelog * Add schema migration docs --------- Co-authored-by: FergusMok --- build.gradle | 22 + docs/schema-migration.md | 34 ++ .../teammates/common/util/HibernateUtil.java | 6 +- .../db/changelog/db.changelog-root.xml | 2 +- .../db/changelog/db.changelog-v9.0.0.xml | 536 ++++++++++++++++++ .../db/changelog/db.changelog-v9.xml | 82 --- 6 files changed, 598 insertions(+), 84 deletions(-) create mode 100644 docs/schema-migration.md create mode 100644 src/main/resources/db/changelog/db.changelog-v9.0.0.xml delete mode 100644 src/main/resources/db/changelog/db.changelog-v9.xml diff --git a/build.gradle b/build.gradle index 90abb909473..f448d003a8f 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,9 @@ dependencies { exclude group: "org.apache.jmeter", module: "bom" } + liquibaseRuntime("org.liquibase:liquibase-core:4.19.0") liquibaseRuntime("info.picocli:picocli:4.7.1") + liquibaseRuntime("org.postgresql:postgresql:42.7.2") liquibaseRuntime(sourceSets.main.output) } @@ -136,6 +138,10 @@ sourceSets { } } +if (!project.hasProperty("runList")) { + project.ext.set("runList", "main") +} + liquibase { activities { main { @@ -145,7 +151,23 @@ liquibase { username project.properties['liquibaseUsername'] password project.properties['liquibasePassword'] } + snapshot { + url project.properties['liquibaseDbUrl'] + username project.properties['liquibaseUsername'] + password project.properties['liquibasePassword'] + snapshotFormat "json" + outputFile "liquibase-snapshot.json" + } + diffMain { + searchPath "${projectDir}" + changeLogFile "src/main/resources/db/changelog/db.changelog-new.xml" + referenceUrl project.properties['liquibaseDbUrl'] + referenceUsername project.properties['liquibaseUsername'] + referencePassword project.properties['liquibasePassword'] + url "offline:postgresql?snapshot=liquibase-snapshot.json" + } } + runList = project.ext.runList } tasks.withType(cz.habarta.typescript.generator.gradle.GenerateTask) { diff --git a/docs/schema-migration.md b/docs/schema-migration.md new file mode 100644 index 00000000000..a88f49ece0f --- /dev/null +++ b/docs/schema-migration.md @@ -0,0 +1,34 @@ + + title: "Schema Migration" + + +# SQL Schema Migration + +Teammates uses _[Liquibase]_(https://docs.liquibase.com/start/home.html), a database schema change management solution that enables developers to revise and release database changes to production. The maintainers in charge of releases (Release Leader) will be in charge of generating a _Liquibase_ changelog prior to each release to keep the production databases schema in sync with the code. Therefore this section is just for documentation purposes for contributors. + +## Liquibase in Teammates +_Liquibase_ is made available using the [gradle plugin](https://github.com/liquibase/liquibase-gradle-plugin), providing _liquibase_ functions as tasks. Try `gradle tasks | grep "liquibase"` to see all the tasks available. In teammates, change logs (more in the next section) are written in _XML_. + +### Liquibase connection +Amend the `liquibaseDbUrl`, `liquibaseUsername` and `liquibasePassword` in `gradle.properties` to allow the _Liquibase_ plugin to connect your database. + +## Change logs, change sets and change types +A _change log_ is a file that contains a series of _change sets_ (analagous to a transaction) which applies _change types_ (actions). You can refer to this page on liquibase on the types of [change types](https://docs.liquibase.com/change-types/home.html) that can be used. + +## Gradle Activities for Liquibase +Activities in Gradle are a way of specifying different variables provided by gradle to the Liquibase plugin. The argument `runList` provided by `-pRunList=` e.g `./gradlew liquibaseSnapshot -PrunList=snapshot` is used to specify which activity to be used for the Liquibase command. In this case the `liquibaseSnapshot` command is run using the `snapshot` activity. + +Here is a brief description of the activities defined for Liquibase +1. Main: The default activity used by Liquibase commands and is used for running changelogs against a database. This is used by default if a `runList` is not defined +2. Snapshot: Used to specify output format and name for snapshots i.e JSON +3. diffMain: Specify the reference and the target database to generate changelog that contains operations to update reference database to the state of the target database. i.e the reference is the JSON file generated by the snapshot command, this can be replaced with a live database which is used as reference. + +## Generating/ Updating liquibase change logs +1. Ensure `diff-main` activity in `build.gradle` is pointing to the latest release changelog `src/main/resources/db/changelog/db.changelog-.xml` +2. Delete the `postgres-data` folder to clear any old database schemas +3. Run `git checkout ` and +4. Run the server using `./gradlew serverRun` to generate tables found on branch +5. Generate snapshot of database by running `./gradlew liquibaseSnapshot -PrunList=snapshot`, the snapshot will be output to `liquibase-snapshot.json` +6. Checkout your branch and repeat steps 2 and 4 to generate the tables found on your branch +7. Run `./gradlew liquibaseDiffChangeLog -PrunList=diffMain` to generate changeLog to resolve database schema differences + diff --git a/src/main/java/teammates/common/util/HibernateUtil.java b/src/main/java/teammates/common/util/HibernateUtil.java index acad8a4d13a..8edcca6c807 100644 --- a/src/main/java/teammates/common/util/HibernateUtil.java +++ b/src/main/java/teammates/common/util/HibernateUtil.java @@ -116,7 +116,7 @@ public static void buildSessionFactory(String dbUrl, String username, String pas .setProperty("hibernate.connection.username", username) .setProperty("hibernate.connection.password", password) .setProperty("hibernate.connection.url", dbUrl) - .setProperty("hibernate.hbm2ddl.auto", "update") + .setProperty("hibernate.hbm2ddl.auto", "validate") .setProperty("show_sql", "true") .setProperty("hibernate.current_session_context_class", "thread") .setProperty("hibernate.hikari.minimumIdle", "10") @@ -130,6 +130,10 @@ public static void buildSessionFactory(String dbUrl, String username, String pas // .setProperty("hibernate.jdbc.fetch_size", "50") .addPackage("teammates.storage.sqlentity"); + if (Config.IS_DEV_SERVER) { + config.setProperty("hibernate.hbm2ddl.auto", "update"); + } + for (Class cls : ANNOTATED_CLASSES) { config = config.addAnnotatedClass(cls); } diff --git a/src/main/resources/db/changelog/db.changelog-root.xml b/src/main/resources/db/changelog/db.changelog-root.xml index 66d4b7d7c88..af5c5e34d7e 100644 --- a/src/main/resources/db/changelog/db.changelog-root.xml +++ b/src/main/resources/db/changelog/db.changelog-root.xml @@ -4,5 +4,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + diff --git a/src/main/resources/db/changelog/db.changelog-v9.0.0.xml b/src/main/resources/db/changelog/db.changelog-v9.0.0.xml new file mode 100644 index 00000000000..205645520ff --- /dev/null +++ b/src/main/resources/db/changelog/db.changelog-v9.0.0.xml @@ -0,0 +1,536 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-v9.xml b/src/main/resources/db/changelog/db.changelog-v9.xml deleted file mode 100644 index 57b6e7f9587..00000000000 --- a/src/main/resources/db/changelog/db.changelog-v9.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4a54001bac3824cc8ac2fb66324d7061151f4504 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Sat, 6 Apr 2024 22:42:50 +0800 Subject: [PATCH 30/95] [#11878] Fix Account Request Update Search Indexing (#12984) * update account request indexing * add methods to test access control * refactoring for transactions --- ...ntRequestSearchIndexingWorkerActionIT.java | 5 +- .../teammates/it/ui/webapi/BaseActionIT.java | 106 +++++++++++++++++- .../webapi/UpdateAccountRequestActionIT.java | 35 ++++-- .../java/teammates/logic/api/TaskQueuer.java | 10 +- .../java/teammates/sqllogic/api/Logic.java | 26 +++++ .../sqllogic/core/AccountRequestsLogic.java | 38 +++++++ .../storage/sqlapi/AccountRequestsDb.java | 13 +++ ...ountRequestSearchIndexingWorkerAction.java | 14 ++- .../ui/webapi/CreateAccountRequestAction.java | 2 +- .../ui/webapi/UpdateAccountRequestAction.java | 13 ++- .../logic/api/MockUserProvision.java | 25 +++++ 11 files changed, 259 insertions(+), 28 deletions(-) diff --git a/src/it/java/teammates/it/ui/webapi/AccountRequestSearchIndexingWorkerActionIT.java b/src/it/java/teammates/it/ui/webapi/AccountRequestSearchIndexingWorkerActionIT.java index a90fb7c9421..6ae1e9e51c4 100644 --- a/src/it/java/teammates/it/ui/webapi/AccountRequestSearchIndexingWorkerActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/AccountRequestSearchIndexingWorkerActionIT.java @@ -1,6 +1,7 @@ package teammates.it.ui.webapi; import java.util.List; +import java.util.UUID; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,6 +47,7 @@ public void testExecute() throws Exception { } AccountRequest accountRequest = typicalBundle.accountRequests.get("instructor1"); + UUID accountRequestId = accountRequest.getId(); ______TS("account request not yet indexed should not be searchable"); @@ -56,8 +58,7 @@ public void testExecute() throws Exception { ______TS("account request indexed should be searchable"); String[] submissionParams = new String[] { - ParamsNames.INSTRUCTOR_EMAIL, accountRequest.getEmail(), - ParamsNames.INSTRUCTOR_INSTITUTION, accountRequest.getInstitute(), + ParamsNames.ACCOUNT_REQUEST_ID, accountRequestId.toString(), }; AccountRequestSearchIndexingWorkerAction action = getAction(submissionParams); diff --git a/src/it/java/teammates/it/ui/webapi/BaseActionIT.java b/src/it/java/teammates/it/ui/webapi/BaseActionIT.java index 950de8655e7..e489db0faf1 100644 --- a/src/it/java/teammates/it/ui/webapi/BaseActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/BaseActionIT.java @@ -22,6 +22,7 @@ import teammates.common.util.Config; import teammates.common.util.Const; import teammates.common.util.EmailWrapper; +import teammates.common.util.HibernateUtil; import teammates.common.util.JsonUtils; import teammates.it.test.BaseTestCaseWithSqlDatabaseAccess; import teammates.logic.api.MockEmailSender; @@ -169,6 +170,14 @@ protected void loginAsAdmin() { assertTrue(user.isAdmin); } + /** + * Logs in the user to the test environment as an admin. + */ + protected void loginAsAdminWithTransaction() { + UserInfo user = mockUserProvision.loginAsAdminWithTransaction(Config.APP_ADMINS.get(0)); + assertTrue(user.isAdmin); + } + /** * Logs in the user to the test environment as an unregistered user * (without any right). @@ -180,6 +189,17 @@ protected void loginAsUnregistered(String userId) { assertFalse(user.isAdmin); } + /** + * Logs in the user to the test environment as an unregistered user + * (without any right). + */ + protected void loginAsUnregisteredWithTransaction(String userId) { + UserInfo user = mockUserProvision.loginUserWithTransaction(userId); + assertFalse(user.isStudent); + assertFalse(user.isInstructor); + assertFalse(user.isAdmin); + } + /** * Logs in the user to the test environment as an instructor * (without admin rights or student rights). @@ -191,6 +211,17 @@ protected void loginAsInstructor(String userId) { assertFalse(user.isAdmin); } + /** + * Logs in the user to the test environment as an instructor + * (without admin rights or student rights). + */ + protected void loginAsInstructorWithTransaction(String userId) { + UserInfo user = mockUserProvision.loginUserWithTransaction(userId); + assertFalse(user.isStudent); + assertTrue(user.isInstructor); + assertFalse(user.isAdmin); + } + /** * Logs in the user to the test environment as a student * (without admin rights or instructor rights). @@ -202,6 +233,17 @@ protected void loginAsStudent(String userId) { assertFalse(user.isAdmin); } + /** + * Logs in the user to the test environment as a student + * (without admin rights or instructor rights). + */ + protected void loginAsStudentWithTransaction(String userId) { + UserInfo user = mockUserProvision.loginUserWithTransaction(userId); + assertTrue(user.isStudent); + assertFalse(user.isInstructor); + assertFalse(user.isAdmin); + } + /** * Logs in the user to the test environment as a student-instructor (without * admin rights). @@ -267,6 +309,24 @@ void verifyOnlyAdminCanAccess(Course course, String... params) verifyAccessibleForAdmin(params); } + void verifyOnlyAdminCanAccessWithTransaction(String... params) + throws InvalidParametersException, EntityAlreadyExistsException { + HibernateUtil.beginTransaction(); + Course course = getTypicalCourse(); + course = logic.createCourse(course); + HibernateUtil.commitTransaction(); + + verifyInaccessibleWithoutLogin(params); + verifyInaccessibleForUnregisteredUsersWithTransaction(params); + verifyInaccessibleForStudentsWithTransaction(course, params); + verifyInaccessibleForInstructorsWithTransaction(course, params); + verifyAccessibleForAdminWithTransaction(params); + + HibernateUtil.beginTransaction(); + logic.deleteCourseCascade(course.getId()); + HibernateUtil.commitTransaction(); + } + void verifyOnlyInstructorsCanAccess(Course course, String... params) throws InvalidParametersException, EntityAlreadyExistsException { verifyInaccessibleWithoutLogin(params); @@ -329,6 +389,14 @@ void verifyInaccessibleForUnregisteredUsers(String... params) { verifyCannotAccess(params); } + void verifyInaccessibleForUnregisteredUsersWithTransaction(String... params) { + ______TS("Non-registered users cannot access"); + + String unregUserId = "unreg.user"; + loginAsUnregisteredWithTransaction(unregUserId); + verifyCannotAccess(params); + } + void verifyAccessibleForAdmin(String... params) { ______TS("Admin can access"); @@ -336,6 +404,13 @@ void verifyAccessibleForAdmin(String... params) { verifyCanAccess(params); } + void verifyAccessibleForAdminWithTransaction(String... params) { + ______TS("Admin can access"); + + loginAsAdminWithTransaction(); + verifyCanAccess(params); + } + void verifyInaccessibleForAdmin(String... params) { ______TS("Admin cannot access"); @@ -353,6 +428,21 @@ void verifyInaccessibleForStudents(Course course, String... params) } + void verifyInaccessibleForStudentsWithTransaction(Course course, String... params) + throws InvalidParametersException, EntityAlreadyExistsException { + ______TS("Students cannot access"); + HibernateUtil.beginTransaction(); + Student student = createTypicalStudent(course, "InaccessibleForStudents@teammates.tmt"); + HibernateUtil.commitTransaction(); + + loginAsStudentWithTransaction(student.getAccount().getGoogleId()); + verifyCannotAccess(params); + + HibernateUtil.beginTransaction(); + logic.deleteAccountCascade(student.getAccount().getGoogleId()); + HibernateUtil.commitTransaction(); + } + void verifyInaccessibleForInstructors(Course course, String... params) throws InvalidParametersException, EntityAlreadyExistsException { ______TS("Instructors cannot access"); @@ -363,6 +453,21 @@ void verifyInaccessibleForInstructors(Course course, String... params) } + void verifyInaccessibleForInstructorsWithTransaction(Course course, String... params) + throws InvalidParametersException, EntityAlreadyExistsException { + ______TS("Instructors cannot access"); + HibernateUtil.beginTransaction(); + Instructor instructor = createTypicalInstructor(course, "InaccessibleForInstructors@teammates.tmt"); + HibernateUtil.commitTransaction(); + + loginAsInstructorWithTransaction(instructor.getAccount().getGoogleId()); + verifyCannotAccess(params); + + HibernateUtil.beginTransaction(); + logic.deleteAccountCascade(instructor.getAccount().getGoogleId()); + HibernateUtil.commitTransaction(); + } + void verifyAccessibleForAdminToMasqueradeAsInstructor( Instructor instructor, String[] submissionParams) { ______TS("admin can access"); @@ -738,5 +843,4 @@ private Student createTypicalStudent(Course course, String email) } return student; } - } diff --git a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java index 207c042be41..8240421d27a 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java @@ -1,7 +1,9 @@ package teammates.it.ui.webapi; +import java.util.List; import java.util.UUID; +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -13,7 +15,6 @@ import teammates.common.util.HibernateUtil; import teammates.common.util.StringHelperExtension; import teammates.storage.sqlentity.AccountRequest; -import teammates.storage.sqlentity.Course; import teammates.ui.output.AccountRequestData; import teammates.ui.request.AccountRequestUpdateRequest; import teammates.ui.request.InvalidHttpRequestBodyException; @@ -30,9 +31,7 @@ public class UpdateAccountRequestActionIT extends BaseActionIT accountRequests = logic.getAllAccountRequests(); + for (AccountRequest ar : accountRequests) { + logic.deleteAccountRequest(ar.getEmail(), ar.getInstitute()); + } + HibernateUtil.commitTransaction(); } } diff --git a/src/main/java/teammates/logic/api/TaskQueuer.java b/src/main/java/teammates/logic/api/TaskQueuer.java index a3db7d7d359..2ea43cf850b 100644 --- a/src/main/java/teammates/logic/api/TaskQueuer.java +++ b/src/main/java/teammates/logic/api/TaskQueuer.java @@ -218,15 +218,13 @@ public void scheduleInstructorForSearchIndexing(String courseId, String email) { } /** - * Schedules for the search indexing of the account request identified by {@code email} and {@code institute}. + * Schedules for the search indexing of the account request identified by {@code id}. * - * @param email the email associated with the account request - * @param institute the institute associated with the account request + * @param id the id associated with the account request */ - public void scheduleAccountRequestForSearchIndexing(String email, String institute) { + public void scheduleAccountRequestForSearchIndexing(String id) { Map paramMap = new HashMap<>(); - paramMap.put(ParamsNames.INSTRUCTOR_EMAIL, email); - paramMap.put(ParamsNames.INSTRUCTOR_INSTITUTION, institute); + paramMap.put(ParamsNames.ACCOUNT_REQUEST_ID, id); addTask(TaskQueue.SEARCH_INDEXING_QUEUE_NAME, TaskQueue.ACCOUNT_REQUEST_SEARCH_INDEXING_WORKER_URL, paramMap, null); diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 18f7bd40dd7..c840ef2834c 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -113,6 +113,15 @@ public AccountRequest getAccountRequest(String email, String institute) { return accountRequestLogic.getAccountRequest(email, institute); } + /** + * Gets the account request with the given {@code id}. + * + * @return account request with the given {@code id}. + */ + public AccountRequest getAccountRequestWithTransaction(UUID id) { + return accountRequestLogic.getAccountRequestWithTransaction(id); + } + /** * Creates a or gets an account request. * @@ -145,6 +154,16 @@ public AccountRequest updateAccountRequest(AccountRequest accountRequest) return accountRequestLogic.updateAccountRequest(accountRequest); } + /** + * Updates the given account request. + * + * @return the updated account request. + */ + public AccountRequest updateAccountRequestWithTransaction(AccountRequest accountRequest) + throws InvalidParametersException, EntityDoesNotExistException { + return accountRequestLogic.updateAccountRequestWithTransaction(accountRequest); + } + /** * Creates/Resets the account request with the given email and institute * such that it is not registered. @@ -178,6 +197,13 @@ public List getPendingAccountRequests() { return accountRequestLogic.getPendingAccountRequests(); } + /** + * Gets all pending account requests. + */ + public List getAllAccountRequests() { + return accountRequestLogic.getAllAccountRequests(); + } + /** * Gets an account. */ diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index b9302b865c7..31956cd0101 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -82,6 +82,16 @@ public AccountRequest getAccountRequest(String email, String institute) { return accountRequestDb.getAccountRequest(email, institute); } + /** + * Gets the account request associated with the {@code id}. + */ + public AccountRequest getAccountRequestWithTransaction(UUID id) { + HibernateUtil.beginTransaction(); + AccountRequest request = accountRequestDb.getAccountRequest(id); + HibernateUtil.commitTransaction(); + return request; + } + /** * Updates an account request. */ @@ -90,6 +100,27 @@ public AccountRequest updateAccountRequest(AccountRequest accountRequest) return accountRequestDb.updateAccountRequest(accountRequest); } + /** + * Updates an account request. + */ + @SuppressWarnings("PMD") + public AccountRequest updateAccountRequestWithTransaction(AccountRequest accountRequest) + throws InvalidParametersException, EntityDoesNotExistException { + + HibernateUtil.beginTransaction(); + AccountRequest updatedRequest; + + try { + updatedRequest = accountRequestDb.updateAccountRequest(accountRequest); + HibernateUtil.commitTransaction(); + } catch (InvalidParametersException ipe) { + HibernateUtil.rollbackTransaction(); + throw new InvalidParametersException(ipe.getMessage()); + } + + return updatedRequest; + } + /** * Gets account request associated with the {@code regkey}. */ @@ -104,6 +135,13 @@ public List getPendingAccountRequests() { return accountRequestDb.getPendingAccountRequests(); } + /** + * Gets all account requests. + */ + public List getAllAccountRequests() { + return accountRequestDb.getAllAccountRequests(); + } + /** * Creates/resets the account request with the given email and institute such that it is not registered. */ diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index b05b544d5b9..92d61afb8eb 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -90,6 +90,19 @@ public List getPendingAccountRequests() { return query.getResultList(); } + /** + * Get all Account Requests. + */ + public List getAllAccountRequests() { + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cr = cb.createQuery(AccountRequest.class); + Root root = cr.from(AccountRequest.class); + cr.select(root); + + TypedQuery query = HibernateUtil.createQuery(cr); + return query.getResultList(); + } + /** * Get AccountRequest by {@code registrationKey} from database. */ diff --git a/src/main/java/teammates/ui/webapi/AccountRequestSearchIndexingWorkerAction.java b/src/main/java/teammates/ui/webapi/AccountRequestSearchIndexingWorkerAction.java index e543b012db4..214ca01f8fd 100644 --- a/src/main/java/teammates/ui/webapi/AccountRequestSearchIndexingWorkerAction.java +++ b/src/main/java/teammates/ui/webapi/AccountRequestSearchIndexingWorkerAction.java @@ -1,5 +1,7 @@ package teammates.ui.webapi; +import java.util.UUID; + import org.apache.http.HttpStatus; import teammates.common.exception.SearchServiceException; @@ -13,10 +15,16 @@ public class AccountRequestSearchIndexingWorkerAction extends AdminOnlyAction { @Override public ActionResult execute() { - String email = getNonNullRequestParamValue(ParamsNames.INSTRUCTOR_EMAIL); - String institute = getNonNullRequestParamValue(ParamsNames.INSTRUCTOR_INSTITUTION); + String id = getNonNullRequestParamValue(ParamsNames.ACCOUNT_REQUEST_ID); + UUID accountRequestId; + + try { + accountRequestId = UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new InvalidHttpParameterException(e.getMessage(), e); + } - AccountRequest accRequest = sqlLogic.getAccountRequest(email, institute); + AccountRequest accRequest = sqlLogic.getAccountRequest(accountRequestId); try { sqlLogic.putAccountRequestDocument(accRequest); diff --git a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java index 7360bdd1d4f..63b753936ec 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java @@ -49,7 +49,7 @@ public JsonResult execute() throw new InvalidHttpRequestBodyException(ipe); } - taskQueuer.scheduleAccountRequestForSearchIndexing(instructorEmail, instructorInstitution); + taskQueuer.scheduleAccountRequestForSearchIndexing(accountRequest.getId().toString()); assert accountRequest != null; EmailWrapper adminAlertEmail = sqlEmailGenerator.generateNewAccountRequestAdminAlertEmail(accountRequest); diff --git a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java index 761a18abd8f..59c95ce7ef1 100644 --- a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java @@ -19,6 +19,11 @@ public class UpdateAccountRequestAction extends AdminOnlyAction { static final String ACCOUNT_REQUEST_NOT_FOUND = "Account request with id = %s not found"; + @Override + public boolean isTransactionNeeded() { + return false; + } + @Override public JsonResult execute() throws InvalidOperationException, InvalidHttpRequestBodyException { String id = getNonNullRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID); @@ -30,7 +35,7 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest throw new InvalidHttpParameterException(e.getMessage(), e); } - AccountRequest accountRequest = sqlLogic.getAccountRequest(accountRequestId); + AccountRequest accountRequest = sqlLogic.getAccountRequestWithTransaction(accountRequestId); if (accountRequest == null) { String errorMessage = String.format(ACCOUNT_REQUEST_NOT_FOUND, accountRequestId.toString()); @@ -46,9 +51,10 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest try { // should not need to update other fields for an approval accountRequest.setStatus(accountRequestUpdateRequest.getStatus()); - accountRequest = sqlLogic.updateAccountRequest(accountRequest); + accountRequest = sqlLogic.updateAccountRequestWithTransaction(accountRequest); EmailWrapper email = sqlEmailGenerator.generateNewInstructorAccountJoinEmail( accountRequest.getRegistrationUrl(), accountRequest.getEmail(), accountRequest.getName()); + taskQueuer.scheduleAccountRequestForSearchIndexing(accountRequest.getId().toString()); emailSender.sendEmail(email); } catch (InvalidParametersException e) { throw new InvalidHttpRequestBodyException(e); @@ -62,7 +68,8 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest accountRequest.setInstitute(accountRequestUpdateRequest.getInstitute()); accountRequest.setStatus(accountRequest.getStatus()); accountRequest.setComments(accountRequestUpdateRequest.getComments()); - sqlLogic.updateAccountRequest(accountRequest); + accountRequest = sqlLogic.updateAccountRequestWithTransaction(accountRequest); + taskQueuer.scheduleAccountRequestForSearchIndexing(accountRequest.getId().toString()); } catch (InvalidParametersException e) { throw new InvalidHttpRequestBodyException(e); } catch (EntityDoesNotExistException e) { diff --git a/src/test/java/teammates/logic/api/MockUserProvision.java b/src/test/java/teammates/logic/api/MockUserProvision.java index 7fa2fdb97f7..f6a88082bcd 100644 --- a/src/test/java/teammates/logic/api/MockUserProvision.java +++ b/src/test/java/teammates/logic/api/MockUserProvision.java @@ -30,6 +30,22 @@ public UserInfo loginUser(String userId) { return loginUser(userId, false); } + private UserInfo loginUserWithTransaction(String userId, boolean isAdmin) { + isLoggedIn = true; + mockUser.id = userId; + mockUser.isAdmin = isAdmin; + return getCurrentUserWithTransaction(null); + } + + /** + * Adds a logged-in user without admin rights. + * + * @return The user info after login process + */ + public UserInfo loginUserWithTransaction(String userId) { + return loginUserWithTransaction(userId, false); + } + /** * Adds a logged-in user as an admin. * @@ -39,6 +55,15 @@ public UserInfo loginAsAdmin(String userId) { return loginUser(userId, true); } + /** + * Adds a logged-in user as an admin. + * + * @return The user info after login process + */ + public UserInfo loginAsAdminWithTransaction(String userId) { + return loginUserWithTransaction(userId, true); + } + /** * Removes the logged-in user information. */ From 62750b08b4ea5169b7098e5071f1d58153152970 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Sun, 7 Apr 2024 11:50:54 +0800 Subject: [PATCH 31/95] [#11878] Add Edit and Approve Account Requests functionality (#12975) * add edit and approve functionality * remove rejection code * fix snap * integrate endpoint * disable approve button for approved requests * use comments instead of comment * use searchString instead of searchQuery * fix snap --- .../account-request-table-model.ts | 4 +- .../account-request-table.component.html | 8 +++- .../account-request-table.component.ts | 48 ++++++++++++++++++- .../account-request-table.module.ts | 4 ++ .../admin-edit-request-modal-model.ts | 9 ++++ .../admin-edit-request-modal.component.html | 34 +++++++++++++ .../admin-edit-request-modal.component.scss | 0 .../admin-edit-request-modal.component.ts | 40 ++++++++++++++++ .../admin-search-page.component.spec.ts.snap | 16 +++++++ .../admin-search-page.component.html | 2 +- .../admin-search-page.component.spec.ts | 6 +-- src/web/services/account.service.ts | 40 +++++++++++++++- src/web/services/search.service.ts | 5 +- 13 files changed, 205 insertions(+), 11 deletions(-) create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.scss create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts diff --git a/src/web/app/components/account-requests-table/account-request-table-model.ts b/src/web/app/components/account-requests-table/account-request-table-model.ts index b2a088e8b40..1dc11a3b43c 100644 --- a/src/web/app/components/account-requests-table/account-request-table-model.ts +++ b/src/web/app/components/account-requests-table/account-request-table-model.ts @@ -1,3 +1,5 @@ +import { AccountRequestStatus } from 'src/web/types/api-output'; + /** * Model for the row entries in the account requests table. */ @@ -5,7 +7,7 @@ export interface AccountRequestTableRowModel { id: string; name: string; email: string; - status: string; + status: AccountRequestStatus; instituteAndCountry: string; createdAtText: string; registeredAtText: string; diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html index 2959ee3b480..7da84774a38 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.html +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -51,6 +51,11 @@
    +
    + + + +
    @@ -64,7 +69,8 @@
    -
    + +
    diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index dc3ef132795..86613fae493 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -1,10 +1,11 @@ import { Component, Input } from '@angular/core'; -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableRowModel } from './account-request-table-model'; +import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { MessageOutput } from '../../../types/api-output'; +import { AccountRequest, AccountRequestStatus, MessageOutput } from '../../../types/api-output'; import { ErrorMessageOutput } from '../../error-message-output'; import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { collapseAnim } from '../teammates-common/collapse-anim'; @@ -31,6 +32,7 @@ export class AccountRequestTableComponent { private statusMessageService: StatusMessageService, private simpleModalService: SimpleModalService, private accountService: AccountService, + private ngbModal: NgbModal, ) {} /** @@ -51,6 +53,48 @@ export class AccountRequestTableComponent { } } + editAccountRequest(accountRequest: AccountRequestTableRowModel): void { + const modalRef: NgbModalRef = this.ngbModal.open(EditRequestModalComponent); + modalRef.componentInstance.accountRequestName = accountRequest.name; + modalRef.componentInstance.accountRequestEmail = accountRequest.email; + modalRef.componentInstance.accountRequestInstitution = accountRequest.instituteAndCountry; + modalRef.componentInstance.accountRequestComments = accountRequest.comments; + + modalRef.result.then(() => { + this.accountService.editAccountRequest( + accountRequest.id, + modalRef.componentInstance.accountRequestName, + modalRef.componentInstance.accountRequestEmail, + modalRef.componentInstance.accountRequestInstitution, + accountRequest.status, + modalRef.componentInstance.accountRequestComments) + .subscribe({ + next: (resp: AccountRequest) => { + accountRequest.comments = resp.comments ?? ''; + accountRequest.name = resp.name; + accountRequest.email = resp.email; + accountRequest.instituteAndCountry = resp.institute; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + }); + } + + approveAccountRequest(accountRequest: AccountRequestTableRowModel): void { + this.accountService.approveAccountRequest(accountRequest.id, accountRequest.name, + accountRequest.email, accountRequest.instituteAndCountry) + .subscribe({ + next: () => { + accountRequest.status = AccountRequestStatus.APPROVED; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + } + resetAccountRequest(accountRequest: AccountRequestTableRowModel): void { const modalContent = `Are you sure you want to reset the account request for ${accountRequest.name} with email ${accountRequest.email} from diff --git a/src/web/app/components/account-requests-table/account-request-table.module.ts b/src/web/app/components/account-requests-table/account-request-table.module.ts index 1a05086cc4b..f0177f5fdc2 100644 --- a/src/web/app/components/account-requests-table/account-request-table.module.ts +++ b/src/web/app/components/account-requests-table/account-request-table.module.ts @@ -3,7 +3,9 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { NgbTooltipModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableComponent } from './account-request-table.component'; +import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; import { Pipes } from '../../pipes/pipes.module'; +import { RichTextEditorModule } from '../rich-text-editor/rich-text-editor.module'; /** * Module for account requests table. @@ -11,6 +13,7 @@ import { Pipes } from '../../pipes/pipes.module'; @NgModule({ declarations: [ AccountRequestTableComponent, + EditRequestModalComponent, ], exports: [ AccountRequestTableComponent, @@ -21,6 +24,7 @@ import { Pipes } from '../../pipes/pipes.module'; NgbTooltipModule, NgbDropdownModule, Pipes, + RichTextEditorModule, ], }) export class AccountRequestTableModule { } diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts new file mode 100644 index 00000000000..9d5a2ecea2c --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts @@ -0,0 +1,9 @@ +/** + * Result of {@link EditRequestModalComponent} + */ +export interface EditRequestModalComponentResult { + accountRequestName: string; + accountRequestEmail: string; + accountRequestInstitution: string; + accountRequestComment: string; +} diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html new file mode 100644 index 00000000000..a2f65852529 --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html @@ -0,0 +1,34 @@ +
    +
    +
    Edit Account Request for {{ accountRequestName }}
    +
    + +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + +
    diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.scss b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts new file mode 100644 index 00000000000..42b4aec7032 --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts @@ -0,0 +1,40 @@ +import { Component, Input } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { EditRequestModalComponentResult } from './admin-edit-request-modal-model'; + +/** + * Modal to select reject account requests with reason. + */ +@Component({ + selector: 'tm-edit-request-modal', + templateUrl: './admin-edit-request-modal.component.html', + styleUrls: ['./admin-edit-request-modal.component.scss'], +}) + +export class EditRequestModalComponent { + + @Input() + accountRequestName: string = ''; + @Input() + accountRequestEmail: string = ''; + @Input() + accountRequestInstitution: string = ''; + @Input() + accountRequestComments: string = ''; + + constructor(public activeModal: NgbActiveModal) {} + + /** + * Fires the edit event. + */ + edit(): void { + const result: EditRequestModalComponentResult = { + accountRequestName: this.accountRequestName, + accountRequestEmail: this.accountRequestEmail, + accountRequestInstitution: this.accountRequestInstitution, + accountRequestComment: this.accountRequestComments, + }; + + this.activeModal.close(result); + } +} diff --git a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap index 2ffcc3759be..69c6af06b03 100644 --- a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap +++ b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap @@ -507,6 +507,16 @@ exports[`AdminSearchPageComponent should snap with an expanded account requests
    +
    @@ -529,6 +539,12 @@ exports[`AdminSearchPageComponent should snap with an expanded account requests />
    +
    diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html index e6573dbff76..8084c47362c 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html @@ -203,4 +203,4 @@
    - + diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts index 9d0be53a7fd..678d0d13976 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts @@ -495,7 +495,7 @@ describe('AdminSearchPageComponent', () => { it('should show account request links when expand all button clicked', () => { const accountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT; component.accountRequests = [accountRequestResult]; - component.searchQuery = 'test'; // To show the account request table + component.searchString = 'test'; // To show the account request table fixture.detectChanges(); const button: any = fixture.debugElement.nativeElement.querySelector('#show-account-request-links'); @@ -961,7 +961,7 @@ describe('AdminSearchPageComponent', () => { it('should show error message when resetting account request is unsuccessful', () => { component.accountRequests = [DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT]; component.accountRequests[0].registeredAtText = 'Wed, 09 Feb 2022, 10:23 AM +00:00'; - component.searchQuery = 'test'; + component.searchString = 'test'; fixture.detectChanges(); jest.spyOn(ngbModal, 'open').mockImplementation(() => { @@ -988,7 +988,7 @@ describe('AdminSearchPageComponent', () => { it('should show success message when resetting account request is successful', () => { component.accountRequests = [DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT]; component.accountRequests[0].registeredAtText = 'Wed, 09 Feb 2022, 10:23 AM +00:00'; - component.searchQuery = 'test'; + component.searchString = 'test'; fixture.detectChanges(); jest.spyOn(ngbModal, 'open').mockImplementation(() => { diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 8877da6ec29..e6227ab7148 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -11,7 +11,7 @@ import { MessageOutput, AccountRequestStatus, } from '../types/api-output'; -import { AccountCreateRequest } from '../types/api-request'; +import { AccountCreateRequest, AccountRequestUpdateRequest } from '../types/api-request'; /** * Handles account related logic provision @@ -95,6 +95,44 @@ export class AccountService { return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_RESET, paramMap); } + /** + * Approves account request by calling API + */ + approveAccountRequest(id: string, name: string, email: string, institute: string) + : Observable { + const paramMap: Record = { + id, + }; + const accountReqUpdateRequest : AccountRequestUpdateRequest = { + name, + email, + institute, + status: AccountRequestStatus.APPROVED, + }; + + return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); + } + + /** + * Edits an account request by calling API. + */ + editAccountRequest(id: string, name: string, email: string, institute: string, + status: AccountRequestStatus, comments: string) + : Observable { + const paramMap: Record = { + id, + }; + const accountReqUpdateRequest : AccountRequestUpdateRequest = { + name, + email, + institute, + status, + comments, + }; + + return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); + } + /** * Gets an account by calling API. */ diff --git a/src/web/services/search.service.ts b/src/web/services/search.service.ts index fbd95617779..be19f3cd277 100644 --- a/src/web/services/search.service.ts +++ b/src/web/services/search.service.ts @@ -11,6 +11,7 @@ import { ResourceEndpoints } from '../types/api-const'; import { AccountRequest, AccountRequests, + AccountRequestStatus, Course, FeedbackSession, FeedbackSessions, Instructor, @@ -307,7 +308,7 @@ export class SearchService { registeredAtText: '', registrationLink: '', showLinks: false, - status: '', + status: AccountRequestStatus.PENDING, comments: '', }; @@ -474,7 +475,7 @@ export interface AccountRequestSearchResult { id: string; name: string; email: string; - status: string; + status: AccountRequestStatus; institute: string; createdAtText: string; registeredAtText: string | null; From 96e5abdc1419af634eb9ef3c42f52220c287f0ae Mon Sep 17 00:00:00 2001 From: EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:50:56 +0800 Subject: [PATCH 32/95] [#11878] Add AccountRequest Rejection email generator. (#12987) * add rejection-email template and email generator method * add javadoc for email generator method * add test * fix test method names * fix test method name 2 * fix lint * add bcc for rejection email --- .../java/teammates/common/util/EmailType.java | 1 + .../sqllogic/api/SqlEmailGenerator.java | 13 +++++++++ .../sqllogic/api/SqlEmailGeneratorTest.java | 27 +++++++++++++++++++ ...nstructorAccountRequestRejectionEmail.html | 10 +++++++ 4 files changed, 51 insertions(+) create mode 100644 src/test/resources/emails/instructorAccountRequestRejectionEmail.html diff --git a/src/main/java/teammates/common/util/EmailType.java b/src/main/java/teammates/common/util/EmailType.java index 6ee9abcbab9..a42280ba7f0 100644 --- a/src/main/java/teammates/common/util/EmailType.java +++ b/src/main/java/teammates/common/util/EmailType.java @@ -25,6 +25,7 @@ public enum EmailType { STUDENT_COURSE_REJOIN_AFTER_GOOGLE_ID_RESET("TEAMMATES: Your account has been reset for course [%s][Course ID: %s]"), NEW_ACCOUNT_REQUEST_ADMIN_ALERT("TEAMMATES (Action Needed): New Account Request Received"), NEW_ACCOUNT_REQUEST_ACKNOWLEDGEMENT("TEAMMATES: Acknowledgement of Instructor Account Request"), + ACCOUNT_REQUEST_REJECTION("TEAMMATES: %s"), INSTRUCTOR_COURSE_JOIN("TEAMMATES: Invitation to join course as an instructor [%s][Course ID: %s]"), INSTRUCTOR_COURSE_REJOIN_AFTER_GOOGLE_ID_RESET("TEAMMATES: Your account has been reset for course [%s][Course ID: %s]"), USER_COURSE_REGISTER("TEAMMATES: Registered for Course [%s][Course ID: %s]"), diff --git a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java index befe9647656..2fb76991cc6 100644 --- a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java +++ b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java @@ -1029,6 +1029,19 @@ public EmailWrapper generateNewAccountRequestAcknowledgementEmail(AccountRequest return email; } + /** + * Generates the email to be sent to instructor when their account request has been rejected by admin. + */ + public EmailWrapper generateAccountRequestRejectionEmail(AccountRequest accountRequest, String title, String content) { + EmailWrapper email = getEmptyEmailAddressedToEmail(accountRequest.getEmail()); + email.setType(EmailType.ACCOUNT_REQUEST_REJECTION); + email.setBcc(Config.SUPPORT_EMAIL); + email.setSubjectFromType(SanitizationHelper.sanitizeTitle(title)); + email.setContent(SanitizationHelper.sanitizeForRichText(content)); + + return email; + } + /** * Generates the course registered email for the user with the given details in {@code course}. */ diff --git a/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java b/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java index 036ccf4b448..f984b10f46c 100644 --- a/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java +++ b/src/test/java/teammates/sqllogic/api/SqlEmailGeneratorTest.java @@ -62,6 +62,33 @@ void testGenerateNewAccountRequestAcknowledgementEmail_withNoComments_generatesS "/instructorNewAccountRequestAcknowledgementEmailWithNoComments.html"); } + @Test + void testGenerateAccountRequestRejectionEmail_withDefaultReason_generatesSuccessfully() throws IOException { + AccountRequest accountRequest = new AccountRequest("maul@sith.org", "Maul", "Sith Order", + AccountRequestStatus.PENDING, null); + String title = "We are Unable to Create an Account for you"; + String content = new StringBuilder() + .append("

    Hi, Maul

    \n") + .append("

    Thanks for your interest in using TEAMMATES. ") + .append("We are unable to create a TEAMMATES instructor account for you.

    \n\n") + .append("

    \n") + .append(" Reason: The email address you provided ") + .append("is not an 'official' email address provided by your institution.
    \n") + .append(" Remedy: ") + .append("Please re-submit an account request with your 'official' institution email address.\n") + .append("

    \n\n") + .append("

    If you need further clarification or would like to appeal this decision, ") + .append("please feel free to contact us at teammates@comp.nus.edu.sg.

    \n") + .append("

    Regards,
    TEAMMATES Team.

    \n") + .toString(); + + EmailWrapper email = sqlEmailGenerator.generateAccountRequestRejectionEmail(accountRequest, title, content); + verifyEmail(email, "maul@sith.org", EmailType.ACCOUNT_REQUEST_REJECTION, + "TEAMMATES: " + title, + Config.SUPPORT_EMAIL, + "/instructorAccountRequestRejectionEmail.html"); + } + private void verifyEmail(EmailWrapper email, String expectedRecipientEmailAddress, EmailType expectedEmailType, String expectedSubject, String expectedEmailContentFilePathname) throws IOException { assertEquals(expectedRecipientEmailAddress, email.getRecipient()); diff --git a/src/test/resources/emails/instructorAccountRequestRejectionEmail.html b/src/test/resources/emails/instructorAccountRequestRejectionEmail.html new file mode 100644 index 00000000000..57ae404c7e4 --- /dev/null +++ b/src/test/resources/emails/instructorAccountRequestRejectionEmail.html @@ -0,0 +1,10 @@ +

    Hi, Maul

    +

    Thanks for your interest in using TEAMMATES. We are unable to create a TEAMMATES instructor account for you.

    + +

    + Reason: The email address you provided is not an 'official' email address provided by your institution.
    + Remedy: Please re-submit an account request with your 'official' institution email address. +

    + +

    If you need further clarification or would like to appeal this decision, please feel free to contact us at teammates@comp.nus.edu.sg.

    +

    Regards,
    TEAMMATES Team.

    From 1e9ccb091fac81793a93c460e017c076b797c66b Mon Sep 17 00:00:00 2001 From: Xenos F Date: Tue, 9 Apr 2024 02:59:23 +0800 Subject: [PATCH 33/95] [#12048] Migrate AccountRequestsLogicTest (#12780) * Migrate test cases for AccountRequestsLogic * Remove test case * Split test cases --- .../core/AccountRequestsLogicTest.java | 177 ++++++++++++++++++ .../java/teammates/test/BaseTestCase.java | 5 + 2 files changed, 182 insertions(+) create mode 100644 src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java diff --git a/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java b/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java new file mode 100644 index 00000000000..aca37f99963 --- /dev/null +++ b/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java @@ -0,0 +1,177 @@ +package teammates.sqllogic.core; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.EntityDoesNotExistException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.storage.sqlapi.AccountRequestsDb; +import teammates.storage.sqlentity.AccountRequest; +import teammates.test.BaseTestCase; + +/** + * SUT: {@link AccountRequestsLogic}. + */ +public class AccountRequestsLogicTest extends BaseTestCase { + + private final AccountRequestsLogic arLogic = AccountRequestsLogic.inst(); + private AccountRequestsDb arDb; + + @BeforeMethod + public void setUpMethod() { + arDb = mock(AccountRequestsDb.class); + arLogic.initLogicDependencies(arDb); + } + + @Test + public void testCreateAccountRequest_typicalRequest_success() throws Exception { + AccountRequest accountRequest = getTypicalAccountRequest(); + when(arDb.createAccountRequest(accountRequest)).thenReturn(accountRequest); + AccountRequest createdAccountRequest = arLogic.createAccountRequest(accountRequest); + + assertEquals(accountRequest, createdAccountRequest); + verify(arDb, times(1)).createAccountRequest(accountRequest); + } + + @Test + public void testCreateAccountRequest_requestAlreadyExists_failure() throws Exception { + AccountRequest duplicateAccountRequest = getTypicalAccountRequest(); + when(arDb.createAccountRequest(duplicateAccountRequest)) + .thenThrow(new EntityAlreadyExistsException("test exception")); + + assertThrows(EntityAlreadyExistsException.class, () -> { + arLogic.createAccountRequest(duplicateAccountRequest); + }); + verify(arDb, times(1)).createAccountRequest(duplicateAccountRequest); + } + + @Test + public void testCreateAccountRequest_invalidParams_failure() throws Exception { + AccountRequest invalidEmailAccountRequest = getTypicalAccountRequest(); + invalidEmailAccountRequest.setEmail("invalid email"); + when(arDb.createAccountRequest(invalidEmailAccountRequest)) + .thenThrow(new InvalidParametersException("test exception")); + + assertThrows(InvalidParametersException.class, () -> { + arLogic.createAccountRequest(invalidEmailAccountRequest); + }); + verify(arDb, times(1)).createAccountRequest(invalidEmailAccountRequest); + } + + @Test + public void testUpdateAccountRequest_typicalRequest_success() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest ar = getTypicalAccountRequest(); + when(arDb.updateAccountRequest(ar)).thenReturn(ar); + AccountRequest updatedAr = arLogic.updateAccountRequest(ar); + + assertEquals(ar, updatedAr); + verify(arDb, times(1)).updateAccountRequest(ar); + } + + @Test + public void testUpdateAccountRequest_requestNotFound_failure() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest arNotFound = getTypicalAccountRequest(); + when(arDb.updateAccountRequest(arNotFound)).thenThrow(new EntityDoesNotExistException("test message")); + + assertThrows(EntityDoesNotExistException.class, + () -> arLogic.updateAccountRequest(arNotFound)); + verify(arDb, times(1)).updateAccountRequest(any(AccountRequest.class)); + } + + @Test + public void testDeleteAccountRequest_typicalRequest_success() { + AccountRequest ar = getTypicalAccountRequest(); + when(arDb.getAccountRequest(ar.getEmail(), ar.getInstitute())).thenReturn(ar); + arLogic.deleteAccountRequest(ar.getEmail(), ar.getInstitute()); + + verify(arDb, times(1)).deleteAccountRequest(any(AccountRequest.class)); + } + + @Test + public void testDeleteAccountRequest_nonexistentRequest_shouldSilentlyDelete() { + arLogic.deleteAccountRequest("not_exist", "not_exist"); + + verify(arDb, times(1)).deleteAccountRequest(nullable(AccountRequest.class)); + } + + @Test + public void testGetAccountRequestByRegistrationKey_typicalRequest_success() { + AccountRequest ar = getTypicalAccountRequest(); + String regkey = "regkey"; + ar.setRegistrationKey(regkey); + when(arDb.getAccountRequestByRegistrationKey(regkey)).thenReturn(ar); + AccountRequest actualAr = + arLogic.getAccountRequestByRegistrationKey(ar.getRegistrationKey()); + + assertEquals(ar, actualAr); + verify(arDb, times(1)).getAccountRequestByRegistrationKey(regkey); + } + + @Test + public void testGetAccountRequestByRegistrationKey_nonexistentRequest_shouldReturnNull() throws Exception { + String nonexistentRegkey = "not_exist"; + when(arDb.getAccountRequestByRegistrationKey(nonexistentRegkey)).thenReturn(null); + + assertNull(arLogic.getAccountRequestByRegistrationKey(nonexistentRegkey)); + verify(arDb, times(1)).getAccountRequestByRegistrationKey(nonexistentRegkey); + } + + @Test + public void testGetAccountRequest_typicalRequest_success() { + AccountRequest expectedAr = getTypicalAccountRequest(); + when(arDb.getAccountRequest(expectedAr.getEmail(), expectedAr.getInstitute())).thenReturn(expectedAr); + AccountRequest actualAr = + arLogic.getAccountRequest(expectedAr.getEmail(), expectedAr.getInstitute()); + + assertEquals(expectedAr, actualAr); + verify(arDb, times(1)).getAccountRequest(expectedAr.getEmail(), expectedAr.getInstitute()); + } + + @Test + public void testGetAccountRequest_nonexistentRequest_shouldReturnNull() { + String nonexistentEmail = "not-found@test.com"; + String nonexistentInstitute = "not-found"; + when(arDb.getAccountRequest(nonexistentEmail, nonexistentInstitute)).thenReturn(null); + + assertNull(arLogic.getAccountRequest(nonexistentEmail, nonexistentInstitute)); + verify(arDb, times(1)).getAccountRequest(nonexistentEmail, nonexistentInstitute); + } + + @Test + public void testResetAccountRequest_typicalRequest_success() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest accountRequest = getTypicalAccountRequest(); + accountRequest.setRegisteredAt(Const.TIME_REPRESENTS_NOW); + when(arDb.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute())) + .thenReturn(accountRequest); + when(arDb.updateAccountRequest(accountRequest)).thenReturn(accountRequest); + accountRequest = arLogic.resetAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); + + assertNull(accountRequest.getRegisteredAt()); + verify(arDb, times(1)).getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); + } + + @Test + public void testResetAccountRequest_nonexistentRequest_failure() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest accountRequest = getTypicalAccountRequest(); + accountRequest.setRegisteredAt(Const.TIME_REPRESENTS_NOW); + when(arDb.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute())) + .thenReturn(null); + assertThrows(EntityDoesNotExistException.class, + () -> arLogic.resetAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute())); + verify(arDb, times(1)).getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); + verify(arDb, times(0)).updateAccountRequest(nullable(AccountRequest.class)); + } +} diff --git a/src/test/java/teammates/test/BaseTestCase.java b/src/test/java/teammates/test/BaseTestCase.java index a7744061d55..ffe08b21813 100644 --- a/src/test/java/teammates/test/BaseTestCase.java +++ b/src/test/java/teammates/test/BaseTestCase.java @@ -29,6 +29,7 @@ import teammates.common.util.TimeHelperExtension; import teammates.sqllogic.core.DataBundleLogic; import teammates.storage.sqlentity.Account; +import teammates.storage.sqlentity.AccountRequest; import teammates.storage.sqlentity.Course; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; @@ -206,6 +207,10 @@ protected FeedbackResponseComment getTypicalResponseComment(Long id) { return comment; } + protected AccountRequest getTypicalAccountRequest() { + return new AccountRequest("valid@test.com", "Test account Name", "TEAMMATES Test Institute 1"); + } + /** * Populates the feedback question and response IDs within the data bundle. * From 84ed244ade96870b71346808916568ae41b64b92 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Tue, 9 Apr 2024 03:39:55 +0800 Subject: [PATCH 34/95] [#12048] Migrate AdminSearchPageE2ETest SQL (#12811) * test e2e changes * fix: reduce e2e test json file size * fix student key * fix course key * fix instructor keys * fix filepath * fix e2e test * remove extra data from bundle * Add correct removal logic to avoid constraint violation * Fix e2e tests and lint fix reset google id test fix e2e tests fix e2e tests fix tests remove double click fix unknown symbol add toast check change toast verification message remove toast check * fix: add null check * move admin search page e2e test to sql cases * Rename AdminSearchPageE2ETest_SQLEntities.json to AdminSearchPageE2ETest_SqlEntities.json * fix failing test * fix: remove extra null check * fix: add test to e2e sql xml file * fix function call * remove unnecessary changes * create new file for sql entities * revert unnecessary changes * remove trailing whitespace * add teardown for account requests --------- Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> --- .../e2e/cases/AdminSearchPageE2ETest.java | 2 +- .../e2e/cases/axe/AdminSearchPageAxeTest.java | 2 +- .../e2e/cases/sql/AdminSearchPageE2ETest.java | 185 +++++++++++++ .../e2e/cases/sql/BaseE2ETestCase.java | 14 + .../e2e/pageobjects/AdminSearchPage.java | 246 +++++++++++++++++- .../data/AdminSearchPageE2ESqlTest.json | 118 +++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + .../sqllogic/api/SqlEmailGenerator.java | 8 +- 8 files changed, 565 insertions(+), 11 deletions(-) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java create mode 100644 src/e2e/resources/data/AdminSearchPageE2ESqlTest.json diff --git a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java index b5ce80693f0..b73e82c0808 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java @@ -31,7 +31,7 @@ protected void prepareTestData() { putDocuments(testData); sqlTestData = loadSqlDataBundle("/AdminSearchPageE2ETest_SqlEntities.json"); removeAndRestoreSqlDataBundle(sqlTestData); - doPutDocumentsSql(sqlTestData); + putSqlDocuments(sqlTestData); } @Test diff --git a/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java b/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java index d45e1d4e16a..732e06ceed3 100644 --- a/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java +++ b/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java @@ -25,7 +25,7 @@ protected void prepareTestData() { putDocuments(testData); sqlTestData = loadSqlDataBundle("/AdminSearchPageE2ETest_SqlEntities.json"); removeAndRestoreSqlDataBundle(sqlTestData); - doPutDocumentsSql(sqlTestData); + putSqlDocuments(sqlTestData); } @Test diff --git a/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java new file mode 100644 index 00000000000..780b0f212fd --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java @@ -0,0 +1,185 @@ +package teammates.e2e.cases.sql; + +import java.time.Instant; + +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.AdminSearchPage; +import teammates.e2e.util.TestProperties; +import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#ADMIN_SEARCH_PAGE}. + */ +public class AdminSearchPageE2ETest extends BaseE2ETestCase { + + @Override + protected void prepareTestData() { + if (!TestProperties.INCLUDE_SEARCH_TESTS) { + return; + } + testData = removeAndRestoreDataBundle(loadSqlDataBundle("/AdminSearchPageE2ESqlTest.json")); + putDocuments(testData); + } + + @Test + @Override + public void testAll() { + if (!TestProperties.INCLUDE_SEARCH_TESTS) { + return; + } + + AppUrl url = createFrontendUrl(Const.WebPageURIs.ADMIN_SEARCH_PAGE); + AdminSearchPage searchPage = loginAdminToPage(url, AdminSearchPage.class); + + Course course = testData.courses.get("typicalCourse1"); + Student student = testData.students.get("student1InCourse1"); + Instructor instructor = testData.instructors.get("instructor1OfCourse1"); + AccountRequest accountRequest = testData.accountRequests.get("instructor1OfCourse1"); + + ______TS("Typical case: Search student email"); + String searchContent = student.getEmail(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + String studentDetails = getExpectedStudentDetails(student); + String studentManageAccountLink = getExpectedStudentManageAccountLink(student); + String studentHomePageLink = getExpectedStudentHomePageLink(student); + int numExpandedRows = getExpectedNumExpandedRows(student); + searchPage.verifyStudentRowContent(student, course, studentDetails, studentManageAccountLink, + studentHomePageLink); + searchPage.verifyStudentExpandedLinks(student, numExpandedRows); + + ______TS("Typical case: Reset student google id"); + searchPage.resetStudentGoogleId(student); + student.setGoogleId(null); + searchPage.verifyStudentRowContentAfterReset(student, course); + + ______TS("Typical case: Regenerate registration key for a course student"); + searchPage.clickExpandStudentLinks(); + String originalJoinLink = searchPage.getStudentJoinLink(student); + searchPage.regenerateStudentKey(student); + searchPage.verifyRegenerateStudentKey(student, originalJoinLink); + searchPage.waitForPageToLoad(); + + ______TS("Typical case: Search for instructor email"); + searchPage.clearSearchBox(); + searchContent = instructor.getEmail(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + String instructorManageAccountLink = getExpectedInstructorManageAccountLink(instructor); + String instructorHomePageLink = getExpectedInstructorHomePageLink(instructor); + searchPage.verifyInstructorRowContent(instructor, course, instructorManageAccountLink, + instructorHomePageLink); + searchPage.verifyInstructorExpandedLinks(instructor); + + ______TS("Typical case: Reset instructor google id"); + searchPage.resetInstructorGoogleId(instructor); + searchPage.verifyInstructorRowContentAfterReset(instructor, course); + + ______TS("Typical case: Regenerate registration key for an instructor"); + searchPage.clickExpandInstructorLinks(); + originalJoinLink = searchPage.getInstructorJoinLink(instructor); + searchPage.regenerateInstructorKey(instructor); + searchPage.verifyRegenerateInstructorKey(instructor, originalJoinLink); + searchPage.waitForPageToLoad(); + + ______TS("Typical case: Search for account request by email"); + searchPage.clearSearchBox(); + searchContent = accountRequest.getEmail(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.verifyAccountRequestRowContent(accountRequest); + searchPage.verifyAccountRequestExpandedLinks(accountRequest); + + ______TS("Typical case: Search common search key"); + searchPage.clearSearchBox(); + searchContent = "Course1"; + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.verifyStudentRowContentAfterReset(student, course); + searchPage.verifyInstructorRowContentAfterReset(instructor, course); + searchPage.verifyAccountRequestRowContent(accountRequest); + + ______TS("Typical case: Expand and collapse links"); + searchPage.verifyLinkExpansionButtons(student, instructor, accountRequest); + + ______TS("Typical case: Reset account request successful"); + searchContent = "ASearch.instructor1@gmail.tmt"; + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickResetAccountRequestButton(accountRequest); + assertNull(BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()).getRegisteredAt()); + + ______TS("Typical case: Delete account request successful"); + accountRequest = testData.accountRequests.get("unregisteredInstructor1"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickDeleteAccountRequestButton(accountRequest); + assertNull(BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute())); + } + + private String getExpectedStudentDetails(Student student) { + return String.format("%s [%s] (%s)", student.getCourse().getId(), + student.getSection() == null + ? Const.DEFAULT_SECTION + : student.getSection().getName(), student.getTeam().getName()); + } + + private String getExpectedStudentHomePageLink(Student student) { + return student.isRegistered() ? createFrontendUrl(Const.WebPageURIs.STUDENT_HOME_PAGE) + .withUserId(student.getGoogleId()) + .toAbsoluteString() + : ""; + } + + private String getExpectedStudentManageAccountLink(Student student) { + return student.isRegistered() ? createFrontendUrl(Const.WebPageURIs.ADMIN_ACCOUNTS_PAGE) + .withParam(Const.ParamsNames.INSTRUCTOR_ID, student.getGoogleId()) + .toAbsoluteString() + : ""; + } + + private int getExpectedNumExpandedRows(Student student) { + int expectedNumExpandedRows = 2; + for (FeedbackSession sessions : testData.feedbackSessions.values()) { + if (sessions.getCourse().equals(student.getCourse())) { + expectedNumExpandedRows += 1; + if (sessions.getResultsVisibleFromTime().isBefore(Instant.now())) { + expectedNumExpandedRows += 1; + } + } + } + return expectedNumExpandedRows; + } + + private String getExpectedInstructorHomePageLink(Instructor instructor) { + String googleId = instructor.isRegistered() ? instructor.getGoogleId() : ""; + return createFrontendUrl(Const.WebPageURIs.INSTRUCTOR_HOME_PAGE) + .withUserId(googleId) + .toAbsoluteString(); + } + + private String getExpectedInstructorManageAccountLink(Instructor instructor) { + String googleId = instructor.isRegistered() ? instructor.getGoogleId() : ""; + return createFrontendUrl(Const.WebPageURIs.ADMIN_ACCOUNTS_PAGE) + .withParam(Const.ParamsNames.INSTRUCTOR_ID, googleId) + .toAbsoluteString(); + } + + @AfterClass + public void classTeardown() { + for (AccountRequest request : testData.accountRequests.values()) { + BACKDOOR.deleteAccountRequest(request.getEmail(), request.getInstitute()); + } + } +} diff --git a/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java b/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java index b61a4a8cf2a..fbfd60ea84b 100644 --- a/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java +++ b/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java @@ -265,4 +265,18 @@ StudentData getStudent(String courseId, String studentEmailAddress) { protected StudentData getStudent(Student student) { return getStudent(student.getCourseId(), student.getEmail()); } + + /** + * Puts the documents in the database using BACKDOOR. + * @param dataBundle the data to be put in the database + * @return the result of the operation + */ + protected String putDocuments(SqlDataBundle dataBundle) { + try { + return BACKDOOR.putSqlDocuments(dataBundle); + } catch (HttpRequestFailedException e) { + e.printStackTrace(); + return null; + } + } } diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java index 706e9ab5a20..005b98a026b 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java @@ -18,6 +18,9 @@ import teammates.common.util.Const; import teammates.common.util.StringHelper; import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; /** * Represents the admin home page of the website. @@ -93,6 +96,14 @@ public void clickSearchButton() { waitForPageToLoad(); } + public void regenerateStudentKey(Student student) { + WebElement studentRow = getStudentRow(student); + studentRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); + + waitForConfirmationModalAndClickOk(); + waitForPageToLoad(true); + } + public void regenerateStudentKey(StudentAttributes student) { WebElement studentRow = getStudentRow(student); studentRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); @@ -101,6 +112,30 @@ public void regenerateStudentKey(StudentAttributes student) { waitForPageToLoad(true); } + public void verifyRegenerateStudentKey(Student student, String originalJoinLink) { + verifyStatusMessage("Student's key for this course has been successfully regenerated," + + " and the email has been sent."); + + String regeneratedJoinLink = getStudentJoinLink(student); + assertNotEquals(regeneratedJoinLink, originalJoinLink); + } + + public void verifyRegenerateStudentKey(StudentAttributes student, String originalJoinLink) { + verifyStatusMessage("Student's key for this course has been successfully regenerated," + + " and the email has been sent."); + + String regeneratedJoinLink = getStudentJoinLink(student); + assertNotEquals(regeneratedJoinLink, originalJoinLink); + } + + public void regenerateInstructorKey(Instructor instructor) { + WebElement instructorRow = getInstructorRow(instructor); + instructorRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); + + waitForConfirmationModalAndClickOk(); + waitForPageToLoad(true); + } + public void regenerateInstructorKey(InstructorAttributes instructor) { WebElement instructorRow = getInstructorRow(instructor); instructorRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); @@ -143,6 +178,25 @@ public String removeSpanFromText(String text) { return text.replace("", "").replace("", ""); } + public WebElement getStudentRow(Student student) { + String details = String.format("%s [%s] (%s)", student.getCourse().getId(), + student.getSection() == null + ? Const.DEFAULT_SECTION + : student.getSection().getName(), student.getTeam().getName()); + WebElement table = browser.driver.findElement(By.id("search-table-student")); + List rows = table.findElements(By.tagName("tr")); + for (WebElement row : rows) { + List columns = row.findElements(By.tagName("td")); + if (!columns.isEmpty() && removeSpanFromText(columns.get(STUDENT_COL_DETAILS - 1) + .getAttribute("innerHTML")).contains(details) + && removeSpanFromText(columns.get(STUDENT_COL_NAME - 1) + .getAttribute("innerHTML")).contains(student.getName())) { + return row; + } + } + return null; + } + public WebElement getStudentRow(StudentAttributes student) { String details = String.format("%s [%s] (%s)", student.getCourse(), student.getSection() == null ? Const.DEFAULT_SECTION : student.getSection(), student.getTeam()); @@ -195,11 +249,25 @@ public String getStudentJoinLink(WebElement studentRow) { return getExpandedRowInputValue(studentRow, EXPANDED_ROWS_HEADER_COURSE_JOIN_LINK); } + public String getStudentJoinLink(Student student) { + WebElement studentRow = getStudentRow(student); + return getStudentJoinLink(studentRow); + } + public String getStudentJoinLink(StudentAttributes student) { WebElement studentRow = getStudentRow(student); return getStudentJoinLink(studentRow); } + public void resetStudentGoogleId(Student student) { + WebElement studentRow = getStudentRow(student); + WebElement link = studentRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); + link.click(); + + waitForConfirmationModalAndClickOk(); + waitForElementStaleness(link); + } + public void resetStudentGoogleId(StudentAttributes student) { WebElement studentRow = getStudentRow(student); WebElement link = studentRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); @@ -209,6 +277,21 @@ public void resetStudentGoogleId(StudentAttributes student) { waitForElementStaleness(link); } + public WebElement getInstructorRow(Instructor instructor) { + WebElement table = browser.driver.findElement(By.id("search-table-instructor")); + List rows = table.findElements(By.tagName("tr")); + for (WebElement row : rows) { + List columns = row.findElements(By.tagName("td")); + if (columns.size() >= 3 && (removeSpanFromText(columns.get(2) + .getAttribute("innerHTML")).contains(instructor.getGoogleId()) + || removeSpanFromText(columns.get(1) + .getAttribute("innerHTML")).contains(instructor.getName()))) { + return row; + } + } + return null; + } + public WebElement getInstructorRow(InstructorAttributes instructor) { String courseId = instructor.getCourseId(); List rows = browser.driver.findElements(By.cssSelector("#search-table-instructor tbody tr")); @@ -256,11 +339,25 @@ public String getInstructorJoinLink(WebElement instructorRow) { return getExpandedRowInputValue(instructorRow, EXPANDED_ROWS_HEADER_COURSE_JOIN_LINK); } + public String getInstructorJoinLink(Instructor instructor) { + WebElement instructorRow = getInstructorRow(instructor); + return getInstructorJoinLink(instructorRow); + } + public String getInstructorJoinLink(InstructorAttributes instructor) { WebElement instructorRow = getInstructorRow(instructor); return getInstructorJoinLink(instructorRow); } + public void resetInstructorGoogleId(Instructor instructor) { + WebElement instructorRow = getInstructorRow(instructor); + WebElement link = instructorRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); + link.click(); + + waitForConfirmationModalAndClickOk(); + waitForElementStaleness(link); + } + public void resetInstructorGoogleId(InstructorAttributes instructor) { WebElement instructorRow = getInstructorRow(instructor); WebElement link = instructorRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); @@ -386,6 +483,32 @@ private String getExpandedRowInputValue(WebElement row, String rowHeader) { } } + public void verifyStudentRowContent(Student student, Course course, + String expectedDetails, String expectedManageAccountLink, + String expectedHomePageLink) { + WebElement studentRow = getStudentRow(student); + String actualDetails = getStudentDetails(studentRow); + String actualName = getStudentName(studentRow); + String actualGoogleId = getStudentGoogleId(studentRow); + String actualHomepageLink = getStudentHomeLink(studentRow); + String actualInstitute = getStudentInstitute(studentRow); + String actualComment = getStudentComments(studentRow); + String actualManageAccountLink = getStudentManageAccountLink(studentRow); + + String expectedName = student.getName(); + String expectedGoogleId = StringHelper.convertToEmptyStringIfNull(student.getGoogleId()); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + String expectedComment = StringHelper.convertToEmptyStringIfNull(student.getComments()); + + assertEquals(expectedDetails, actualDetails); + assertEquals(expectedName, actualName); + assertEquals(expectedGoogleId, actualGoogleId); + assertEquals(expectedInstitute, actualInstitute); + assertEquals(expectedComment, actualComment); + assertEquals(expectedManageAccountLink, actualManageAccountLink); + assertEquals(expectedHomePageLink, actualHomepageLink); + } + public void verifyStudentRowContent(StudentAttributes student, CourseAttributes course, String expectedDetails, String expectedManageAccountLink, String expectedHomePageLink) { @@ -412,6 +535,35 @@ public void verifyStudentRowContent(StudentAttributes student, CourseAttributes assertEquals(expectedHomePageLink, actualHomepageLink); } + public void verifyStudentRowContentAfterReset(Student student, Course course) { + WebElement studentRow = getStudentRow(student); + String actualName = getStudentName(studentRow); + String actualInstitute = getStudentInstitute(studentRow); + String actualComment = getStudentComments(studentRow); + + String expectedName = student.getName(); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + String expectedComment = StringHelper.convertToEmptyStringIfNull(student.getComments()); + + assertEquals(expectedName, actualName); + assertEquals(expectedInstitute, actualInstitute); + assertEquals(expectedComment, actualComment); + } + + public void verifyStudentExpandedLinks(Student student, int expectedNumExpandedRows) { + clickExpandStudentLinks(); + WebElement studentRow = getStudentRow(student); + String actualEmail = getStudentEmail(studentRow); + String actualJoinLink = getStudentJoinLink(studentRow); + int actualNumExpandedRows = getNumExpandedRows(studentRow); + + String expectedEmail = student.getEmail(); + + assertEquals(expectedEmail, actualEmail); + assertNotEquals("", actualJoinLink); + assertEquals(expectedNumExpandedRows, actualNumExpandedRows); + } + public void verifyStudentExpandedLinks(StudentAttributes student, int expectedNumExpandedRows) { clickExpandStudentLinks(); WebElement studentRow = getStudentRow(student); @@ -426,6 +578,29 @@ public void verifyStudentExpandedLinks(StudentAttributes student, int expectedNu assertEquals(expectedNumExpandedRows, actualNumExpandedRows); } + public void verifyInstructorRowContent(Instructor instructor, Course course, + String expectedManageAccountLink, String expectedHomePageLink) { + WebElement instructorRow = getInstructorRow(instructor); + String actualCourseId = getInstructorCourseId(instructorRow); + String actualName = getInstructorName(instructorRow); + String actualGoogleId = getInstructorGoogleId(instructorRow); + String actualHomePageLink = getInstructorHomePageLink(instructorRow); + String actualInstitute = getInstructorInstitute(instructorRow); + String actualManageAccountLink = getInstructorManageAccountLink(instructorRow); + + String expectedCourseId = instructor.getCourseId(); + String expectedName = instructor.getName(); + String expectedGoogleId = StringHelper.convertToEmptyStringIfNull(instructor.getGoogleId()); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + + assertEquals(expectedCourseId, actualCourseId); + assertEquals(expectedName, actualName); + assertEquals(expectedGoogleId, actualGoogleId); + assertEquals(expectedHomePageLink, actualHomePageLink); + assertEquals(expectedInstitute, actualInstitute); + assertEquals(expectedManageAccountLink, actualManageAccountLink); + } + public void verifyInstructorRowContent(InstructorAttributes instructor, CourseAttributes course, String expectedManageAccountLink, String expectedHomePageLink) { WebElement instructorRow = getInstructorRow(instructor); @@ -449,6 +624,33 @@ public void verifyInstructorRowContent(InstructorAttributes instructor, CourseAt assertEquals(expectedManageAccountLink, actualManageAccountLink); } + public void verifyInstructorRowContentAfterReset(Instructor instructor, Course course) { + WebElement instructorRow = getInstructorRow(instructor); + String actualCourseId = getInstructorCourseId(instructorRow); + String actualName = getInstructorName(instructorRow); + String actualInstitute = getInstructorInstitute(instructorRow); + + String expectedCourseId = instructor.getCourseId(); + String expectedName = instructor.getName(); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + + assertEquals(expectedCourseId, actualCourseId); + assertEquals(expectedName, actualName); + assertEquals(expectedInstitute, actualInstitute); + } + + public void verifyInstructorExpandedLinks(Instructor instructor) { + clickExpandInstructorLinks(); + WebElement instructorRow = getInstructorRow(instructor); + String actualEmail = getInstructorEmail(instructorRow); + String actualJoinLink = getInstructorJoinLink(instructorRow); + + String expectedEmail = instructor.getEmail(); + + assertEquals(expectedEmail, actualEmail); + assertNotEquals("", actualJoinLink); + } + public void verifyInstructorExpandedLinks(InstructorAttributes instructor) { clickExpandInstructorLinks(); WebElement instructorRow = getInstructorRow(instructor); @@ -515,6 +717,43 @@ public void verifyAccountRequestExpandedLinks(AccountRequest accountRequest) { assertFalse(actualRegistrationLink.isBlank()); } + public void verifyLinkExpansionButtons(Student student, + Instructor instructor, AccountRequest accountRequest) { + WebElement studentRow = getStudentRow(student); + WebElement instructorRow = getInstructorRow(instructor); + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + + clickExpandStudentLinks(); + clickExpandInstructorLinks(); + clickExpandAccountRequestLinks(); + int numExpandedStudentRows = getNumExpandedRows(studentRow); + int numExpandedInstructorRows = getNumExpandedRows(instructorRow); + int numExpandedAccountRequestRows = getNumExpandedRows(accountRequestRow); + assertNotEquals(numExpandedStudentRows, 0); + assertNotEquals(numExpandedInstructorRows, 0); + assertNotEquals(numExpandedAccountRequestRows, 0); + + clickCollapseInstructorLinks(); + numExpandedStudentRows = getNumExpandedRows(studentRow); + numExpandedInstructorRows = getNumExpandedRows(instructorRow); + numExpandedAccountRequestRows = getNumExpandedRows(accountRequestRow); + assertNotEquals(numExpandedStudentRows, 0); + assertEquals(numExpandedInstructorRows, 0); + assertNotEquals(numExpandedAccountRequestRows, 0); + + clickExpandInstructorLinks(); + clickCollapseStudentLinks(); + clickCollapseAccountRequestLinks(); + waitUntilAnimationFinish(); + + numExpandedStudentRows = getNumExpandedRows(studentRow); + numExpandedInstructorRows = getNumExpandedRows(instructorRow); + numExpandedAccountRequestRows = getNumExpandedRows(accountRequestRow); + assertEquals(numExpandedStudentRows, 0); + assertNotEquals(numExpandedInstructorRows, 0); + assertEquals(numExpandedAccountRequestRows, 0); + } + public void verifyLinkExpansionButtons(StudentAttributes student, InstructorAttributes instructor, AccountRequestAttributes accountRequest) { WebElement studentRow = getStudentRow(student); @@ -589,11 +828,11 @@ public void verifyLinkExpansionButtons(StudentAttributes student, assertEquals(numExpandedAccountRequestRows, 0); } - public void verifyRegenerateStudentKey(StudentAttributes student, String originalJoinLink) { - verifyStatusMessage("Student's key for this course has been successfully regenerated," + public void verifyRegenerateInstructorKey(Instructor instructor, String originalJoinLink) { + verifyStatusMessage("Instructor's key for this course has been successfully regenerated," + " and the email has been sent."); - String regeneratedJoinLink = getStudentJoinLink(student); + String regeneratedJoinLink = getInstructorJoinLink(instructor); assertNotEquals(regeneratedJoinLink, originalJoinLink); } @@ -604,5 +843,4 @@ public void verifyRegenerateInstructorKey(InstructorAttributes instructor, Strin String regeneratedJoinLink = getInstructorJoinLink(instructor); assertNotEquals(regeneratedJoinLink, originalJoinLink); } - } diff --git a/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json b/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json new file mode 100644 index 00000000000..94b28ae6ad2 --- /dev/null +++ b/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json @@ -0,0 +1,118 @@ +{ + "accounts": { + "instructor1OfCourse1": { + "id": "00000000-0000-4000-8000-000000000001", + "googleId": "tm.e2e.ASearch.instr1", + "name": "Instructor1 of Course1", + "email": "ASearch.instructor1@gmail.tmt" + }, + "instructor2OfCourse1": { + "id": "00000000-0000-4000-8000-000000000002", + "googleId": "tm.e2e.ASearch.instr2", + "name": "Instructor2 of Course1", + "email": "ASearch.instructor2@gmail.tmt" + }, + "student1InCourse1": { + "id": "00000000-0000-4000-8000-000000000003", + "googleId": "tm.e2e.ASearch.student1", + "name": "Student1 in course1", + "email": "ASearch.student@gmail.tmt" + } + }, + "accountRequests": { + "instructor1OfCourse1": { + "name": "Instructor1 of Course1", + "email": "ASearch.instructor1@gmail.tmt", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2011-01-01T00:00:00Z", + "registeredAt": "1970-02-14T00:00:00Z" + }, + "instructor2OfCourse1": { + "name": "Instructor2 of Course1", + "email": "ASearch.instructor2@gmail.tmt", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2011-01-01T00:00:00Z", + "registeredAt": "1970-02-14T00:00:00Z" + }, + "unregisteredInstructor1": { + "name": "Typical Instructor Name", + "email": "ASearch.unregisteredinstructor1@gmail.tmt", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2011-01-01T00:00:00Z" + } + }, + "courses": { + "typicalCourse1": { + "createdAt": "2012-04-01T23:59:00Z", + "id": "00000000-0000-4000-8000-000000000303", + "name": "ASearch Course 1", + "institute": "TEAMMATES Test Institute 0", + "timeZone": "Africa/Johannesburg" + } + }, + "sections": { + "section1InCourse1": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Section 1" + } + }, + "teams": { + "team1InCourse1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + } + }, + "instructors": { + "instructor1OfCourse1": { + "id": "00000000-0000-4000-8000-000000000501", + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "course": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Instructor1 of ASearch Course1", + "email": "ASearch.instructor@gmail.tmt", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "isDisplayedToStudents": true, + "displayName": "Instructor", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + } + } + }, + "students": { + "student1InCourse1": { + "id": "00000000-0000-4000-8000-000000000601", + "account": { + "id": "00000000-0000-4000-8000-000000000003" + }, + "course": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "email": "ASearch.student@gmail.tmt", + "name": "Student1 In ASearch Course1", + "comments": "comment for student1Course1" + } + } +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index 78dcc2d13a1..40e4bedfad9 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -11,6 +11,7 @@ + diff --git a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java index 2bd8f2bfb08..50add8e08ff 100644 --- a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java +++ b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java @@ -256,12 +256,10 @@ public EmailWrapper generateFeedbackSessionSummaryOfCourse( Course course = coursesLogic.getCourse(courseId); boolean isInstructor = emailType == EmailType.INSTRUCTOR_COURSE_LINKS_REGENERATED; - Student student = null; + Student student = usersLogic.getStudentForEmail(courseId, userEmail); Instructor instructor = null; if (isInstructor) { instructor = usersLogic.getInstructorForEmail(courseId, userEmail); - } else { - student = usersLogic.getStudentForEmail(courseId, userEmail); } List sessions = new ArrayList<>(); @@ -868,11 +866,11 @@ private EmailWrapper generateFeedbackSessionEmailBaseForNotifiedInstructors( } private boolean isYetToJoinCourse(Student student) { - return student.getAccount().getGoogleId() == null || student.getAccount().getGoogleId().isEmpty(); + return student.getAccount() == null || student.getAccount().getGoogleId().isEmpty(); } private boolean isYetToJoinCourse(Instructor instructor) { - return instructor.getAccount().getGoogleId() == null || instructor.getAccount().getGoogleId().isEmpty(); + return instructor.getAccount() == null || instructor.getAccount().getGoogleId().isEmpty(); } /** From db0fd945b9fd03584fcac0cef53585373a02eca7 Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Tue, 9 Apr 2024 04:28:02 +0800 Subject: [PATCH 35/95] [#12995] Create documentation for unit tests (#12996) * Create documentation for unit tests * Update docs/unit-testing.md Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * Update docs/unit-testing.md Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> --------- Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> --- docs/_markbind/layouts/default.md | 1 + docs/development.md | 6 +- docs/unit-testing.md | 206 ++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 docs/unit-testing.md diff --git a/docs/_markbind/layouts/default.md b/docs/_markbind/layouts/default.md index f92791366a0..e57ee418a49 100644 --- a/docs/_markbind/layouts/default.md +++ b/docs/_markbind/layouts/default.md @@ -27,6 +27,7 @@ * [Captcha]({{ baseUrl }}/captcha.html) * [Documentation]({{ baseUrl }}/documentation.html) * [Emails]({{ baseUrl }}/emails.html) + * [Unit Testing]({{ baseUrl }}/unit-testing.html) * [End-to-End Testing]({{ baseUrl }}/e2e-testing.html) * [Performance Testing]({{ baseUrl }}/performance-testing.html) * [Accessibility Testing]({{ baseUrl }}/axe-testing.html) diff --git a/docs/development.md b/docs/development.md index 703a1ce57b0..aec8c3696ca 100644 --- a/docs/development.md +++ b/docs/development.md @@ -291,7 +291,9 @@ There are two big categories of testing in TEAMMATES: - **Component tests**: white-box unit and integration tests, i.e. they test the application components with full knowledge of the components' internal workings. This is configured in `src/test/resources/testng-component.xml` (back-end) and `src/web/jest.config.js` (front-end). - **E2E (end-to-end) tests**: black-box tests, i.e. they test the application as a whole without knowing any internal working. This is configured in `src/e2e/resources/testng-e2e.xml`. To learn more about E2E tests, refer to this [document](e2e-testing.md). -#### Running the tests +
    + +#### Running tests ##### Frontend tests @@ -335,6 +337,8 @@ You can generate the coverage data with `jacocoReport` task after running tests, The report can be found in the `build/reports/jacoco/jacocoReport/` directory. +
    + ## Deploying to a staging server > `Staging server` is the server instance you set up on Google App Engine for hosting the app for testing purposes. diff --git a/docs/unit-testing.md b/docs/unit-testing.md new file mode 100644 index 00000000000..fe4d2786c8e --- /dev/null +++ b/docs/unit-testing.md @@ -0,0 +1,206 @@ + + title: "Unit Testing" + + +# Unit Testing + +## What is Unit Testing? + +Unit testing is a testing methodology where the objective is to test components in isolation. + +- It aims to ensure all components of the application work as expected, assuming its dependencies are working. +- This is done in TEAMMATES by using mocks to simulate a component's dependencies. + +Frontend Unit tests in TEAMMATES are located in `.spec.ts` files, while Backend Unit tests in TEAMMATES can be found in the package `teammates.test`. + + +## Writing Unit Tests + +### General guidelines + +#### Include only relevant details in tests +When writing unit tests, reduce the amount of noise in the code to make it easier for future developers to follow. + +The code below has a lot of noise in creation of the `studentModel`: + +```javascript +it('displayInviteButton: should display "Send Invite" button when a student has not joined the course', () => { + component.studentModels = [ + { + student: { + name: 'tester', + teamName: 'Team 1', + email: 'tester@tester.com', + joinState: JoinState.NOT_JOINED, + sectionName: 'Tutorial Group 1', + courseId: 'text-exa.demo', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + }, + ]; + + expect(sendInviteButton).toBeTruthy(); +}); +``` + +However, what is important is only the student joinState. We should thus reduce the noise by including only the relevant details: + +```javascript +it('displayInviteButton: should display "Send Invite" button when a student has not joined the course', () => { + component.studentModels = [ + studentModelBuilder + .joinState(JoinState.NOT_JOINED) + .build() + ]; + + expect(sendInviteButton).toBeTruthy(); +}); +``` + +Including only the relevant details in tests makes it easier for future developers to read and understand the purpose of the test. + +#### Favor readability over uniqueness +Since tests don't have tests, it should be easy for developers to manually inspect them for correctness, even at the expense of greater code duplication. + +Take the following test for example: + +```java +@BeforeMethod +public void setUp() { + users = new User[]{new User("alice"), new User("bob")}; +} + +@Test +public void test_register_canRegisterMultipleUsers() { + registerAllUsers(); + for (User user : users) { + assertTrue(forum.hasRegisteredUser(user)); + } +} + +private void registerAllUsers() { + for (User user : users) { + forum.register(user); + } +} +``` + +While the code reduces duplication, it is not as straightforward for a developer to follow. + +A more readable way to write this test would be: +```java +@Test +public void test_register_canRegisterMultipleUsers() { + User user1 = new User("alice"); + User user2 = new User("bob"); + + forum.register(user1); + forum.register(user2); + + assertTrue(forum.hasRegisteredUser(user1)); + assertTrue(forum.hasRegisteredUser(user2)); +} +``` + +By choosing readability over uniqueness in writing unit tests, there is code duplication, but the test flow is easier for a reader to follow. + + +#### Inline mocks in test code + +Inlining mock return values in the unit test itself improves readability: + +```javascript +it('getStudentCourseJoinStatus: should return true if student has joined the course' , () => { + jest.spyOn(courseService, 'getJoinCourseStatus') + .mockReturnValue(of({ hasJoined: true })); + + expect(student.getJoinCourseStatus).toBeTruthy(); +}); +``` + +By injecting the values in the test right before they are used, developers are able to more easily trace the code and understand the test. + +### Frontend + +#### Naming +Unit tests for a function should follow the format: + +`": should ... when/if ..."` + +Example: + +```javascript + it('hasSection: should return false when there are no sections in the course') +``` + +#### Creating test data +To aid with [including only relevant details in tests](#include-only-relevant-details-in-tests), use the builder in `src/web/test-helpers/generic-builder.ts` + +Usage: +```javascript +const instructorModelBuilder = createBuilder({ + email: 'instructor@gmail.com', + name: 'Instructor', + hasSubmittedSession: false, + isSelected: false, +}); + +it('isAllInstructorsSelected: should return false if at least one instructor !isSelected', () => { +component.instructorListInfoTableRowModels = [ + instructorModelBuilder.isSelected(true).build(), + instructorModelBuilder.isSelected(false).build(), + instructorModelBuilder.isSelected(true).build(), +]; + +expect(component.isAllInstructorsSelected).toBeFalsy(); +}); + +``` + +#### Testing event emission +In Angular, child components emit events. To test for event emissions, we've provided a utility function in `src/test-helpers/test-event-emitter` + +Usage: +```javascript +@Output() +deleteCommentEvent: EventEmitter = new EventEmitter(); + +triggerDeleteCommentEvent(index: number): void { + this.deleteCommentEvent.emit(index); +} + +it('triggerDeleteCommentEvent: should emit the correct index to deleteCommentEvent', () => { + let emittedIndex: number | undefined; + testEventEmission(component.deleteCommentEvent, (index) => { emittedIndex = index; }); + + component.triggerDeleteCommentEvent(5); + expect(emittedIndex).toBe(5); +}); +``` + +### Backend + +#### Naming +Unit test names should follow the format: `test__` + +Examples: +```java +public void testGetComment_commentDoesNotExist_returnsNull() +public void testCreateComment_commentDoesNotExist_success() +public void testCreateComment_commentAlreadyExists_throwsEntityAlreadyExistsException() +``` + +#### Creating test data +To aid with [including only relevant details in tests](#include-only-relevant-details-in-tests), use the `getTypicalX` functions in `BaseTestCase`, where X represents an entity. + +Example: +```java +Account account = getTypicalAccount(); +account.setEmail("newemail@teammates.com"); + +Student student = getTypicalStudent(); +student.setName("New Student Name"); +``` + + From fb0ba194ba1759bc5ce1da0f23ec467bdfed36fe Mon Sep 17 00:00:00 2001 From: Xenos F Date: Tue, 9 Apr 2024 10:50:20 +0800 Subject: [PATCH 36/95] [#11878] Create reject account request endpoint (#12985) * Create account request rejection endpoint * Add validation * Add check for already rejected request when sending email * Add integration test cases * Set request method to post * Fix lint errors * Update tests list * Update validation check * Add test for validation * Fix lint errors * Fix validation comparison * Fix error message test * Add email sending * Update test cases * Refactor reason check code for clarity --- .../webapi/RejectAccountRequestActionIT.java | 208 ++++++++++++++++++ .../java/teammates/common/util/Const.java | 3 + .../ui/constants/ResourceEndpoints.java | 1 + .../AccountRequestRejectionRequest.java | 46 ++++ .../teammates/ui/webapi/ActionFactory.java | 1 + .../ui/webapi/RejectAccountRequestAction.java | 59 +++++ .../ui/webapi/UpdateAccountRequestAction.java | 4 +- .../AccountRequestRejectionRequestTest.java | 51 +++++ .../ui/webapi/GetActionClassesActionTest.java | 1 + 9 files changed, 371 insertions(+), 3 deletions(-) create mode 100644 src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java create mode 100644 src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java create mode 100644 src/main/java/teammates/ui/webapi/RejectAccountRequestAction.java create mode 100644 src/test/java/teammates/ui/request/AccountRequestRejectionRequestTest.java diff --git a/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java new file mode 100644 index 00000000000..74aba31e1fb --- /dev/null +++ b/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java @@ -0,0 +1,208 @@ +package teammates.it.ui.webapi; + +import java.util.UUID; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Config; +import teammates.common.util.Const; +import teammates.common.util.EmailType; +import teammates.common.util.EmailWrapper; +import teammates.common.util.HibernateUtil; +import teammates.common.util.SanitizationHelper; +import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.ui.output.AccountRequestData; +import teammates.ui.request.AccountRequestRejectionRequest; +import teammates.ui.request.InvalidHttpRequestBodyException; +import teammates.ui.webapi.EntityNotFoundException; +import teammates.ui.webapi.InvalidHttpParameterException; +import teammates.ui.webapi.InvalidOperationException; +import teammates.ui.webapi.JsonResult; +import teammates.ui.webapi.RejectAccountRequestAction; + +/** + * SUT: {@link RejectAccountRequestAction}. + */ +public class RejectAccountRequestActionIT extends BaseActionIT { + + private static final String TYPICAL_TITLE = "We are Unable to Create an Account for you"; + private static final String TYPICAL_BODY = new StringBuilder() + .append("

    Hi, Example

    \n") + .append("

    Thanks for your interest in using TEAMMATES. ") + .append("We are unable to create a TEAMMATES instructor account for you.

    \n\n") + .append("

    \n") + .append(" Reason: The email address you provided ") + .append("is not an 'official' email address provided by your institution.
    \n") + .append(" Remedy: ") + .append("Please re-submit an account request with your 'official' institution email address.\n") + .append("

    \n\n") + .append("

    If you need further clarification or would like to appeal this decision, ") + .append("please feel free to contact us at teammates@comp.nus.edu.sg.

    \n") + .append("

    Regards,
    TEAMMATES Team.

    \n") + .toString(); + + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalBundle); + HibernateUtil.flushSession(); + } + + @Override + protected String getActionUri() { + return Const.ResourceURIs.ACCOUNT_REQUEST_REJECTION; + } + + @Override + protected String getRequestMethod() { + return POST; + } + + @Override + public void testExecute() throws Exception { + // See individual test methods below + } + + @Test + protected void testExecute_withReasonTitleAndBody_shouldRejectWithEmail() + throws InvalidOperationException, InvalidHttpRequestBodyException { + AccountRequest accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + accountRequest.setStatus(AccountRequestStatus.PENDING); + UUID id = accountRequest.getId(); + + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(TYPICAL_TITLE, TYPICAL_BODY); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + RejectAccountRequestAction action = getAction(requestBody, params); + JsonResult result = action.execute(); + + assertEquals(200, result.getStatusCode()); + + AccountRequestData data = (AccountRequestData) result.getOutput(); + assertEquals(accountRequest.getName(), data.getName()); + assertEquals(accountRequest.getEmail(), data.getEmail()); + assertEquals(accountRequest.getInstitute(), data.getInstitute()); + assertEquals(AccountRequestStatus.REJECTED, data.getStatus()); + assertEquals(accountRequest.getComments(), data.getComments()); + + verifyNumberOfEmailsSent(1); + EmailWrapper sentEmail = mockEmailSender.getEmailsSent().get(0); + assertEquals(EmailType.ACCOUNT_REQUEST_REJECTION, sentEmail.getType()); + assertEquals(Config.SUPPORT_EMAIL, sentEmail.getBcc()); + assertEquals(accountRequest.getEmail(), sentEmail.getRecipient()); + assertEquals(SanitizationHelper.sanitizeForRichText(TYPICAL_BODY), sentEmail.getContent()); + assertEquals("TEAMMATES: " + TYPICAL_TITLE, sentEmail.getSubject()); + } + + @Test + protected void testExecute_withoutReasonTitleAndBody_shouldRejectWithoutEmail() + throws InvalidOperationException, InvalidHttpRequestBodyException { + AccountRequest accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + accountRequest.setStatus(AccountRequestStatus.PENDING); + UUID id = accountRequest.getId(); + + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(null, null); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + RejectAccountRequestAction action = getAction(requestBody, params); + JsonResult result = action.execute(); + + assertEquals(200, result.getStatusCode()); + + AccountRequestData data = (AccountRequestData) result.getOutput(); + assertEquals(accountRequest.getName(), data.getName()); + assertEquals(accountRequest.getEmail(), data.getEmail()); + assertEquals(accountRequest.getInstitute(), data.getInstitute()); + assertEquals(AccountRequestStatus.REJECTED, data.getStatus()); + assertEquals(accountRequest.getComments(), data.getComments()); + + verifyNoEmailsSent(); + } + + @Test + protected void testExecute_withReasonBodyButNoTitle_shouldThrow() { + AccountRequest accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + UUID id = accountRequest.getId(); + + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(null, TYPICAL_BODY); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + InvalidHttpRequestBodyException ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals("Both reason body and title need to be null to reject silently", ihrbe.getMessage()); + verifyNoEmailsSent(); + } + + @Test + protected void testExecute_withReasonTitleButNoBody_shouldThrow() { + AccountRequest accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + UUID id = accountRequest.getId(); + + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(TYPICAL_TITLE, null); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + InvalidHttpRequestBodyException ihrbe = verifyHttpRequestBodyFailure(requestBody, params); + + assertEquals("Both reason body and title need to be null to reject silently", ihrbe.getMessage()); + verifyNoEmailsSent(); + } + + @Test + protected void testExecute_alreadyRejected_shouldNotSendEmail() + throws InvalidOperationException, InvalidHttpRequestBodyException { + AccountRequest accountRequest = typicalBundle.accountRequests.get("unregisteredInstructor1"); + accountRequest.setStatus(AccountRequestStatus.REJECTED); + UUID id = accountRequest.getId(); + + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(TYPICAL_TITLE, TYPICAL_BODY); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()}; + + RejectAccountRequestAction action = getAction(requestBody, params); + JsonResult result = action.execute(); + + assertEquals(result.getStatusCode(), 200); + + AccountRequestData data = (AccountRequestData) result.getOutput(); + assertEquals(accountRequest.getName(), data.getName()); + assertEquals(accountRequest.getEmail(), data.getEmail()); + assertEquals(accountRequest.getInstitute(), data.getInstitute()); + assertEquals(accountRequest.getStatus(), data.getStatus()); + assertEquals(accountRequest.getComments(), data.getComments()); + + verifyNoEmailsSent(); + } + + @Test + protected void testExecute_invalidUuid_shouldThrow() { + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(null, null); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, "invalid"}; + + InvalidHttpParameterException ihpe = verifyHttpParameterFailure(requestBody, params); + assertEquals("Invalid UUID string: invalid", ihpe.getMessage()); + verifyNoEmailsSent(); + } + + @Test + protected void testExecute_accountRequestNotFound_shouldThrow() { + AccountRequestRejectionRequest requestBody = new AccountRequestRejectionRequest(null, null); + String uuid = UUID.randomUUID().toString(); + String[] params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, uuid}; + + EntityNotFoundException enfe = verifyEntityNotFound(requestBody, params); + assertEquals(String.format("Account request with id = %s not found", uuid), enfe.getMessage()); + verifyNoEmailsSent(); + } + + @Override + @Test + protected void testAccessControl() throws InvalidParametersException, EntityAlreadyExistsException { + Course course = typicalBundle.courses.get("course1"); + verifyOnlyAdminCanAccess(course); + } +} diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index 80369af91c4..2152278dd7e 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -45,6 +45,8 @@ public final class Const { public static final String MISSING_RESPONSE_TEXT = "No Response"; + public static final String ACCOUNT_REQUEST_NOT_FOUND = "Account request with id = %s not found"; + // These constants are used as variable values to mean that the variable is in a 'special' state. public static final int INT_UNINITIALIZED = -9999; @@ -337,6 +339,7 @@ public static class ResourceURIs { public static final String ACCOUNT_REQUEST = URI_PREFIX + "/account/request"; public static final String ACCOUNT_REQUESTS = URI_PREFIX + "/account/requests"; public static final String ACCOUNT_REQUEST_RESET = ACCOUNT_REQUEST + "/reset"; + public static final String ACCOUNT_REQUEST_REJECTION = ACCOUNT_REQUEST + "/rejection"; public static final String ACCOUNTS = URI_PREFIX + "/accounts"; public static final String RESPONSE_COMMENT = URI_PREFIX + "/responsecomment"; public static final String COURSE = URI_PREFIX + "/course"; diff --git a/src/main/java/teammates/ui/constants/ResourceEndpoints.java b/src/main/java/teammates/ui/constants/ResourceEndpoints.java index 8e288eb6264..3a7a3abe88c 100644 --- a/src/main/java/teammates/ui/constants/ResourceEndpoints.java +++ b/src/main/java/teammates/ui/constants/ResourceEndpoints.java @@ -17,6 +17,7 @@ public enum ResourceEndpoints { ACCOUNT_REQUEST(ResourceURIs.ACCOUNT_REQUEST), ACCOUNT_REQUESTS(ResourceURIs.ACCOUNT_REQUESTS), ACCOUNT_REQUEST_RESET(ResourceURIs.ACCOUNT_REQUEST_RESET), + ACCOUNT_REQUEST_REJECT(ResourceURIs.ACCOUNT_REQUEST_REJECTION), ACCOUNTS(ResourceURIs.ACCOUNTS), RESPONSE_COMMENT(ResourceURIs.RESPONSE_COMMENT), COURSE(ResourceURIs.COURSE), diff --git a/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java b/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java new file mode 100644 index 00000000000..89884e13b7d --- /dev/null +++ b/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java @@ -0,0 +1,46 @@ +package teammates.ui.request; + +import java.util.Objects; + +import javax.annotation.Nullable; + +import teammates.common.util.SanitizationHelper; + +/** + * The request reasonBody for rejecting an account request. + */ +public class AccountRequestRejectionRequest extends BasicRequest { + @Nullable + private String reasonTitle; + + @Nullable + private String reasonBody; + + public AccountRequestRejectionRequest(String reasonTitle, String reasonBody) { + this.reasonTitle = SanitizationHelper.sanitizeTitle(reasonTitle); + this.reasonBody = SanitizationHelper.sanitizeForRichText(reasonBody); + } + + @Override + public void validate() throws InvalidHttpRequestBodyException { + if (reasonBody == null || reasonTitle == null) { + assertTrue(Objects.equals(reasonBody, reasonTitle), + "Both reason body and title need to be null to reject silently"); + } + } + + public String getReasonTitle() { + return this.reasonTitle; + } + + public String getReasonBody() { + return this.reasonBody; + } + + /** + * Returns true if both reason body and title are non-null. + */ + public boolean checkHasReason() { + return this.reasonBody != null && this.reasonTitle != null; + } +} diff --git a/src/main/java/teammates/ui/webapi/ActionFactory.java b/src/main/java/teammates/ui/webapi/ActionFactory.java index 169d4ae5b07..ae834448b7a 100644 --- a/src/main/java/teammates/ui/webapi/ActionFactory.java +++ b/src/main/java/teammates/ui/webapi/ActionFactory.java @@ -53,6 +53,7 @@ public final class ActionFactory { map(ResourceURIs.ACCOUNT_REQUEST, PUT, UpdateAccountRequestAction.class); map(ResourceURIs.ACCOUNT_REQUESTS, GET, GetAccountRequestsAction.class); map(ResourceURIs.ACCOUNT_REQUEST_RESET, PUT, ResetAccountRequestAction.class); + map(ResourceURIs.ACCOUNT_REQUEST_REJECTION, POST, RejectAccountRequestAction.class); map(ResourceURIs.ACCOUNTS, GET, GetAccountsAction.class); map(ResourceURIs.COURSE, GET, GetCourseAction.class); map(ResourceURIs.COURSE, DELETE, DeleteCourseAction.class); diff --git a/src/main/java/teammates/ui/webapi/RejectAccountRequestAction.java b/src/main/java/teammates/ui/webapi/RejectAccountRequestAction.java new file mode 100644 index 00000000000..6b0b2534b44 --- /dev/null +++ b/src/main/java/teammates/ui/webapi/RejectAccountRequestAction.java @@ -0,0 +1,59 @@ +package teammates.ui.webapi; + +import java.util.UUID; + +import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.EntityDoesNotExistException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.common.util.EmailWrapper; +import teammates.storage.sqlentity.AccountRequest; +import teammates.ui.output.AccountRequestData; +import teammates.ui.request.AccountRequestRejectionRequest; +import teammates.ui.request.InvalidHttpRequestBodyException; + +/** + * Rejects an account request. + */ +public class RejectAccountRequestAction extends AdminOnlyAction { + + @Override + public JsonResult execute() throws InvalidOperationException, InvalidHttpRequestBodyException { + String id = getNonNullRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID); + UUID accountRequestId; + + try { + accountRequestId = UUID.fromString(id); + } catch (IllegalArgumentException e) { + throw new InvalidHttpParameterException(e.getMessage(), e); + } + + AccountRequest accountRequest = sqlLogic.getAccountRequest(accountRequestId); + + if (accountRequest == null) { + String errorMessage = String.format(Const.ACCOUNT_REQUEST_NOT_FOUND, accountRequestId.toString()); + throw new EntityNotFoundException(errorMessage); + } + + AccountRequestRejectionRequest accountRequestRejectionRequest = + getAndValidateRequestBody(AccountRequestRejectionRequest.class); + AccountRequestStatus initialStatus = accountRequest.getStatus(); + + try { + accountRequest.setStatus(AccountRequestStatus.REJECTED); + accountRequest = sqlLogic.updateAccountRequest(accountRequest); + if (accountRequestRejectionRequest.checkHasReason() + && initialStatus != AccountRequestStatus.REJECTED) { + EmailWrapper email = sqlEmailGenerator.generateAccountRequestRejectionEmail(accountRequest, + accountRequestRejectionRequest.getReasonTitle(), accountRequestRejectionRequest.getReasonBody()); + emailSender.sendEmail(email); + } + } catch (InvalidParametersException e) { + throw new InvalidHttpRequestBodyException(e); + } catch (EntityDoesNotExistException e) { + throw new EntityNotFoundException(e); + } + + return new JsonResult(new AccountRequestData(accountRequest)); + } +} diff --git a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java index 59c95ce7ef1..0f1f679be35 100644 --- a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java @@ -17,8 +17,6 @@ */ public class UpdateAccountRequestAction extends AdminOnlyAction { - static final String ACCOUNT_REQUEST_NOT_FOUND = "Account request with id = %s not found"; - @Override public boolean isTransactionNeeded() { return false; @@ -38,7 +36,7 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest AccountRequest accountRequest = sqlLogic.getAccountRequestWithTransaction(accountRequestId); if (accountRequest == null) { - String errorMessage = String.format(ACCOUNT_REQUEST_NOT_FOUND, accountRequestId.toString()); + String errorMessage = String.format(Const.ACCOUNT_REQUEST_NOT_FOUND, accountRequestId.toString()); throw new EntityNotFoundException(errorMessage); } diff --git a/src/test/java/teammates/ui/request/AccountRequestRejectionRequestTest.java b/src/test/java/teammates/ui/request/AccountRequestRejectionRequestTest.java new file mode 100644 index 00000000000..412bfcf1d87 --- /dev/null +++ b/src/test/java/teammates/ui/request/AccountRequestRejectionRequestTest.java @@ -0,0 +1,51 @@ +package teammates.ui.request; + +import org.testng.annotations.Test; + +import teammates.test.BaseTestCase; + +/** + * SUT: {@link AccountRequestRejectionRequest}. + */ +public class AccountRequestRejectionRequestTest extends BaseTestCase { + + private static final String TYPICAL_TITLE = "We are Unable to Create an Account for you"; + private static final String TYPICAL_BODY = new StringBuilder() + .append("

    Hi, Example

    \n") + .append("

    Thanks for your interest in using TEAMMATES. ") + .append("We are unable to create a TEAMMATES instructor account for you.

    \n\n") + .append("

    \n") + .append(" Reason: The email address you provided ") + .append("is not an 'official' email address provided by your institution.
    \n") + .append(" Remedy: ") + .append("Please re-submit an account request with your 'official' institution email address.\n") + .append("

    \n\n") + .append("

    If you need further clarification or would like to appeal this decision, ") + .append("please feel free to contact us at teammates@comp.nus.edu.sg.

    \n") + .append("

    Regards,
    TEAMMATES Team.

    \n") + .toString(); + + @Test + public void testValidate_withNonNullBodyAndNonNullTitle_shouldPass() throws Exception { + AccountRequestRejectionRequest request = new AccountRequestRejectionRequest(TYPICAL_TITLE, TYPICAL_BODY); + request.validate(); + } + + @Test + public void testValidate_withNullBodyAndNullTitle_shouldPass() throws Exception { + AccountRequestRejectionRequest request = new AccountRequestRejectionRequest(null, null); + request.validate(); + } + + @Test + public void testValidate_withNonNullBodyAndNullTitle_shouldFail() { + AccountRequestRejectionRequest request = new AccountRequestRejectionRequest(null, TYPICAL_BODY); + assertThrows(InvalidHttpRequestBodyException.class, request::validate); + } + + @Test + public void testValidate_withNullBodyAndNonNullTitle_shouldFail() { + AccountRequestRejectionRequest request = new AccountRequestRejectionRequest(TYPICAL_TITLE, null); + assertThrows(InvalidHttpRequestBodyException.class, request::validate); + } +} diff --git a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java index 89ace4cdf78..fbcd4a0765c 100644 --- a/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java +++ b/src/test/java/teammates/ui/webapi/GetActionClassesActionTest.java @@ -88,6 +88,7 @@ protected void testExecute() { DeleteAccountRequestAction.class, GetAccountRequestsAction.class, UpdateAccountRequestAction.class, + RejectAccountRequestAction.class, GetAccountAction.class, GetAccountsAction.class, FeedbackSessionPublishedRemindersAction.class, From 6c420faa464b9de5157191674bb39ae57babc4bd Mon Sep 17 00:00:00 2001 From: Nicolas <25302138+NicolasCwy@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:02:47 +0800 Subject: [PATCH 37/95] [#12048] Remove feedbackSession attributes @fetch annotation (#12992) * Remove feedbackSession @fetch annotation --- .../java/teammates/storage/sqlentity/FeedbackSession.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java index cf25a3897b5..9f91c1b552f 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java @@ -8,8 +8,6 @@ import java.util.UUID; import org.apache.commons.lang.StringUtils; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; import org.hibernate.annotations.UpdateTimestamp; @@ -92,12 +90,10 @@ public class FeedbackSession extends BaseEntity { private boolean isPublishedEmailSent; @OneToMany(mappedBy = "feedbackSession", cascade = CascadeType.REMOVE) - @Fetch(FetchMode.JOIN) @OnDelete(action = OnDeleteAction.CASCADE) private List deadlineExtensions = new ArrayList<>(); @OneToMany(mappedBy = "feedbackSession", cascade = CascadeType.REMOVE) - @Fetch(FetchMode.JOIN) @OnDelete(action = OnDeleteAction.CASCADE) private List feedbackQuestions = new ArrayList<>(); From cfff21db4a28c169de343df4f24198923e250b8e Mon Sep 17 00:00:00 2001 From: DS Date: Tue, 9 Apr 2024 16:57:20 +0800 Subject: [PATCH 38/95] Remove unused modal (#12998) --- .../admin-home-page.component.spec.ts.snap | 100 ----------- .../admin-home-page.component.html | 63 ------- .../admin-home-page.component.spec.ts | 167 ------------------ .../admin-home-page.component.ts | 133 +------------- .../admin-home-page/instructor-data.ts | 13 -- ...instructor-data-row.component.spec.ts.snap | 5 - .../new-instructor-data-row.component.html | 5 - .../new-instructor-data-row.component.spec.ts | 51 ------ .../new-instructor-data-row.component.ts | 5 - 9 files changed, 5 insertions(+), 537 deletions(-) diff --git a/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap b/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap index bc11da02df6..b091996522f 100644 --- a/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap +++ b/src/web/app/pages-admin/admin-home-page/__snapshots__/admin-home-page.component.spec.ts.snap @@ -5,7 +5,6 @@ exports[`AdminHomePageComponent should snap with default view 1`] = ` accountReqs={[Function Array]} accountService={[Function AccountService]} activeRequests="0" - courseService={[Function CourseService]} currentPage={[Function Number]} formatDateDetailPipe={[Function FormatDateDetailPipe]} instructorDetails="" @@ -14,15 +13,9 @@ exports[`AdminHomePageComponent should snap with default view 1`] = ` instructorName="" instructorsConsolidated={[Function Array]} isAddingInstructors="false" - isRegisteredInstructorModalLoading="false" items$={[Function Observable]} linkService={[Function LinkService]} - ngbModal={[Function _NgbModal]} pageSize={[Function Number]} - registeredInstructorAccountData={[Function Array]} - registeredInstructorIndex="0" - registeredInstructorModal={[Function TemplateRef2]} - simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} timezoneService={[Function TimezoneService]} > @@ -140,7 +133,6 @@ exports[`AdminHomePageComponent should snap with disabled adding instructor butt accountReqs={[Function Array]} accountService={[Function AccountService]} activeRequests={[Function Number]} - courseService={[Function CourseService]} currentPage={[Function Number]} formatDateDetailPipe={[Function FormatDateDetailPipe]} instructorDetails="" @@ -149,15 +141,9 @@ exports[`AdminHomePageComponent should snap with disabled adding instructor butt instructorName="" instructorsConsolidated={[Function Array]} isAddingInstructors={[Function Boolean]} - isRegisteredInstructorModalLoading="false" items$={[Function Observable]} linkService={[Function LinkService]} - ngbModal={[Function _NgbModal]} pageSize={[Function Number]} - registeredInstructorAccountData={[Function Array]} - registeredInstructorIndex="0" - registeredInstructorModal={[Function TemplateRef2]} - simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} timezoneService={[Function TimezoneService]} > @@ -439,7 +425,6 @@ exports[`AdminHomePageComponent should snap with some instructors details 1`] = accountReqs={[Function Array]} accountService={[Function AccountService]} activeRequests="0" - courseService={[Function CourseService]} currentPage={[Function Number]} formatDateDetailPipe={[Function FormatDateDetailPipe]} instructorDetails="" @@ -448,15 +433,9 @@ exports[`AdminHomePageComponent should snap with some instructors details 1`] = instructorName="" instructorsConsolidated={[Function Array]} isAddingInstructors="false" - isRegisteredInstructorModalLoading="false" items$={[Function Observable]} linkService={[Function LinkService]} - ngbModal={[Function _NgbModal]} pageSize={[Function Number]} - registeredInstructorAccountData={[Function Array]} - registeredInstructorIndex="0" - registeredInstructorModal={[Function TemplateRef2]} - simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} timezoneService={[Function TimezoneService]} > @@ -786,85 +765,6 @@ exports[`AdminHomePageComponent should snap with some instructors details 1`] = - - - - Instructor D - - - - - instructord@example.com - - - - - Sample Institution C - - - -
    - - - -
    - - - FAIL - - - - Cannot create account request as instructor has already registered. - - - - - - - - + + +
    + + +
    +
    - diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index 86613fae493..a9177960752 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -2,6 +2,9 @@ import { Component, Input } from '@angular/core'; import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableRowModel } from './account-request-table-model'; import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; +import { + RejectWithReasonModalComponent, +} from './admin-reject-with-reason-modal/admin-reject-with-reason-modal.component'; import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; @@ -146,4 +149,39 @@ export class AccountRequestTableComponent { modalRef.result.then(() => {}, () => {}); } + + rejectAccountRequest(accountRequest: AccountRequestTableRowModel): void { + this.accountService.rejectAccountRequest(accountRequest.id) + .subscribe({ + next: (resp : AccountRequest) => { + accountRequest.status = resp.status; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + } + + rejectAccountRequestWithReason(accountRequest: AccountRequestTableRowModel): void { + const modalRef: NgbModalRef = this.ngbModal.open(RejectWithReasonModalComponent); + modalRef.componentInstance.accountRequestName = accountRequest.name; + modalRef.componentInstance.accountRequestEmail = accountRequest.email; + + modalRef.result.then(() => { + this.accountService.rejectAccountRequest(accountRequest.id, + modalRef.componentInstance.rejectionReasonTitle, modalRef.componentInstance.rejectionReasonBody) + .subscribe({ + next: (resp: AccountRequest) => { + accountRequest.status = resp.status; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + }, () => {}); + } + + trackAccountRequest(accountRequest: AccountRequestTableRowModel): string { + return accountRequest.id; + } } diff --git a/src/web/app/components/account-requests-table/account-request-table.module.ts b/src/web/app/components/account-requests-table/account-request-table.module.ts index f0177f5fdc2..2ff431b1021 100644 --- a/src/web/app/components/account-requests-table/account-request-table.module.ts +++ b/src/web/app/components/account-requests-table/account-request-table.module.ts @@ -4,6 +4,9 @@ import { FormsModule } from '@angular/forms'; import { NgbTooltipModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableComponent } from './account-request-table.component'; import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; +import { + RejectWithReasonModalComponent, +} from './admin-reject-with-reason-modal/admin-reject-with-reason-modal.component'; import { Pipes } from '../../pipes/pipes.module'; import { RichTextEditorModule } from '../rich-text-editor/rich-text-editor.module'; @@ -14,6 +17,7 @@ import { RichTextEditorModule } from '../rich-text-editor/rich-text-editor.modul declarations: [ AccountRequestTableComponent, EditRequestModalComponent, + RejectWithReasonModalComponent, ], exports: [ AccountRequestTableComponent, diff --git a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal-model.ts b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal-model.ts new file mode 100644 index 00000000000..f58de29149b --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal-model.ts @@ -0,0 +1,4 @@ +export interface RejectWithReasonModalComponentResult { + rejectionReasonTitle: string; + rejectionReasonBody: string; +} diff --git a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.html b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.html new file mode 100644 index 00000000000..63112771c6c --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.html @@ -0,0 +1,26 @@ +
    +
    +
    Reject Account Request for {{ accountRequestName }} With Reason
    +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + + +
    diff --git a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.scss b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts new file mode 100644 index 00000000000..49afda15357 --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts @@ -0,0 +1,76 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { RejectWithReasonModalComponentResult } from './admin-reject-with-reason-modal-model'; +import { environment } from '../../../../environments/environment'; +import { StatusMessageService } from '../../../../services/status-message.service'; + +/** + * Modal to select reject account requests with reason. + */ +@Component({ + selector: 'tm-reject-with-reason-modal', + templateUrl: './admin-reject-with-reason-modal.component.html', + styleUrls: ['./admin-reject-with-reason-modal.component.scss'], +}) + +export class RejectWithReasonModalComponent implements OnInit { + + @Input() + accountRequestName: string = ''; + + @Input() + accountRequestEmail: string = ''; + + rejectionReasonBody: string = '

    Hi, {accountRequestName}

    \n\n' + + '

    Thanks for your interest in using TEAMMATES. ' + + 'We are unable to create a TEAMMATES instructor account for you.

    ' + + '

    Reason: The email address you provided is not an 'official' ' + + 'email address provided by your institution.
    ' + + 'Remedy: Please re-submit an account request with your 'official' ' + + 'institution email address.

    \n\n' + + '

    Reason: The email address you have provided does seems like it belongs to a student ' + + '(i.e., not a staff member) of your institution.
    ' + + 'Remedy: If you are a student but you still need an instructor account, ' + + 'please send your justification to {supportEmail}

    \n\n' + + '

    Reason: You already have an account for this email address and this institution.
    ' + + 'Remedy: You can login to TEAMMATES using your Google account {existingEmail}

    \n\n' + + '

    If you need further clarification or would like to appeal this decision, please ' + + 'feel free to contact us at {supportEmail}

    ' + + '

    Regards,
    TEAMMATES Team.

    '; + rejectionReasonTitle: string = 'We are Unable to Create an Account for you'; + + constructor(public activeModal: NgbActiveModal, public statusMessageService: StatusMessageService) {} + + ngOnInit(): void { + this.rejectionReasonBody = this.rejectionReasonBody.replace('{accountRequestName}', this.accountRequestName); + this.rejectionReasonBody = this.rejectionReasonBody.replace('{existingEmail}', this.accountRequestEmail); + this.rejectionReasonBody = this.rejectionReasonBody.replaceAll('{supportEmail}', environment.supportEmail); + } + + onRejectionReasonBodyChange(updatedText: string): void { + this.rejectionReasonBody = updatedText; + } + + /** + * Fires the reject event. + */ + reject(): void { + + if (!this.rejectionReasonBody) { + this.statusMessageService.showErrorToast('Please provide an email body for the rejection email.'); + return; + } + + if (!this.rejectionReasonTitle) { + this.statusMessageService.showErrorToast('Please provide a title for the rejection email.'); + return; + } + + const result: RejectWithReasonModalComponentResult = { + rejectionReasonTitle: this.rejectionReasonTitle, + rejectionReasonBody: this.rejectionReasonBody, + }; + + this.activeModal.close(result); + } +} diff --git a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.html b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.html index 5509014400b..bd4e12fa2db 100644 --- a/src/web/app/pages-admin/admin-home-page/admin-home-page.component.html +++ b/src/web/app/pages-admin/admin-home-page/admin-home-page.component.html @@ -83,3 +83,5 @@
    + + diff --git a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap index 69c6af06b03..a2bbd6ccf84 100644 --- a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap +++ b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap @@ -545,6 +545,36 @@ exports[`AdminSearchPageComponent should snap with an expanded account requests > Approve + + +
    + + +
    +     diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index e6227ab7148..6f7a1f8bc5f 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -11,7 +11,11 @@ import { MessageOutput, AccountRequestStatus, } from '../types/api-output'; -import { AccountCreateRequest, AccountRequestUpdateRequest } from '../types/api-request'; +import { + AccountCreateRequest, + AccountRequestUpdateRequest, + AccountRequestRejectionRequest, +} from '../types/api-request'; /** * Handles account related logic provision @@ -164,4 +168,24 @@ export class AccountService { return this.httpRequestService.get(ResourceEndpoints.ACCOUNT_REQUESTS, paramMap); } + /** + * Rejects an account request by calling API. + */ + rejectAccountRequest(id: string, title?: string, body?: string): Observable { + let accountReqRejectRequest: AccountRequestRejectionRequest = {}; + + if (title !== undefined && body !== undefined) { + accountReqRejectRequest = { + reasonTitle: title, + reasonBody: body, + }; + } + + const paramMap: Record = { + id, + }; + + return this.httpRequestService.post(ResourceEndpoints.ACCOUNT_REQUEST_REJECT, paramMap, accountReqRejectRequest); + } + } From 2354975511120f4292b3eff9b0113e15fd368880 Mon Sep 17 00:00:00 2001 From: Nicolas <25302138+NicolasCwy@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:55:24 +0800 Subject: [PATCH 43/95] Add v9.0.0 tag to liquibase changelog (#13005) --- src/main/resources/db/changelog/db.changelog-v9.0.0.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/db/changelog/db.changelog-v9.0.0.xml b/src/main/resources/db/changelog/db.changelog-v9.0.0.xml index 205645520ff..94c02f08ed6 100644 --- a/src/main/resources/db/changelog/db.changelog-v9.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-v9.0.0.xml @@ -533,4 +533,7 @@ initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION" referencedColumnNames="id" referencedTableName="feedback_questions" validate="true" /> + + + From 6de9607e48ecd10b38c87d1b1f42aaa2379d9440 Mon Sep 17 00:00:00 2001 From: DS Date: Thu, 11 Apr 2024 19:40:57 +0800 Subject: [PATCH 44/95] [#11878] Update DeleteAccountRequest to reference by ID (#12997) * Update to delete by id * fix lint * fix lint * fix frontend lint --- .../java/teammates/e2e/cases/AdminHomePageE2ETest.java | 3 ++- .../java/teammates/e2e/cases/AdminSearchPageE2ETest.java | 2 +- .../it/sqllogic/core/AccountRequestsLogicIT.java | 4 ++-- .../it/ui/webapi/CreateAccountRequestActionIT.java | 2 +- .../it/ui/webapi/UpdateAccountRequestActionIT.java | 2 +- src/main/java/teammates/sqllogic/api/Logic.java | 6 +++--- .../teammates/sqllogic/core/AccountRequestsLogic.java | 8 ++++---- .../java/teammates/sqllogic/core/DataBundleLogic.java | 2 +- .../teammates/ui/webapi/DeleteAccountRequestAction.java | 9 +++++---- src/test/java/teammates/test/AbstractBackDoor.java | 5 ++--- .../account-request-table.component.ts | 2 +- src/web/services/account.service.spec.ts | 5 ++--- src/web/services/account.service.ts | 5 ++--- 13 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java index 56953689329..820acf5bb9b 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java @@ -48,7 +48,8 @@ public void testAll() { "\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not in the correct format.")); assertNotNull(BACKDOOR.getAccountRequest(email, institute)); - BACKDOOR.deleteAccountRequest(email, institute); + // TODO: delete account request after get + // BACKDOOR.deleteAccountRequest(email, institute); } } diff --git a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java index b5ce80693f0..09071e74770 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java @@ -193,7 +193,7 @@ private String getExpectedInstructorManageAccountLink(InstructorAttributes instr @AfterClass public void classTeardown() { for (AccountRequest request : sqlTestData.accountRequests.values()) { - BACKDOOR.deleteAccountRequest(request.getEmail(), request.getInstitute()); + BACKDOOR.deleteAccountRequest(request.getId()); } } diff --git a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java index 566c967a7e7..4156e4f1ca9 100644 --- a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java @@ -67,9 +67,9 @@ public void testResetAccountRequest() ______TS("success: test delete account request"); - accountRequestsLogic.deleteAccountRequest(email, institute); + accountRequestsLogic.deleteAccountRequest(toReset.getId()); - assertNull(accountRequestsLogic.getAccountRequest(email, institute)); + assertNull(accountRequestsLogic.getAccountRequest(toReset.getId())); ______TS("failure: reset account request that does not exist"); diff --git a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java index 85449452b5f..a4a680c4839 100644 --- a/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/CreateAccountRequestActionIT.java @@ -230,7 +230,7 @@ protected void tearDown() { HibernateUtil.beginTransaction(); List accountRequests = logic.getPendingAccountRequests(); for (AccountRequest ar : accountRequests) { - logic.deleteAccountRequest(ar.getEmail(), ar.getInstitute()); + logic.deleteAccountRequest(ar.getId()); } accountRequests = logic.getPendingAccountRequests(); HibernateUtil.commitTransaction(); diff --git a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java index 45ad945c673..3d038daa8a3 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java @@ -227,7 +227,7 @@ protected void tearDown() { HibernateUtil.beginTransaction(); List accountRequests = logic.getAllAccountRequests(); for (AccountRequest ar : accountRequests) { - logic.deleteAccountRequest(ar.getEmail(), ar.getInstitute()); + logic.deleteAccountRequest(ar.getId()); } HibernateUtil.commitTransaction(); } diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index c840ef2834c..72712057143 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -177,7 +177,7 @@ public AccountRequest resetAccountRequest(String email, String institute) } /** - * Deletes account request by email and institute. + * Deletes account request by id. * *
      *
    • Fails silently if no such account request.
      • @@ -186,8 +186,8 @@ public AccountRequest resetAccountRequest(String email, String institute) *

      Preconditions:

      * All parameters are non-null. */ - public void deleteAccountRequest(String email, String institute) { - accountRequestLogic.deleteAccountRequest(email, institute); + public void deleteAccountRequest(UUID id) { + accountRequestLogic.deleteAccountRequest(id); } /** diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index 31956cd0101..cff14372bf1 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -159,13 +159,13 @@ public AccountRequest resetAccountRequest(String email, String institute) } /** - * Deletes account request associated with the {@code email} and {@code institute}. + * Deletes account request associated with the {@code id}. * - *

      Fails silently if no account requests with the given email and institute to delete can be found.

      + *

      Fails silently if no account requests with the given id to delete can be found.

      * */ - public void deleteAccountRequest(String email, String institute) { - AccountRequest toDelete = accountRequestDb.getAccountRequest(email, institute); + public void deleteAccountRequest(UUID id) { + AccountRequest toDelete = accountRequestDb.getAccountRequest(id); accountRequestDb.deleteAccountRequest(toDelete); } diff --git a/src/main/java/teammates/sqllogic/core/DataBundleLogic.java b/src/main/java/teammates/sqllogic/core/DataBundleLogic.java index 8ab165d31b7..0c7c9f66311 100644 --- a/src/main/java/teammates/sqllogic/core/DataBundleLogic.java +++ b/src/main/java/teammates/sqllogic/core/DataBundleLogic.java @@ -351,7 +351,7 @@ public void removeDataBundle(SqlDataBundle dataBundle) throws InvalidParametersE accountsLogic.deleteAccount(account.getGoogleId()); }); dataBundle.accountRequests.values().forEach(accountRequest -> { - accountRequestsLogic.deleteAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); + accountRequestsLogic.deleteAccountRequest(accountRequest.getId()); }); } diff --git a/src/main/java/teammates/ui/webapi/DeleteAccountRequestAction.java b/src/main/java/teammates/ui/webapi/DeleteAccountRequestAction.java index fa12bc67d81..ad157b1e5a3 100644 --- a/src/main/java/teammates/ui/webapi/DeleteAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/DeleteAccountRequestAction.java @@ -1,5 +1,7 @@ package teammates.ui.webapi; +import java.util.UUID; + import teammates.common.util.Const; import teammates.storage.sqlentity.AccountRequest; @@ -10,17 +12,16 @@ class DeleteAccountRequestAction extends AdminOnlyAction { @Override public JsonResult execute() throws InvalidOperationException { - String email = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_EMAIL); - String institute = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_INSTITUTION); + UUID id = getUuidRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID); - AccountRequest toDelete = sqlLogic.getAccountRequest(email, institute); + AccountRequest toDelete = sqlLogic.getAccountRequest(id); if (toDelete != null && toDelete.getRegisteredAt() != null) { // instructor is already registered and cannot be deleted throw new InvalidOperationException("Account request of a registered instructor cannot be deleted."); } - sqlLogic.deleteAccountRequest(email, institute); + sqlLogic.deleteAccountRequest(id); return new JsonResult("Account request successfully deleted."); } diff --git a/src/test/java/teammates/test/AbstractBackDoor.java b/src/test/java/teammates/test/AbstractBackDoor.java index 16c62c5e3ed..99c1d3dc1a2 100644 --- a/src/test/java/teammates/test/AbstractBackDoor.java +++ b/src/test/java/teammates/test/AbstractBackDoor.java @@ -868,10 +868,9 @@ public String getRegKeyForAccountRequest(String email, String institute) { /** * Deletes an account request from the database. */ - public void deleteAccountRequest(String email, String institute) { + public void deleteAccountRequest(UUID id) { Map params = new HashMap<>(); - params.put(Const.ParamsNames.INSTRUCTOR_EMAIL, email); - params.put(Const.ParamsNames.INSTRUCTOR_INSTITUTION, institute); + params.put(Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()); executeDeleteRequest(Const.ResourceURIs.ACCOUNT_REQUEST, params); } diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index a9177960752..eab1fc95d7a 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -129,7 +129,7 @@ export class AccountRequestTableComponent { `Delete account request for ${accountRequest.name}?`, SimpleModalType.DANGER, modalContent); modalRef.result.then(() => { - this.accountService.deleteAccountRequest(accountRequest.email, accountRequest.instituteAndCountry) + this.accountService.deleteAccountRequest(accountRequest.id) .subscribe({ next: (resp: MessageOutput) => { this.statusMessageService.showSuccessToast(resp.message); diff --git a/src/web/services/account.service.spec.ts b/src/web/services/account.service.spec.ts index 82a2e6a5985..d463b982020 100644 --- a/src/web/services/account.service.spec.ts +++ b/src/web/services/account.service.spec.ts @@ -84,10 +84,9 @@ describe('AccountService', () => { }); it('should execute DELETE on account request endpoint', () => { - service.deleteAccountRequest('testEmail', 'testInstitution'); + service.deleteAccountRequest('testId'); const paramMap: Record = { - instructoremail: 'testEmail', - instructorinstitution: 'testInstitution', + id: 'testId', }; expect(spyHttpRequestService.delete).toHaveBeenCalledWith(ResourceEndpoints.ACCOUNT_REQUEST, paramMap); }); diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 6f7a1f8bc5f..a99397a1a64 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -58,10 +58,9 @@ export class AccountService { /** * Deletes an account request by calling API. */ - deleteAccountRequest(email: string, institute: string): Observable { + deleteAccountRequest(id: string): Observable { const paramMap: Record = { - instructoremail: email, - instructorinstitution: institute, + id, }; return this.httpRequestService.delete(ResourceEndpoints.ACCOUNT_REQUEST, paramMap); } From e0beb08e5c1ef5e726e6f21ba87a2a7213290d26 Mon Sep 17 00:00:00 2001 From: DS Date: Thu, 11 Apr 2024 19:47:06 +0800 Subject: [PATCH 45/95] [#11878] Update ResetAccountRequest to reference by ID (#13002) * Update reset to reference by id * fix comments --- .../it/sqllogic/core/AccountRequestsLogicIT.java | 5 +++-- src/main/java/teammates/sqllogic/api/Logic.java | 8 ++++---- .../sqllogic/core/AccountRequestsLogic.java | 8 ++++---- .../ui/webapi/ResetAccountRequestAction.java | 12 ++++++------ .../account-request-table.component.ts | 2 +- src/web/services/account.service.spec.ts | 5 ++--- src/web/services/account.service.ts | 5 ++--- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java index 4156e4f1ca9..bedaec02f36 100644 --- a/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/AccountRequestsLogicIT.java @@ -55,13 +55,14 @@ public void testResetAccountRequest() toReset.setRegisteredAt(Instant.now()); toReset = accountRequestsDb.getAccountRequest(email, institute); + UUID id = toReset.getId(); assertNotNull(toReset); assertNotNull(toReset.getRegisteredAt()); ______TS("success: reset account request that already exists"); - AccountRequest resetted = accountRequestsLogic.resetAccountRequest(email, institute); + AccountRequest resetted = accountRequestsLogic.resetAccountRequest(id); assertNull(resetted.getRegisteredAt()); @@ -74,6 +75,6 @@ public void testResetAccountRequest() ______TS("failure: reset account request that does not exist"); assertThrows(EntityDoesNotExistException.class, - () -> accountRequestsLogic.resetAccountRequest(name, institute)); + () -> accountRequestsLogic.resetAccountRequest(id)); } } diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 72712057143..596f0566e4d 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -165,15 +165,15 @@ public AccountRequest updateAccountRequestWithTransaction(AccountRequest account } /** - * Creates/Resets the account request with the given email and institute + * Creates/Resets the account request with the given id * such that it is not registered. * * @return account request that is unregistered with the - * email and institute. + * id. */ - public AccountRequest resetAccountRequest(String email, String institute) + public AccountRequest resetAccountRequest(UUID id) throws EntityDoesNotExistException, InvalidParametersException { - return accountRequestLogic.resetAccountRequest(email, institute); + return accountRequestLogic.resetAccountRequest(id); } /** diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index cff14372bf1..fcde8f217f0 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -143,15 +143,15 @@ public List getAllAccountRequests() { } /** - * Creates/resets the account request with the given email and institute such that it is not registered. + * Creates/resets the account request with the given id such that it is not registered. */ - public AccountRequest resetAccountRequest(String email, String institute) + public AccountRequest resetAccountRequest(UUID id) throws EntityDoesNotExistException, InvalidParametersException { - AccountRequest accountRequest = accountRequestDb.getAccountRequest(email, institute); + AccountRequest accountRequest = accountRequestDb.getAccountRequest(id); if (accountRequest == null) { throw new EntityDoesNotExistException("Failed to reset since AccountRequest with " - + "the given email and institute cannot be found."); + + "the given id cannot be found."); } accountRequest.setRegisteredAt(null); diff --git a/src/main/java/teammates/ui/webapi/ResetAccountRequestAction.java b/src/main/java/teammates/ui/webapi/ResetAccountRequestAction.java index 7fcd3a40c6b..f0ff7ff86b3 100644 --- a/src/main/java/teammates/ui/webapi/ResetAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/ResetAccountRequestAction.java @@ -1,5 +1,7 @@ package teammates.ui.webapi; +import java.util.UUID; + import org.apache.http.HttpStatus; import teammates.common.exception.EntityDoesNotExistException; @@ -19,21 +21,19 @@ class ResetAccountRequestAction extends AdminOnlyAction { @Override public JsonResult execute() throws InvalidOperationException { - String instructorEmail = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_EMAIL); - String institute = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_INSTITUTION); + UUID id = getUuidRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID); - AccountRequest accountRequest = sqlLogic.getAccountRequest(instructorEmail, institute); + AccountRequest accountRequest = sqlLogic.getAccountRequest(id); if (accountRequest == null) { - throw new EntityNotFoundException("Account request for instructor with email: " + instructorEmail - + " and institute: " + institute + " does not exist."); + throw new EntityNotFoundException("Account request with id: " + id.toString() + " does not exist."); } if (accountRequest.getRegisteredAt() == null) { throw new InvalidOperationException("Unable to reset account request as instructor is still unregistered."); } try { - accountRequest = sqlLogic.resetAccountRequest(instructorEmail, institute); + accountRequest = sqlLogic.resetAccountRequest(id); } catch (InvalidParametersException | EntityDoesNotExistException ue) { // InvalidParametersException and EntityDoesNotExistException should not be thrown as // validity of params has been verified when fetching entity. diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index eab1fc95d7a..54a22cffeb9 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -107,7 +107,7 @@ export class AccountRequestTableComponent { `Reset account request for ${accountRequest.name}?`, SimpleModalType.WARNING, modalContent); modalRef.result.then(() => { - this.accountService.resetAccountRequest(accountRequest.email, accountRequest.instituteAndCountry) + this.accountService.resetAccountRequest(accountRequest.id) .subscribe({ next: () => { this.statusMessageService diff --git a/src/web/services/account.service.spec.ts b/src/web/services/account.service.spec.ts index d463b982020..56331550911 100644 --- a/src/web/services/account.service.spec.ts +++ b/src/web/services/account.service.spec.ts @@ -92,10 +92,9 @@ describe('AccountService', () => { }); it('should execute PUT on account request reset endpoint', () => { - service.resetAccountRequest('testEmail', 'testInstitution'); + service.resetAccountRequest('testId'); const paramMap: Record = { - instructoremail: 'testEmail', - instructorinstitution: 'testInstitution', + id: 'testId', }; expect(spyHttpRequestService.put).toHaveBeenCalledWith(ResourceEndpoints.ACCOUNT_REQUEST_RESET, paramMap); }); diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index a99397a1a64..6f2161935ef 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -68,10 +68,9 @@ export class AccountService { /** * Resets an account request by calling API. */ - resetAccountRequest(email: string, institute: string): Observable { + resetAccountRequest(id: string): Observable { const paramMap: Record = { - instructoremail: email, - instructorinstitution: institute, + id, }; return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST_RESET, paramMap); } From ce75a0a56f69d64a0c4ebcf15cffa78c9ca7b182 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:54:19 +0800 Subject: [PATCH 46/95] [#11878] Add Error Message for Approving Existing Account (#13004) * add error message for duplicate account request * add tests --- .../webapi/UpdateAccountRequestActionIT.java | 14 ++++++++ .../java/teammates/sqllogic/api/Logic.java | 19 +++++++++++ .../sqllogic/core/AccountsLogic.java | 33 +++++++++++++++++++ .../ui/webapi/CreateAccountAction.java | 2 ++ .../ui/webapi/UpdateAccountRequestAction.java | 7 ++++ 5 files changed, 75 insertions(+) diff --git a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java index 3d038daa8a3..65045f269d2 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java @@ -14,12 +14,14 @@ import teammates.common.util.FieldValidator; import teammates.common.util.HibernateUtil; import teammates.common.util.StringHelperExtension; +import teammates.storage.sqlentity.Account; import teammates.storage.sqlentity.AccountRequest; import teammates.ui.output.AccountRequestData; import teammates.ui.request.AccountRequestUpdateRequest; import teammates.ui.request.InvalidHttpRequestBodyException; import teammates.ui.webapi.EntityNotFoundException; import teammates.ui.webapi.InvalidHttpParameterException; +import teammates.ui.webapi.InvalidOperationException; import teammates.ui.webapi.JsonResult; import teammates.ui.webapi.UpdateAccountRequestAction; @@ -107,6 +109,18 @@ public void testExecute() throws Exception { assertEquals(comments, data.getComments()); verifyNumberOfEmailsSent(0); + ______TS("email with existing account throws exception"); + Account account = logic.createAccountWithTransaction(getTypicalAccount()); + accountRequest = logic.createAccountRequestWithTransaction("name", account.getEmail(), + "institute", AccountRequestStatus.PENDING, "comments"); + requestBody = new AccountRequestUpdateRequest(name, email, institute, AccountRequestStatus.APPROVED, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, accountRequest.getId().toString()}; + + InvalidOperationException ipe = verifyInvalidOperation(requestBody, params); + + assertEquals(String.format("An account with email %s already exists. " + + "Please reject or delete the account request instead.", account.getEmail()), ipe.getMessage()); + ______TS("non-existent but valid uuid"); requestBody = new AccountRequestUpdateRequest("name", "email", "institute", AccountRequestStatus.PENDING, "comments"); diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 596f0566e4d..67bdc5ec5fa 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -225,6 +225,13 @@ public List getAccountsForEmail(String email) { return accountsLogic.getAccountsForEmail(email); } + /** + * Get a list of accounts associated with email provided. + */ + public List getAccountsForEmailWithTransaction(String email) { + return accountsLogic.getAccountsForEmailWithTransaction(email); + } + /** * Creates an account. * @@ -237,6 +244,18 @@ public Account createAccount(Account account) return accountsLogic.createAccount(account); } + /** + * Creates an account. + * + * @return the created account + * @throws InvalidParametersException if the account is not valid + * @throws EntityAlreadyExistsException if the account already exists in the database. + */ + public Account createAccountWithTransaction(Account account) + throws InvalidParametersException, EntityAlreadyExistsException { + return accountsLogic.createAccountWithTransaction(account); + } + /** * Deletes account by googleId. * diff --git a/src/main/java/teammates/sqllogic/core/AccountsLogic.java b/src/main/java/teammates/sqllogic/core/AccountsLogic.java index 74bc4af732b..49948080448 100644 --- a/src/main/java/teammates/sqllogic/core/AccountsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountsLogic.java @@ -8,6 +8,7 @@ import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; +import teammates.common.util.HibernateUtil; import teammates.storage.sqlapi.AccountsDb; import teammates.storage.sqlentity.Account; import teammates.storage.sqlentity.Course; @@ -77,6 +78,19 @@ public List getAccountsForEmail(String email) { return accountsDb.getAccountsByEmail(email); } + /** + * Gets accounts associated with email. + */ + public List getAccountsForEmailWithTransaction(String email) { + assert email != null; + + HibernateUtil.beginTransaction(); + List accounts = accountsDb.getAccountsByEmail(email); + HibernateUtil.commitTransaction(); + + return accounts; + } + /** * Creates an account. * @@ -91,6 +105,25 @@ public Account createAccount(Account account) return accountsDb.createAccount(account); } + /** + * Creates an account. + * + * @return the created account + * @throws InvalidParametersException if the account is not valid + * @throws EntityAlreadyExistsException if the account already exists in the + * database. + */ + public Account createAccountWithTransaction(Account account) + throws InvalidParametersException, EntityAlreadyExistsException { + assert account != null; + + HibernateUtil.beginTransaction(); + Account createdAccount = accountsDb.createAccount(account); + HibernateUtil.commitTransaction(); + + return createdAccount; + } + /** * Deletes account associated with the {@code googleId}. * diff --git a/src/main/java/teammates/ui/webapi/CreateAccountAction.java b/src/main/java/teammates/ui/webapi/CreateAccountAction.java index c536a09cc9c..2fe24d25dd1 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountAction.java @@ -9,6 +9,7 @@ import org.apache.http.HttpStatus; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.DataBundle; import teammates.common.datatransfer.attributes.InstructorAttributes; import teammates.common.datatransfer.attributes.StudentAttributes; @@ -113,6 +114,7 @@ private AccountRequest setAccountRequestAsRegistered(AccountRequest accountReque throws InvalidParametersException, EntityDoesNotExistException { accountRequest.setEmail(instructorEmail); accountRequest.setInstitute(instructorInstitution); + accountRequest.setStatus(AccountRequestStatus.REGISTERED); accountRequest.setRegisteredAt(Instant.now()); sqlLogic.updateAccountRequest(accountRequest); diff --git a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java index c98d925d619..da579026897 100644 --- a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java @@ -40,6 +40,13 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest if (accountRequestUpdateRequest.getStatus() == AccountRequestStatus.APPROVED && (accountRequest.getStatus() == AccountRequestStatus.PENDING || accountRequest.getStatus() == AccountRequestStatus.REJECTED)) { + + if (sqlLogic.getAccountsForEmailWithTransaction(accountRequest.getEmail()).size() > 0) { + throw new InvalidOperationException(String.format("An account with email %s already exists. " + + "Please reject or delete the account request instead.", + accountRequest.getEmail())); + } + try { // should not need to update other fields for an approval accountRequest.setStatus(accountRequestUpdateRequest.getStatus()); From fb7c4e874e555c7aa51949f9ae73ddeea3b733a2 Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Thu, 11 Apr 2024 22:38:51 +0800 Subject: [PATCH 47/95] sort courses by id before comparison (#13003) Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com> --- src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java b/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java index 408821c38b7..b10149b70b0 100644 --- a/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java @@ -122,6 +122,7 @@ public void testGetCoursesAction_withStudentEntityType_shouldReturnCorrectCourse loginAsStudent(student.getGoogleId()); CoursesData courses = getValidCourses(params); + courses.getCourses().sort((c1, c2) -> c1.getCourseId().compareTo(c2.getCourseId())); assertEquals(3, courses.getCourses().size()); Course expectedCourse1 = typicalBundle.courses.get("typicalCourse1"); Course expectedCourse2 = typicalBundle.courses.get("typicalCourse2"); From 41524a54aa51a59a952b74bebc3792bc524e9bcc Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Fri, 12 Apr 2024 20:40:03 +0800 Subject: [PATCH 48/95] [#11878] Get account request by uuid (#13007) * change GetAccountRequestAction to get by id * fix tests * remove unncessary todo --- .../java/teammates/e2e/cases/AdminHomePageE2ETest.java | 4 ---- .../teammates/e2e/cases/AdminSearchPageE2ETest.java | 4 ++-- src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java | 3 ++- .../InstructorCourseJoinConfirmationPageE2ETest.java | 2 +- .../it/ui/webapi/RejectAccountRequestActionIT.java | 2 +- .../teammates/ui/webapi/GetAccountRequestAction.java | 10 +++++----- src/test/java/teammates/test/AbstractBackDoor.java | 10 ++++------ 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java index 820acf5bb9b..014913e639c 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java @@ -46,10 +46,6 @@ public void testAll() { String failureMessage = homePage.getMessageForInstructor(1); assertTrue(failureMessage.contains( "\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not in the correct format.")); - - assertNotNull(BACKDOOR.getAccountRequest(email, institute)); - // TODO: delete account request after get - // BACKDOOR.deleteAccountRequest(email, institute); } } diff --git a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java index 09071e74770..3836a7b1eef 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java @@ -132,7 +132,7 @@ public void testAll() { searchPage.inputSearchContent(searchContent); searchPage.clickSearchButton(); searchPage.clickResetAccountRequestButton(accountRequest); - assertNull(BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()).getRegisteredAt()); + assertNull(BACKDOOR.getAccountRequest(accountRequest.getId()).getRegisteredAt()); ______TS("Typical case: Delete account request successful"); accountRequest = sqlTestData.accountRequests.get("unregisteredInstructor1"); @@ -141,7 +141,7 @@ public void testAll() { searchPage.inputSearchContent(searchContent); searchPage.clickSearchButton(); searchPage.clickDeleteAccountRequestButton(accountRequest); - assertNull(BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute())); + assertNull(BACKDOOR.getAccountRequest(accountRequest.getId())); } private String getExpectedStudentDetails(StudentAttributes student) { diff --git a/src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java b/src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java index 3ada841ac59..7b953f7a50a 100644 --- a/src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java +++ b/src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java @@ -4,6 +4,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; +import java.util.UUID; import org.testng.ITestContext; import org.testng.annotations.AfterClass; @@ -329,7 +330,7 @@ protected String getKeyForStudent(StudentAttributes student) { @Override protected AccountRequestAttributes getAccountRequest(AccountRequestAttributes accountRequest) { - return BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()); + return BACKDOOR.getAccountRequest(UUID.fromString(accountRequest.getId())); } NotificationAttributes getNotification(String notificationId) { diff --git a/src/e2e/java/teammates/e2e/cases/InstructorCourseJoinConfirmationPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorCourseJoinConfirmationPageE2ETest.java index d3dffb01c9f..421144a2da4 100644 --- a/src/e2e/java/teammates/e2e/cases/InstructorCourseJoinConfirmationPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/InstructorCourseJoinConfirmationPageE2ETest.java @@ -68,7 +68,7 @@ public void testAll() { ______TS("Click join link: valid account request key"); String regKey = BACKDOOR - .getRegKeyForAccountRequest("ICJoinConf.newinstr@gmail.tmt", "TEAMMATES Test Institute 1"); + .getRegKeyForAccountRequest(sqlTestData.accountRequests.get("ICJoinConf.newinstr").getId()); joinLink = createFrontendUrl(Const.WebPageURIs.JOIN_PAGE) .withIsCreatingAccount("true") diff --git a/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java index 469804b9921..78f25dd89e8 100644 --- a/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java @@ -222,7 +222,7 @@ protected void tearDown() { HibernateUtil.beginTransaction(); List accountRequests = logic.getAllAccountRequests(); for (AccountRequest ar : accountRequests) { - logic.deleteAccountRequest(ar.getEmail(), ar.getInstitute()); + logic.deleteAccountRequest(ar.getId()); } HibernateUtil.commitTransaction(); } diff --git a/src/main/java/teammates/ui/webapi/GetAccountRequestAction.java b/src/main/java/teammates/ui/webapi/GetAccountRequestAction.java index a3f3b5195a4..2894d06b254 100644 --- a/src/main/java/teammates/ui/webapi/GetAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/GetAccountRequestAction.java @@ -1,5 +1,7 @@ package teammates.ui.webapi; +import java.util.UUID; + import teammates.common.util.Const; import teammates.storage.sqlentity.AccountRequest; import teammates.ui.output.AccountRequestData; @@ -11,14 +13,12 @@ class GetAccountRequestAction extends AdminOnlyAction { @Override public JsonResult execute() { - String email = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_EMAIL); - String institute = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_INSTITUTION); + UUID id = getUuidRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID); - AccountRequest accountRequest = sqlLogic.getAccountRequest(email, institute); + AccountRequest accountRequest = sqlLogic.getAccountRequest(id); if (accountRequest == null) { - throw new EntityNotFoundException("Account request for email: " - + email + " and institute: " + institute + " not found."); + throw new EntityNotFoundException("Account request with id: " + id.toString() + " does not exist."); } AccountRequestData output = new AccountRequestData(accountRequest); diff --git a/src/test/java/teammates/test/AbstractBackDoor.java b/src/test/java/teammates/test/AbstractBackDoor.java index 99c1d3dc1a2..48fb1eec380 100644 --- a/src/test/java/teammates/test/AbstractBackDoor.java +++ b/src/test/java/teammates/test/AbstractBackDoor.java @@ -832,10 +832,9 @@ public void deleteCourse(String courseId) { /** * Gets an account request from the database. */ - public AccountRequestAttributes getAccountRequest(String email, String institute) { + public AccountRequestAttributes getAccountRequest(UUID id) { Map params = new HashMap<>(); - params.put(Const.ParamsNames.INSTRUCTOR_EMAIL, email); - params.put(Const.ParamsNames.INSTRUCTOR_INSTITUTION, institute); + params.put(Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()); ResponseBodyAndCode response = executeGetRequest(Const.ResourceURIs.ACCOUNT_REQUEST, params); if (response.responseCode == HttpStatus.SC_NOT_FOUND) { @@ -852,10 +851,9 @@ public AccountRequestAttributes getAccountRequest(String email, String institute /** * Gets registration key of an account request from the database. */ - public String getRegKeyForAccountRequest(String email, String institute) { + public String getRegKeyForAccountRequest(UUID id) { Map params = new HashMap<>(); - params.put(Const.ParamsNames.INSTRUCTOR_EMAIL, email); - params.put(Const.ParamsNames.INSTRUCTOR_INSTITUTION, institute); + params.put(Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString()); ResponseBodyAndCode response = executeGetRequest(Const.ResourceURIs.ACCOUNT_REQUEST, params); if (response.responseCode == HttpStatus.SC_NOT_FOUND) { From 451a25a53c859e2d5382842450158ea641ec92f7 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Fri, 12 Apr 2024 21:34:07 +0800 Subject: [PATCH 49/95] [#11878] Handle Duplicate Approved Account Requests (#13009) --- .../it/ui/webapi/UpdateAccountRequestActionIT.java | 14 ++++++++++++++ src/main/java/teammates/sqllogic/api/Logic.java | 7 +++++++ .../sqllogic/core/AccountRequestsLogic.java | 10 ++++++++++ .../storage/sqlapi/AccountRequestsDb.java | 14 ++++++++++++++ .../ui/webapi/UpdateAccountRequestAction.java | 7 +++++++ 5 files changed, 52 insertions(+) diff --git a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java index 65045f269d2..f5932deaf99 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java @@ -227,6 +227,20 @@ public void testExecute() throws Exception { assertEquals(email, data.getEmail()); assertEquals(institute, data.getInstitute()); assertEquals(null, data.getComments()); + + ______TS("email with approved account request throws exception"); + logic.createAccountRequestWithTransaction("test", "test@email.com", + "institute", AccountRequestStatus.APPROVED, "comments"); + accountRequest = logic.createAccountRequestWithTransaction("test", "test@email.com", + "institute", AccountRequestStatus.PENDING, "comments"); + requestBody = new AccountRequestUpdateRequest(accountRequest.getName(), accountRequest.getEmail(), + accountRequest.getInstitute(), AccountRequestStatus.APPROVED, comments); + params = new String[] {Const.ParamsNames.ACCOUNT_REQUEST_ID, accountRequest.getId().toString()}; + + ipe = verifyInvalidOperation(requestBody, params); + + assertEquals(String.format("An account request with email %s has already been approved. " + + "Please reject or delete the account request instead.", accountRequest.getEmail()), ipe.getMessage()); } @Override diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 67bdc5ec5fa..53d90026646 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -204,6 +204,13 @@ public List getAllAccountRequests() { return accountRequestLogic.getAllAccountRequests(); } + /** + * Get a list of account requests associated with email provided. + */ + public List getApprovedAccountRequestsForEmailWithTransaction(String email) { + return accountRequestLogic.getApprovedAccountRequestsForEmailWithTransaction(email); + } + /** * Gets an account. */ diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index fcde8f217f0..2e5af513560 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -142,6 +142,16 @@ public List getAllAccountRequests() { return accountRequestDb.getAllAccountRequests(); } + /** + * Get a list of account requests associated with email provided. + */ + public List getApprovedAccountRequestsForEmailWithTransaction(String email) { + HibernateUtil.beginTransaction(); + List accountRequests = accountRequestDb.getApprovedAccountRequestsForEmail(email); + HibernateUtil.commitTransaction(); + return accountRequests; + } + /** * Creates/resets the account request with the given id such that it is not registered. */ diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index 92d61afb8eb..310b78e6239 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -103,6 +103,20 @@ public List getAllAccountRequests() { return query.getResultList(); } + /** + * Get all Account Requests for a given {@code email}. + */ + public List getApprovedAccountRequestsForEmail(String email) { + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cr = cb.createQuery(AccountRequest.class); + Root root = cr.from(AccountRequest.class); + cr.select(root).where(cb.and(cb.equal(root.get("email"), email), + cb.equal(root.get("status"), AccountRequestStatus.APPROVED))); + + TypedQuery query = HibernateUtil.createQuery(cr); + return query.getResultList(); + } + /** * Get AccountRequest by {@code registrationKey} from database. */ diff --git a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java index da579026897..7699709c8d8 100644 --- a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java @@ -47,6 +47,13 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest accountRequest.getEmail())); } + if (sqlLogic.getApprovedAccountRequestsForEmailWithTransaction(accountRequest.getEmail()).size() > 0) { + throw new InvalidOperationException(String.format( + "An account request with email %s has already been approved. " + + "Please reject or delete the account request instead.", + accountRequest.getEmail())); + } + try { // should not need to update other fields for an approval accountRequest.setStatus(accountRequestUpdateRequest.getStatus()); From 2bd06e232bc3d6f84a1ac1b085cf0551efff3f00 Mon Sep 17 00:00:00 2001 From: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> Date: Sat, 13 Apr 2024 21:11:57 +0800 Subject: [PATCH 50/95] [#11878] Merge master into feature (#13011) * Update chrome driver download link in e2e-testing.md (#12924) * [#12048] Add SQL configuration into build.properties and build-dev.properties (#12917) * Add production config * Remove forgotten host and password * Fix lint --------- Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * [#12048] Add SQL description for postgres config (#12931) * Add production config * Remove forgotten host and password * Fix lint * Address changes, include production_user * Linting * [#12588] Improve test code coverage of core components - ToastComponent (#12916) * add test cases * add test case for isTemplate() --------- Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com> * [#12588] Add unit tests to question edit answer form (#12935) * add unit tests to constsum-options-question-edit-answer-form * add unit tests to constsum-options-question-edit-answer-form --------- Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * add delay to task queuer for indexing account request (#12936) Co-authored-by: Nicolas <25302138+NicolasCwy@users.noreply.github.com> * Make account req data migration script rerunnable (#12932) * [#12048] Relax read notif verification for migration verification script (#12937) * Fix account requests with wrong field during seed * Relax account attributes verification * Fix lint errors * Fix order of account request variables * [#12920] Create script to migrate noSQL test data to SQL schema format (#12922) * Add classes to migrate test json data * Add toposort script * Add function to remove foreign key data * Cleanup * WIP * Simplify keys for students and instructors * Fix lint issues * Output SQL JSON in same folder as JSON * Change output file name * Fix bug: wrong jsonkey used * Fix lint error * Make section and team name unique * Set read notification key to be unique * Delete python file * [#12588] Improve test code coverage of core components - ViewResultsPanelComponent (#12918) * add test cases to ViewResultsPanelComponent * fix lint errors --------- Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com> Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * fix resetAccountAction (#12934) Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * [#12048] Migrate Feedback Rank Option E2E test (#12902) * Initial commit * Fix lint * Follow convention and add test * Change file path * Fix requested changes * Fixed testcases * Fix lint * Add deepcopy * Fixed e2e test --------- Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> * [#12048] Migrate FeedbackMcqQuestionE2ETest (#12820) * Migrate MCQ E2E * Fix lint * Fix lint * Update xml --------- Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> * [#12048] Remove unnecessary loading of datastore entities in InstructorNotificationsPageE2ETest (#12911) * migrate instructor notif e2e --------- Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> * [#12048] Migrate InstructorCourseDetailsPageE2ETest (#12908) * Add teammates.e2e.cases.sql.InstructorCourseDetailsPageE2ETest * Remove data properly to prevent clashes * Add SQL data bundle * Verify loaded details * Use email address when getting a student row * Check student links * Verify the sending of invites * Verify the reminding of all students to join * Remove SQL data properly to prevent clashes * Verify the downloading of the student list * Implement helper methods for Student * Add BaseTestCaseWithSqlDatabaseAccess::verifyAbsentInDatabase * Add to testng-e2e-sql.xml * Verify the deleting of students * Verify the deleting of all the students * Fix lint * Remove duplicate equality check for students * [#12588] add unit tests for question submission form (#12897) Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * Update developers.json (#12958) * Merge pull request #12960 from TEAMMATES/master (#12961) * [#12048] Fix account request indexing (#12967) * Add isTransactionNeeded method to Action * Remove delay from taskqueuer * Change CreateAccountRequest to handle own transactions * configure agroal connection pool (#12971) * [#12048] Configure connection pool using hikari (#12978) * Configure hikari * Remove spacing * Lint * [#12048] Update liquibase configuration (#12930) * Update gradle config * Update liquibase config for v9 * Turn off table generate for prod * Update of changelog file * Add configuration for generating changelog * Add schema migration docs --------- Co-authored-by: FergusMok * [#12048] Migrate AccountRequestsLogicTest (#12780) * Migrate test cases for AccountRequestsLogic * Remove test case * Split test cases * [#12048] Migrate AdminSearchPageE2ETest SQL (#12811) * test e2e changes * fix: reduce e2e test json file size * fix student key * fix course key * fix instructor keys * fix filepath * fix e2e test * remove extra data from bundle * Add correct removal logic to avoid constraint violation * Fix e2e tests and lint fix reset google id test fix e2e tests fix e2e tests fix tests remove double click fix unknown symbol add toast check change toast verification message remove toast check * fix: add null check * move admin search page e2e test to sql cases * Rename AdminSearchPageE2ETest_SQLEntities.json to AdminSearchPageE2ETest_SqlEntities.json * fix failing test * fix: remove extra null check * fix: add test to e2e sql xml file * fix function call * remove unnecessary changes * create new file for sql entities * revert unnecessary changes * remove trailing whitespace * add teardown for account requests --------- Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> * [#12995] Create documentation for unit tests (#12996) * Create documentation for unit tests * Update docs/unit-testing.md Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * Update docs/unit-testing.md Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> --------- Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * [#12048] Remove feedbackSession attributes @fetch annotation (#12992) * Remove feedbackSession @fetch annotation * [#12048] create skeleton for sql LNP tests (#12994) * create skelton for sql LNP tests * allow lnp test to access sql storage and ensure sql lnp tests are independant of each other --------- Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> * [#12048] Migrate FeedbackNumScaleQuestionE2ETest (#12940) * Migrate num scale e2e * Fix team id * Fix bugs * Add v9.0.0 tag to liquibase changelog (#13005) * sort courses by id before comparison (#13003) Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com> --------- Co-authored-by: Nada Ayesh Co-authored-by: FergusMok Co-authored-by: Maureen Chang <76696006+techMedMau@users.noreply.github.com> Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com> Co-authored-by: Nicolas <25302138+NicolasCwy@users.noreply.github.com> Co-authored-by: Ching Ming Yuan Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> Co-authored-by: DS Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> Co-authored-by: Xenos F Co-authored-by: domoberzin <74132255+domoberzin@users.noreply.github.com> Co-authored-by: Marques Tye Jia Jun <97437396+marquestye@users.noreply.github.com> --- build.gradle | 25 +- docs/_markbind/layouts/default.md | 1 + docs/development.md | 6 +- docs/schema-migration.md | 34 ++ docs/unit-testing.md | 206 +++++++ .../DataStoreToSqlConverter.java | 9 +- .../e2e/cases/AdminSearchPageE2ETest.java | 2 +- .../e2e/cases/axe/AdminSearchPageAxeTest.java | 2 +- .../e2e/cases/sql/AdminSearchPageE2ETest.java | 186 ++++++ .../e2e/cases/sql/BaseE2ETestCase.java | 14 + .../sql/FeedbackNumScaleQuestionE2ETest.java | 124 ++++ .../e2e/pageobjects/AdminSearchPage.java | 246 +++++++- .../e2e/pageobjects/FeedbackSubmitPage.java | 13 + .../InstructorFeedbackEditPage.java | 10 + .../data/AdminSearchPageE2ESqlTest.json | 118 ++++ .../FeedbackNumScaleQuestionE2ESqlTest.json | 268 +++++++++ src/e2e/resources/testng-e2e-sql.xml | 2 + .../it/ui/webapi/GetCoursesActionIT.java | 1 + .../teammates/lnp/sql/BaseLNPTestCase.java | 361 ++++++++++++ .../sql/InstructorCourseUpdateLNPTest.java | 216 +++++++ .../java/teammates/lnp/sql/package-info.java | 4 + .../teammates/lnp/util/LNPSqlTestData.java | 92 +++ .../teammates/common/util/HibernateUtil.java | 15 +- .../sqllogic/api/SqlEmailGenerator.java | 8 +- .../storage/sqlentity/FeedbackSession.java | 4 - .../FeedbackRankOptionsQuestion.java | 3 +- .../db/changelog/db.changelog-root.xml | 2 +- .../db/changelog/db.changelog-v9.0.0.xml | 539 ++++++++++++++++++ .../db/changelog/db.changelog-v9.xml | 82 --- .../architecture/ArchitectureTest.java | 26 +- 30 files changed, 2505 insertions(+), 114 deletions(-) create mode 100644 docs/schema-migration.md create mode 100644 docs/unit-testing.md create mode 100644 src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java create mode 100644 src/e2e/java/teammates/e2e/cases/sql/FeedbackNumScaleQuestionE2ETest.java create mode 100644 src/e2e/resources/data/AdminSearchPageE2ESqlTest.json create mode 100644 src/e2e/resources/data/FeedbackNumScaleQuestionE2ESqlTest.json create mode 100644 src/lnp/java/teammates/lnp/sql/BaseLNPTestCase.java create mode 100644 src/lnp/java/teammates/lnp/sql/InstructorCourseUpdateLNPTest.java create mode 100644 src/lnp/java/teammates/lnp/sql/package-info.java create mode 100644 src/lnp/java/teammates/lnp/util/LNPSqlTestData.java create mode 100644 src/main/resources/db/changelog/db.changelog-v9.0.0.xml delete mode 100644 src/main/resources/db/changelog/db.changelog-v9.xml diff --git a/build.gradle b/build.gradle index 4fe78e4f12b..f448d003a8f 100644 --- a/build.gradle +++ b/build.gradle @@ -77,8 +77,7 @@ dependencies { implementation("org.jsoup:jsoup:1.15.2") implementation("org.hibernate.orm:hibernate-core:6.1.6.Final") implementation("org.postgresql:postgresql:42.7.2") - implementation("org.hibernate.orm:hibernate-agroal:6.1.6.Final") - implementation("io.agroal:agroal-pool:2.1") + implementation("org.hibernate:hibernate-hikaricp:6.1.6.Final") testAnnotationProcessor(testng) @@ -102,7 +101,9 @@ dependencies { exclude group: "org.apache.jmeter", module: "bom" } + liquibaseRuntime("org.liquibase:liquibase-core:4.19.0") liquibaseRuntime("info.picocli:picocli:4.7.1") + liquibaseRuntime("org.postgresql:postgresql:42.7.2") liquibaseRuntime(sourceSets.main.output) } @@ -137,6 +138,10 @@ sourceSets { } } +if (!project.hasProperty("runList")) { + project.ext.set("runList", "main") +} + liquibase { activities { main { @@ -146,7 +151,23 @@ liquibase { username project.properties['liquibaseUsername'] password project.properties['liquibasePassword'] } + snapshot { + url project.properties['liquibaseDbUrl'] + username project.properties['liquibaseUsername'] + password project.properties['liquibasePassword'] + snapshotFormat "json" + outputFile "liquibase-snapshot.json" + } + diffMain { + searchPath "${projectDir}" + changeLogFile "src/main/resources/db/changelog/db.changelog-new.xml" + referenceUrl project.properties['liquibaseDbUrl'] + referenceUsername project.properties['liquibaseUsername'] + referencePassword project.properties['liquibasePassword'] + url "offline:postgresql?snapshot=liquibase-snapshot.json" + } } + runList = project.ext.runList } tasks.withType(cz.habarta.typescript.generator.gradle.GenerateTask) { diff --git a/docs/_markbind/layouts/default.md b/docs/_markbind/layouts/default.md index f92791366a0..e57ee418a49 100644 --- a/docs/_markbind/layouts/default.md +++ b/docs/_markbind/layouts/default.md @@ -27,6 +27,7 @@ * [Captcha]({{ baseUrl }}/captcha.html) * [Documentation]({{ baseUrl }}/documentation.html) * [Emails]({{ baseUrl }}/emails.html) + * [Unit Testing]({{ baseUrl }}/unit-testing.html) * [End-to-End Testing]({{ baseUrl }}/e2e-testing.html) * [Performance Testing]({{ baseUrl }}/performance-testing.html) * [Accessibility Testing]({{ baseUrl }}/axe-testing.html) diff --git a/docs/development.md b/docs/development.md index 703a1ce57b0..aec8c3696ca 100644 --- a/docs/development.md +++ b/docs/development.md @@ -291,7 +291,9 @@ There are two big categories of testing in TEAMMATES: - **Component tests**: white-box unit and integration tests, i.e. they test the application components with full knowledge of the components' internal workings. This is configured in `src/test/resources/testng-component.xml` (back-end) and `src/web/jest.config.js` (front-end). - **E2E (end-to-end) tests**: black-box tests, i.e. they test the application as a whole without knowing any internal working. This is configured in `src/e2e/resources/testng-e2e.xml`. To learn more about E2E tests, refer to this [document](e2e-testing.md). -#### Running the tests +
      + +#### Running tests ##### Frontend tests @@ -335,6 +337,8 @@ You can generate the coverage data with `jacocoReport` task after running tests, The report can be found in the `build/reports/jacoco/jacocoReport/` directory. +
      + ## Deploying to a staging server > `Staging server` is the server instance you set up on Google App Engine for hosting the app for testing purposes. diff --git a/docs/schema-migration.md b/docs/schema-migration.md new file mode 100644 index 00000000000..a88f49ece0f --- /dev/null +++ b/docs/schema-migration.md @@ -0,0 +1,34 @@ + + title: "Schema Migration" + + +# SQL Schema Migration + +Teammates uses _[Liquibase]_(https://docs.liquibase.com/start/home.html), a database schema change management solution that enables developers to revise and release database changes to production. The maintainers in charge of releases (Release Leader) will be in charge of generating a _Liquibase_ changelog prior to each release to keep the production databases schema in sync with the code. Therefore this section is just for documentation purposes for contributors. + +## Liquibase in Teammates +_Liquibase_ is made available using the [gradle plugin](https://github.com/liquibase/liquibase-gradle-plugin), providing _liquibase_ functions as tasks. Try `gradle tasks | grep "liquibase"` to see all the tasks available. In teammates, change logs (more in the next section) are written in _XML_. + +### Liquibase connection +Amend the `liquibaseDbUrl`, `liquibaseUsername` and `liquibasePassword` in `gradle.properties` to allow the _Liquibase_ plugin to connect your database. + +## Change logs, change sets and change types +A _change log_ is a file that contains a series of _change sets_ (analagous to a transaction) which applies _change types_ (actions). You can refer to this page on liquibase on the types of [change types](https://docs.liquibase.com/change-types/home.html) that can be used. + +## Gradle Activities for Liquibase +Activities in Gradle are a way of specifying different variables provided by gradle to the Liquibase plugin. The argument `runList` provided by `-pRunList=` e.g `./gradlew liquibaseSnapshot -PrunList=snapshot` is used to specify which activity to be used for the Liquibase command. In this case the `liquibaseSnapshot` command is run using the `snapshot` activity. + +Here is a brief description of the activities defined for Liquibase +1. Main: The default activity used by Liquibase commands and is used for running changelogs against a database. This is used by default if a `runList` is not defined +2. Snapshot: Used to specify output format and name for snapshots i.e JSON +3. diffMain: Specify the reference and the target database to generate changelog that contains operations to update reference database to the state of the target database. i.e the reference is the JSON file generated by the snapshot command, this can be replaced with a live database which is used as reference. + +## Generating/ Updating liquibase change logs +1. Ensure `diff-main` activity in `build.gradle` is pointing to the latest release changelog `src/main/resources/db/changelog/db.changelog-.xml` +2. Delete the `postgres-data` folder to clear any old database schemas +3. Run `git checkout ` and +4. Run the server using `./gradlew serverRun` to generate tables found on branch +5. Generate snapshot of database by running `./gradlew liquibaseSnapshot -PrunList=snapshot`, the snapshot will be output to `liquibase-snapshot.json` +6. Checkout your branch and repeat steps 2 and 4 to generate the tables found on your branch +7. Run `./gradlew liquibaseDiffChangeLog -PrunList=diffMain` to generate changeLog to resolve database schema differences + diff --git a/docs/unit-testing.md b/docs/unit-testing.md new file mode 100644 index 00000000000..fe4d2786c8e --- /dev/null +++ b/docs/unit-testing.md @@ -0,0 +1,206 @@ + + title: "Unit Testing" + + +# Unit Testing + +## What is Unit Testing? + +Unit testing is a testing methodology where the objective is to test components in isolation. + +- It aims to ensure all components of the application work as expected, assuming its dependencies are working. +- This is done in TEAMMATES by using mocks to simulate a component's dependencies. + +Frontend Unit tests in TEAMMATES are located in `.spec.ts` files, while Backend Unit tests in TEAMMATES can be found in the package `teammates.test`. + + +## Writing Unit Tests + +### General guidelines + +#### Include only relevant details in tests +When writing unit tests, reduce the amount of noise in the code to make it easier for future developers to follow. + +The code below has a lot of noise in creation of the `studentModel`: + +```javascript +it('displayInviteButton: should display "Send Invite" button when a student has not joined the course', () => { + component.studentModels = [ + { + student: { + name: 'tester', + teamName: 'Team 1', + email: 'tester@tester.com', + joinState: JoinState.NOT_JOINED, + sectionName: 'Tutorial Group 1', + courseId: 'text-exa.demo', + }, + isAllowedToViewStudentInSection: true, + isAllowedToModifyStudent: true, + }, + ]; + + expect(sendInviteButton).toBeTruthy(); +}); +``` + +However, what is important is only the student joinState. We should thus reduce the noise by including only the relevant details: + +```javascript +it('displayInviteButton: should display "Send Invite" button when a student has not joined the course', () => { + component.studentModels = [ + studentModelBuilder + .joinState(JoinState.NOT_JOINED) + .build() + ]; + + expect(sendInviteButton).toBeTruthy(); +}); +``` + +Including only the relevant details in tests makes it easier for future developers to read and understand the purpose of the test. + +#### Favor readability over uniqueness +Since tests don't have tests, it should be easy for developers to manually inspect them for correctness, even at the expense of greater code duplication. + +Take the following test for example: + +```java +@BeforeMethod +public void setUp() { + users = new User[]{new User("alice"), new User("bob")}; +} + +@Test +public void test_register_canRegisterMultipleUsers() { + registerAllUsers(); + for (User user : users) { + assertTrue(forum.hasRegisteredUser(user)); + } +} + +private void registerAllUsers() { + for (User user : users) { + forum.register(user); + } +} +``` + +While the code reduces duplication, it is not as straightforward for a developer to follow. + +A more readable way to write this test would be: +```java +@Test +public void test_register_canRegisterMultipleUsers() { + User user1 = new User("alice"); + User user2 = new User("bob"); + + forum.register(user1); + forum.register(user2); + + assertTrue(forum.hasRegisteredUser(user1)); + assertTrue(forum.hasRegisteredUser(user2)); +} +``` + +By choosing readability over uniqueness in writing unit tests, there is code duplication, but the test flow is easier for a reader to follow. + + +#### Inline mocks in test code + +Inlining mock return values in the unit test itself improves readability: + +```javascript +it('getStudentCourseJoinStatus: should return true if student has joined the course' , () => { + jest.spyOn(courseService, 'getJoinCourseStatus') + .mockReturnValue(of({ hasJoined: true })); + + expect(student.getJoinCourseStatus).toBeTruthy(); +}); +``` + +By injecting the values in the test right before they are used, developers are able to more easily trace the code and understand the test. + +### Frontend + +#### Naming +Unit tests for a function should follow the format: + +`": should ... when/if ..."` + +Example: + +```javascript + it('hasSection: should return false when there are no sections in the course') +``` + +#### Creating test data +To aid with [including only relevant details in tests](#include-only-relevant-details-in-tests), use the builder in `src/web/test-helpers/generic-builder.ts` + +Usage: +```javascript +const instructorModelBuilder = createBuilder({ + email: 'instructor@gmail.com', + name: 'Instructor', + hasSubmittedSession: false, + isSelected: false, +}); + +it('isAllInstructorsSelected: should return false if at least one instructor !isSelected', () => { +component.instructorListInfoTableRowModels = [ + instructorModelBuilder.isSelected(true).build(), + instructorModelBuilder.isSelected(false).build(), + instructorModelBuilder.isSelected(true).build(), +]; + +expect(component.isAllInstructorsSelected).toBeFalsy(); +}); + +``` + +#### Testing event emission +In Angular, child components emit events. To test for event emissions, we've provided a utility function in `src/test-helpers/test-event-emitter` + +Usage: +```javascript +@Output() +deleteCommentEvent: EventEmitter = new EventEmitter(); + +triggerDeleteCommentEvent(index: number): void { + this.deleteCommentEvent.emit(index); +} + +it('triggerDeleteCommentEvent: should emit the correct index to deleteCommentEvent', () => { + let emittedIndex: number | undefined; + testEventEmission(component.deleteCommentEvent, (index) => { emittedIndex = index; }); + + component.triggerDeleteCommentEvent(5); + expect(emittedIndex).toBe(5); +}); +``` + +### Backend + +#### Naming +Unit test names should follow the format: `test__` + +Examples: +```java +public void testGetComment_commentDoesNotExist_returnsNull() +public void testCreateComment_commentDoesNotExist_success() +public void testCreateComment_commentAlreadyExists_throwsEntityAlreadyExistsException() +``` + +#### Creating test data +To aid with [including only relevant details in tests](#include-only-relevant-details-in-tests), use the `getTypicalX` functions in `BaseTestCase`, where X represents an entity. + +Example: +```java +Account account = getTypicalAccount(); +account.setEmail("newemail@teammates.com"); + +Student student = getTypicalStudent(); +student.setName("New Student Name"); +``` + + diff --git a/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java b/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java index 716032dd0c5..8b899504833 100644 --- a/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java +++ b/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java @@ -57,8 +57,7 @@ public class DataStoreToSqlConverter { private UuidGenerator accounRequestUuidGenerator = new UuidGenerator(initialAccountRequestNumber, uuidPrefix); private UuidGenerator sectionUuidGenerator = new UuidGenerator(initialSectionNumber, uuidPrefix); private UuidGenerator teamUuidGenerator = new UuidGenerator(initialTeamNumber, uuidPrefix); - private UuidGenerator deadlineExtensionUuidGenerator = new UuidGenerator(initialDeadlineExtensionNumber, - uuidPrefix); + private UuidGenerator deadlineExtensionUuidGenerator = new UuidGenerator(initialDeadlineExtensionNumber, uuidPrefix); private UuidGenerator instructorUuidGenerator = new UuidGenerator(initialInstructorNumber, uuidPrefix); private UuidGenerator studentUuidGenerator = new UuidGenerator(initialStudentNumber, uuidPrefix); private UuidGenerator feedbackSessionUuidGenerator = new UuidGenerator(intitialFeedbackSessionNumber, uuidPrefix); @@ -262,11 +261,9 @@ protected Student convert(StudentAttributes student) { */ protected DeadlineExtension convert(DeadlineExtensionAttributes deadlineExtension) { FeedbackSession sqlFeedbackSession = feedbackSessions.get( - generatefeedbackSessionKey(deadlineExtension.getCourseId(), - deadlineExtension.getFeedbackSessionName())); + generatefeedbackSessionKey(deadlineExtension.getCourseId(), deadlineExtension.getFeedbackSessionName())); - // User is not included since DataBundleLogic.java does not read users from this - // attribute + // User is not included since DataBundleLogic.java does not read users from this attribute DeadlineExtension sqlDE = new DeadlineExtension(null, sqlFeedbackSession, deadlineExtension.getEndTime()); diff --git a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java index 3836a7b1eef..22089ac7cea 100644 --- a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java @@ -31,7 +31,7 @@ protected void prepareTestData() { putDocuments(testData); sqlTestData = loadSqlDataBundle("/AdminSearchPageE2ETest_SqlEntities.json"); removeAndRestoreSqlDataBundle(sqlTestData); - doPutDocumentsSql(sqlTestData); + putSqlDocuments(sqlTestData); } @Test diff --git a/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java b/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java index d45e1d4e16a..732e06ceed3 100644 --- a/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java +++ b/src/e2e/java/teammates/e2e/cases/axe/AdminSearchPageAxeTest.java @@ -25,7 +25,7 @@ protected void prepareTestData() { putDocuments(testData); sqlTestData = loadSqlDataBundle("/AdminSearchPageE2ETest_SqlEntities.json"); removeAndRestoreSqlDataBundle(sqlTestData); - doPutDocumentsSql(sqlTestData); + putSqlDocuments(sqlTestData); } @Test diff --git a/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java new file mode 100644 index 00000000000..848fee25302 --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java @@ -0,0 +1,186 @@ +package teammates.e2e.cases.sql; + +import java.time.Instant; + +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.AdminSearchPage; +import teammates.e2e.util.TestProperties; +import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#ADMIN_SEARCH_PAGE}. + */ +public class AdminSearchPageE2ETest extends BaseE2ETestCase { + + @Override + protected void prepareTestData() { + if (!TestProperties.INCLUDE_SEARCH_TESTS) { + return; + } + testData = removeAndRestoreDataBundle(loadSqlDataBundle("/AdminSearchPageE2ESqlTest.json")); + putDocuments(testData); + } + + @Test + @Override + public void testAll() { + if (!TestProperties.INCLUDE_SEARCH_TESTS) { + return; + } + + AppUrl url = createFrontendUrl(Const.WebPageURIs.ADMIN_SEARCH_PAGE); + AdminSearchPage searchPage = loginAdminToPage(url, AdminSearchPage.class); + + Course course = testData.courses.get("typicalCourse1"); + Student student = testData.students.get("student1InCourse1"); + Instructor instructor = testData.instructors.get("instructor1OfCourse1"); + AccountRequest accountRequest = testData.accountRequests.get("instructor1OfCourse1"); + + ______TS("Typical case: Search student email"); + String searchContent = student.getEmail(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + String studentDetails = getExpectedStudentDetails(student); + String studentManageAccountLink = getExpectedStudentManageAccountLink(student); + String studentHomePageLink = getExpectedStudentHomePageLink(student); + int numExpandedRows = getExpectedNumExpandedRows(student); + searchPage.verifyStudentRowContent(student, course, studentDetails, studentManageAccountLink, + studentHomePageLink); + searchPage.verifyStudentExpandedLinks(student, numExpandedRows); + + ______TS("Typical case: Reset student google id"); + searchPage.resetStudentGoogleId(student); + student.setGoogleId(null); + searchPage.verifyStudentRowContentAfterReset(student, course); + + ______TS("Typical case: Regenerate registration key for a course student"); + searchPage.clickExpandStudentLinks(); + String originalJoinLink = searchPage.getStudentJoinLink(student); + searchPage.regenerateStudentKey(student); + searchPage.verifyRegenerateStudentKey(student, originalJoinLink); + searchPage.waitForPageToLoad(); + + ______TS("Typical case: Search for instructor email"); + searchPage.clearSearchBox(); + searchContent = instructor.getEmail(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + String instructorManageAccountLink = getExpectedInstructorManageAccountLink(instructor); + String instructorHomePageLink = getExpectedInstructorHomePageLink(instructor); + searchPage.verifyInstructorRowContent(instructor, course, instructorManageAccountLink, + instructorHomePageLink); + searchPage.verifyInstructorExpandedLinks(instructor); + + ______TS("Typical case: Reset instructor google id"); + searchPage.resetInstructorGoogleId(instructor); + searchPage.verifyInstructorRowContentAfterReset(instructor, course); + + ______TS("Typical case: Regenerate registration key for an instructor"); + searchPage.clickExpandInstructorLinks(); + originalJoinLink = searchPage.getInstructorJoinLink(instructor); + searchPage.regenerateInstructorKey(instructor); + searchPage.verifyRegenerateInstructorKey(instructor, originalJoinLink); + searchPage.waitForPageToLoad(); + + ______TS("Typical case: Search for account request by email"); + searchPage.clearSearchBox(); + searchContent = accountRequest.getEmail(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.verifyAccountRequestRowContent(accountRequest); + searchPage.verifyAccountRequestExpandedLinks(accountRequest); + + ______TS("Typical case: Search common search key"); + searchPage.clearSearchBox(); + searchContent = "Course1"; + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.verifyStudentRowContentAfterReset(student, course); + searchPage.verifyInstructorRowContentAfterReset(instructor, course); + searchPage.verifyAccountRequestRowContent(accountRequest); + + ______TS("Typical case: Expand and collapse links"); + searchPage.verifyLinkExpansionButtons(student, instructor, accountRequest); + + ______TS("Typical case: Reset account request successful"); + searchContent = "ASearch.instructor1@gmail.tmt"; + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickResetAccountRequestButton(accountRequest); + assertNull(BACKDOOR.getAccountRequest(accountRequest.getId()).getRegisteredAt()); + + ______TS("Typical case: Delete account request successful"); + accountRequest = testData.accountRequests.get("unregisteredInstructor1"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickDeleteAccountRequestButton(accountRequest); + assertNull(BACKDOOR.getAccountRequest(accountRequest.getId())); + } + + private String getExpectedStudentDetails(Student student) { + return String.format("%s [%s] (%s)", student.getCourse().getId(), + student.getSection() == null + ? Const.DEFAULT_SECTION + : student.getSection().getName(), + student.getTeam().getName()); + } + + private String getExpectedStudentHomePageLink(Student student) { + return student.isRegistered() ? createFrontendUrl(Const.WebPageURIs.STUDENT_HOME_PAGE) + .withUserId(student.getGoogleId()) + .toAbsoluteString() + : ""; + } + + private String getExpectedStudentManageAccountLink(Student student) { + return student.isRegistered() ? createFrontendUrl(Const.WebPageURIs.ADMIN_ACCOUNTS_PAGE) + .withParam(Const.ParamsNames.INSTRUCTOR_ID, student.getGoogleId()) + .toAbsoluteString() + : ""; + } + + private int getExpectedNumExpandedRows(Student student) { + int expectedNumExpandedRows = 2; + for (FeedbackSession sessions : testData.feedbackSessions.values()) { + if (sessions.getCourse().equals(student.getCourse())) { + expectedNumExpandedRows += 1; + if (sessions.getResultsVisibleFromTime().isBefore(Instant.now())) { + expectedNumExpandedRows += 1; + } + } + } + return expectedNumExpandedRows; + } + + private String getExpectedInstructorHomePageLink(Instructor instructor) { + String googleId = instructor.isRegistered() ? instructor.getGoogleId() : ""; + return createFrontendUrl(Const.WebPageURIs.INSTRUCTOR_HOME_PAGE) + .withUserId(googleId) + .toAbsoluteString(); + } + + private String getExpectedInstructorManageAccountLink(Instructor instructor) { + String googleId = instructor.isRegistered() ? instructor.getGoogleId() : ""; + return createFrontendUrl(Const.WebPageURIs.ADMIN_ACCOUNTS_PAGE) + .withParam(Const.ParamsNames.INSTRUCTOR_ID, googleId) + .toAbsoluteString(); + } + + @AfterClass + public void classTeardown() { + for (AccountRequest request : testData.accountRequests.values()) { + BACKDOOR.deleteAccountRequest(request.getId()); + } + } +} diff --git a/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java b/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java index b61a4a8cf2a..fbfd60ea84b 100644 --- a/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java +++ b/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java @@ -265,4 +265,18 @@ StudentData getStudent(String courseId, String studentEmailAddress) { protected StudentData getStudent(Student student) { return getStudent(student.getCourseId(), student.getEmail()); } + + /** + * Puts the documents in the database using BACKDOOR. + * @param dataBundle the data to be put in the database + * @return the result of the operation + */ + protected String putDocuments(SqlDataBundle dataBundle) { + try { + return BACKDOOR.putSqlDocuments(dataBundle); + } catch (HttpRequestFailedException e) { + e.printStackTrace(); + return null; + } + } } diff --git a/src/e2e/java/teammates/e2e/cases/sql/FeedbackNumScaleQuestionE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/FeedbackNumScaleQuestionE2ETest.java new file mode 100644 index 00000000000..61e4fc619be --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/FeedbackNumScaleQuestionE2ETest.java @@ -0,0 +1,124 @@ +package teammates.e2e.cases.sql; + +import org.testng.annotations.Test; + +import teammates.common.datatransfer.questions.FeedbackNumericalScaleQuestionDetails; +import teammates.common.datatransfer.questions.FeedbackNumericalScaleResponseDetails; +import teammates.e2e.pageobjects.FeedbackSubmitPage; +import teammates.e2e.pageobjects.InstructorFeedbackEditPage; +import teammates.storage.sqlentity.FeedbackQuestion; +import teammates.storage.sqlentity.FeedbackResponse; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#INSTRUCTOR_SESSION_EDIT_PAGE}, {@link Const.WebPageURIs#SESSION_SUBMISSION_PAGE} + * specifically for NumScale questions. + */ +public class FeedbackNumScaleQuestionE2ETest extends BaseFeedbackQuestionE2ETest { + + @Override + protected void prepareTestData() { + testData = removeAndRestoreDataBundle(loadSqlDataBundle("/FeedbackNumScaleQuestionE2ESqlTest.json")); + + instructor = testData.instructors.get("instructor"); + course = testData.courses.get("course"); + feedbackSession = testData.feedbackSessions.get("openSession"); + student = testData.students.get("alice.tmms@FNumScaleQn.CS2104"); + } + + @Test + @Override + public void testAll() { + testEditPage(); + logout(); + testSubmitPage(); + } + + @Override + protected void testEditPage() { + InstructorFeedbackEditPage feedbackEditPage = loginToFeedbackEditPage(); + + ______TS("verify loaded question"); + FeedbackQuestion loadedQuestion = testData.feedbackQuestions.get("qn1ForFirstSession"); + FeedbackNumericalScaleQuestionDetails questionDetails = + (FeedbackNumericalScaleQuestionDetails) loadedQuestion.getQuestionDetailsCopy(); + feedbackEditPage.verifyNumScaleQuestionDetails(1, questionDetails); + + ______TS("add new question"); + // add new question exactly like loaded question + loadedQuestion.setQuestionNumber(2); + feedbackEditPage.addNumScaleQuestion(loadedQuestion); + feedbackEditPage.waitUntilAnimationFinish(); + + feedbackEditPage.verifyNumScaleQuestionDetails(2, questionDetails); + verifyPresentInDatabase(loadedQuestion); + + ______TS("copy question"); + FeedbackQuestion copiedQuestion = testData.feedbackQuestions.get("qn1ForSecondSession"); + questionDetails = (FeedbackNumericalScaleQuestionDetails) copiedQuestion.getQuestionDetailsCopy(); + feedbackEditPage.copyQuestion(copiedQuestion.getCourseId(), + copiedQuestion.getQuestionDetailsCopy().getQuestionText()); + copiedQuestion.setQuestionNumber(3); + copiedQuestion.setFeedbackSession(feedbackSession); + + feedbackEditPage.verifyNumScaleQuestionDetails(3, questionDetails); + verifyPresentInDatabase(copiedQuestion); + + ______TS("edit question"); + questionDetails = (FeedbackNumericalScaleQuestionDetails) loadedQuestion.getQuestionDetailsCopy(); + FeedbackNumericalScaleQuestionDetails newQuestionDetails = + (FeedbackNumericalScaleQuestionDetails) questionDetails.getDeepCopy(); + newQuestionDetails.setMinScale(0); + newQuestionDetails.setStep(1); + newQuestionDetails.setMaxScale(100); + loadedQuestion.setQuestionDetails(newQuestionDetails); + feedbackEditPage.editNumScaleQuestion(2, newQuestionDetails); + feedbackEditPage.waitForPageToLoad(); + + feedbackEditPage.verifyNumScaleQuestionDetails(2, newQuestionDetails); + verifyPresentInDatabase(loadedQuestion); + + // reset question details to original + loadedQuestion.setQuestionDetails(questionDetails); + } + + @Override + protected void testSubmitPage() { + FeedbackSubmitPage feedbackSubmitPage = loginToFeedbackSubmitPage(); + + ______TS("verify loaded question"); + FeedbackQuestion question = testData.feedbackQuestions.get("qn1ForFirstSession"); + Student receiver = testData.students.get("benny.tmms@FNumScaleQn.CS2104"); + feedbackSubmitPage.verifyNumScaleQuestion(1, receiver.getTeamName(), + (FeedbackNumericalScaleQuestionDetails) question.getQuestionDetailsCopy()); + + ______TS("submit response"); + FeedbackResponse response = getResponse(question, receiver, 5.4); + feedbackSubmitPage.fillNumScaleResponse(1, receiver.getTeamName(), response); + feedbackSubmitPage.clickSubmitQuestionButton(1); + + // TODO: uncomment when SubmitFeedbackResponse is working + // verifyPresentInDatabase(response); + + // ______TS("check previous response"); + // feedbackSubmitPage = getFeedbackSubmitPage(); + // feedbackSubmitPage.verifyNumScaleResponse(1, receiver.getTeamName(), response); + + // ______TS("edit response"); + // response = getResponse(question, receiver, 10.0); + // feedbackSubmitPage.fillNumScaleResponse(1, receiver.getTeamName(), response); + // feedbackSubmitPage.clickSubmitQuestionButton(1); + + // feedbackSubmitPage = getFeedbackSubmitPage(); + // feedbackSubmitPage.verifyNumScaleResponse(1, receiver.getTeamName(), response); + // verifyPresentInDatabase(response); + } + + private FeedbackResponse getResponse(FeedbackQuestion feedbackQuestion, Student receiver, Double answer) { + FeedbackNumericalScaleResponseDetails details = new FeedbackNumericalScaleResponseDetails(); + details.setAnswer(answer); + return FeedbackResponse.makeResponse( + feedbackQuestion, student.getEmail(), null, receiver.getTeamName(), null, details); + } + +} diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java index b0e9049f481..15253ca5171 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java @@ -18,6 +18,9 @@ import teammates.common.util.Const; import teammates.common.util.StringHelper; import teammates.storage.sqlentity.AccountRequest; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; /** * Represents the admin home page of the website. @@ -93,6 +96,14 @@ public void clickSearchButton() { waitForPageToLoad(); } + public void regenerateStudentKey(Student student) { + WebElement studentRow = getStudentRow(student); + studentRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); + + waitForConfirmationModalAndClickOk(); + waitForPageToLoad(true); + } + public void regenerateStudentKey(StudentAttributes student) { WebElement studentRow = getStudentRow(student); studentRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); @@ -101,6 +112,30 @@ public void regenerateStudentKey(StudentAttributes student) { waitForPageToLoad(true); } + public void verifyRegenerateStudentKey(Student student, String originalJoinLink) { + verifyStatusMessage("Student's key for this course has been successfully regenerated," + + " and the email has been sent."); + + String regeneratedJoinLink = getStudentJoinLink(student); + assertNotEquals(regeneratedJoinLink, originalJoinLink); + } + + public void verifyRegenerateStudentKey(StudentAttributes student, String originalJoinLink) { + verifyStatusMessage("Student's key for this course has been successfully regenerated," + + " and the email has been sent."); + + String regeneratedJoinLink = getStudentJoinLink(student); + assertNotEquals(regeneratedJoinLink, originalJoinLink); + } + + public void regenerateInstructorKey(Instructor instructor) { + WebElement instructorRow = getInstructorRow(instructor); + instructorRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); + + waitForConfirmationModalAndClickOk(); + waitForPageToLoad(true); + } + public void regenerateInstructorKey(InstructorAttributes instructor) { WebElement instructorRow = getInstructorRow(instructor); instructorRow.findElement(By.xpath("//button[text()='Regenerate key']")).click(); @@ -143,6 +178,25 @@ public String removeSpanFromText(String text) { return text.replace("", "").replace("", ""); } + public WebElement getStudentRow(Student student) { + String details = String.format("%s [%s] (%s)", student.getCourse().getId(), + student.getSection() == null + ? Const.DEFAULT_SECTION + : student.getSection().getName(), student.getTeam().getName()); + WebElement table = browser.driver.findElement(By.id("search-table-student")); + List rows = table.findElements(By.tagName("tr")); + for (WebElement row : rows) { + List columns = row.findElements(By.tagName("td")); + if (!columns.isEmpty() && removeSpanFromText(columns.get(STUDENT_COL_DETAILS - 1) + .getAttribute("innerHTML")).contains(details) + && removeSpanFromText(columns.get(STUDENT_COL_NAME - 1) + .getAttribute("innerHTML")).contains(student.getName())) { + return row; + } + } + return null; + } + public WebElement getStudentRow(StudentAttributes student) { String details = String.format("%s [%s] (%s)", student.getCourse(), student.getSection() == null ? Const.DEFAULT_SECTION : student.getSection(), student.getTeam()); @@ -195,11 +249,25 @@ public String getStudentJoinLink(WebElement studentRow) { return getExpandedRowInputValue(studentRow, EXPANDED_ROWS_HEADER_COURSE_JOIN_LINK); } + public String getStudentJoinLink(Student student) { + WebElement studentRow = getStudentRow(student); + return getStudentJoinLink(studentRow); + } + public String getStudentJoinLink(StudentAttributes student) { WebElement studentRow = getStudentRow(student); return getStudentJoinLink(studentRow); } + public void resetStudentGoogleId(Student student) { + WebElement studentRow = getStudentRow(student); + WebElement link = studentRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); + link.click(); + + waitForConfirmationModalAndClickOk(); + waitForElementStaleness(link); + } + public void resetStudentGoogleId(StudentAttributes student) { WebElement studentRow = getStudentRow(student); WebElement link = studentRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); @@ -209,6 +277,21 @@ public void resetStudentGoogleId(StudentAttributes student) { waitForElementStaleness(link); } + public WebElement getInstructorRow(Instructor instructor) { + WebElement table = browser.driver.findElement(By.id("search-table-instructor")); + List rows = table.findElements(By.tagName("tr")); + for (WebElement row : rows) { + List columns = row.findElements(By.tagName("td")); + if (columns.size() >= 3 && (removeSpanFromText(columns.get(2) + .getAttribute("innerHTML")).contains(instructor.getGoogleId()) + || removeSpanFromText(columns.get(1) + .getAttribute("innerHTML")).contains(instructor.getName()))) { + return row; + } + } + return null; + } + public WebElement getInstructorRow(InstructorAttributes instructor) { String courseId = instructor.getCourseId(); List rows = browser.driver.findElements(By.cssSelector("#search-table-instructor tbody tr")); @@ -256,11 +339,25 @@ public String getInstructorJoinLink(WebElement instructorRow) { return getExpandedRowInputValue(instructorRow, EXPANDED_ROWS_HEADER_COURSE_JOIN_LINK); } + public String getInstructorJoinLink(Instructor instructor) { + WebElement instructorRow = getInstructorRow(instructor); + return getInstructorJoinLink(instructorRow); + } + public String getInstructorJoinLink(InstructorAttributes instructor) { WebElement instructorRow = getInstructorRow(instructor); return getInstructorJoinLink(instructorRow); } + public void resetInstructorGoogleId(Instructor instructor) { + WebElement instructorRow = getInstructorRow(instructor); + WebElement link = instructorRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); + link.click(); + + waitForConfirmationModalAndClickOk(); + waitForElementStaleness(link); + } + public void resetInstructorGoogleId(InstructorAttributes instructor) { WebElement instructorRow = getInstructorRow(instructor); WebElement link = instructorRow.findElement(By.linkText(LINK_TEXT_RESET_GOOGLE_ID)); @@ -386,6 +483,32 @@ private String getExpandedRowInputValue(WebElement row, String rowHeader) { } } + public void verifyStudentRowContent(Student student, Course course, + String expectedDetails, String expectedManageAccountLink, + String expectedHomePageLink) { + WebElement studentRow = getStudentRow(student); + String actualDetails = getStudentDetails(studentRow); + String actualName = getStudentName(studentRow); + String actualGoogleId = getStudentGoogleId(studentRow); + String actualHomepageLink = getStudentHomeLink(studentRow); + String actualInstitute = getStudentInstitute(studentRow); + String actualComment = getStudentComments(studentRow); + String actualManageAccountLink = getStudentManageAccountLink(studentRow); + + String expectedName = student.getName(); + String expectedGoogleId = StringHelper.convertToEmptyStringIfNull(student.getGoogleId()); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + String expectedComment = StringHelper.convertToEmptyStringIfNull(student.getComments()); + + assertEquals(expectedDetails, actualDetails); + assertEquals(expectedName, actualName); + assertEquals(expectedGoogleId, actualGoogleId); + assertEquals(expectedInstitute, actualInstitute); + assertEquals(expectedComment, actualComment); + assertEquals(expectedManageAccountLink, actualManageAccountLink); + assertEquals(expectedHomePageLink, actualHomepageLink); + } + public void verifyStudentRowContent(StudentAttributes student, CourseAttributes course, String expectedDetails, String expectedManageAccountLink, String expectedHomePageLink) { @@ -412,6 +535,35 @@ public void verifyStudentRowContent(StudentAttributes student, CourseAttributes assertEquals(expectedHomePageLink, actualHomepageLink); } + public void verifyStudentRowContentAfterReset(Student student, Course course) { + WebElement studentRow = getStudentRow(student); + String actualName = getStudentName(studentRow); + String actualInstitute = getStudentInstitute(studentRow); + String actualComment = getStudentComments(studentRow); + + String expectedName = student.getName(); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + String expectedComment = StringHelper.convertToEmptyStringIfNull(student.getComments()); + + assertEquals(expectedName, actualName); + assertEquals(expectedInstitute, actualInstitute); + assertEquals(expectedComment, actualComment); + } + + public void verifyStudentExpandedLinks(Student student, int expectedNumExpandedRows) { + clickExpandStudentLinks(); + WebElement studentRow = getStudentRow(student); + String actualEmail = getStudentEmail(studentRow); + String actualJoinLink = getStudentJoinLink(studentRow); + int actualNumExpandedRows = getNumExpandedRows(studentRow); + + String expectedEmail = student.getEmail(); + + assertEquals(expectedEmail, actualEmail); + assertNotEquals("", actualJoinLink); + assertEquals(expectedNumExpandedRows, actualNumExpandedRows); + } + public void verifyStudentExpandedLinks(StudentAttributes student, int expectedNumExpandedRows) { clickExpandStudentLinks(); WebElement studentRow = getStudentRow(student); @@ -426,6 +578,29 @@ public void verifyStudentExpandedLinks(StudentAttributes student, int expectedNu assertEquals(expectedNumExpandedRows, actualNumExpandedRows); } + public void verifyInstructorRowContent(Instructor instructor, Course course, + String expectedManageAccountLink, String expectedHomePageLink) { + WebElement instructorRow = getInstructorRow(instructor); + String actualCourseId = getInstructorCourseId(instructorRow); + String actualName = getInstructorName(instructorRow); + String actualGoogleId = getInstructorGoogleId(instructorRow); + String actualHomePageLink = getInstructorHomePageLink(instructorRow); + String actualInstitute = getInstructorInstitute(instructorRow); + String actualManageAccountLink = getInstructorManageAccountLink(instructorRow); + + String expectedCourseId = instructor.getCourseId(); + String expectedName = instructor.getName(); + String expectedGoogleId = StringHelper.convertToEmptyStringIfNull(instructor.getGoogleId()); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + + assertEquals(expectedCourseId, actualCourseId); + assertEquals(expectedName, actualName); + assertEquals(expectedGoogleId, actualGoogleId); + assertEquals(expectedHomePageLink, actualHomePageLink); + assertEquals(expectedInstitute, actualInstitute); + assertEquals(expectedManageAccountLink, actualManageAccountLink); + } + public void verifyInstructorRowContent(InstructorAttributes instructor, CourseAttributes course, String expectedManageAccountLink, String expectedHomePageLink) { WebElement instructorRow = getInstructorRow(instructor); @@ -449,6 +624,33 @@ public void verifyInstructorRowContent(InstructorAttributes instructor, CourseAt assertEquals(expectedManageAccountLink, actualManageAccountLink); } + public void verifyInstructorRowContentAfterReset(Instructor instructor, Course course) { + WebElement instructorRow = getInstructorRow(instructor); + String actualCourseId = getInstructorCourseId(instructorRow); + String actualName = getInstructorName(instructorRow); + String actualInstitute = getInstructorInstitute(instructorRow); + + String expectedCourseId = instructor.getCourseId(); + String expectedName = instructor.getName(); + String expectedInstitute = StringHelper.convertToEmptyStringIfNull(course.getInstitute()); + + assertEquals(expectedCourseId, actualCourseId); + assertEquals(expectedName, actualName); + assertEquals(expectedInstitute, actualInstitute); + } + + public void verifyInstructorExpandedLinks(Instructor instructor) { + clickExpandInstructorLinks(); + WebElement instructorRow = getInstructorRow(instructor); + String actualEmail = getInstructorEmail(instructorRow); + String actualJoinLink = getInstructorJoinLink(instructorRow); + + String expectedEmail = instructor.getEmail(); + + assertEquals(expectedEmail, actualEmail); + assertNotEquals("", actualJoinLink); + } + public void verifyInstructorExpandedLinks(InstructorAttributes instructor) { clickExpandInstructorLinks(); WebElement instructorRow = getInstructorRow(instructor); @@ -515,6 +717,43 @@ public void verifyAccountRequestExpandedLinks(AccountRequest accountRequest) { assertFalse(actualRegistrationLink.isBlank()); } + public void verifyLinkExpansionButtons(Student student, + Instructor instructor, AccountRequest accountRequest) { + WebElement studentRow = getStudentRow(student); + WebElement instructorRow = getInstructorRow(instructor); + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + + clickExpandStudentLinks(); + clickExpandInstructorLinks(); + clickExpandAccountRequestLinks(); + int numExpandedStudentRows = getNumExpandedRows(studentRow); + int numExpandedInstructorRows = getNumExpandedRows(instructorRow); + int numExpandedAccountRequestRows = getNumExpandedRows(accountRequestRow); + assertNotEquals(numExpandedStudentRows, 0); + assertNotEquals(numExpandedInstructorRows, 0); + assertNotEquals(numExpandedAccountRequestRows, 0); + + clickCollapseInstructorLinks(); + numExpandedStudentRows = getNumExpandedRows(studentRow); + numExpandedInstructorRows = getNumExpandedRows(instructorRow); + numExpandedAccountRequestRows = getNumExpandedRows(accountRequestRow); + assertNotEquals(numExpandedStudentRows, 0); + assertEquals(numExpandedInstructorRows, 0); + assertNotEquals(numExpandedAccountRequestRows, 0); + + clickExpandInstructorLinks(); + clickCollapseStudentLinks(); + clickCollapseAccountRequestLinks(); + waitUntilAnimationFinish(); + + numExpandedStudentRows = getNumExpandedRows(studentRow); + numExpandedInstructorRows = getNumExpandedRows(instructorRow); + numExpandedAccountRequestRows = getNumExpandedRows(accountRequestRow); + assertEquals(numExpandedStudentRows, 0); + assertNotEquals(numExpandedInstructorRows, 0); + assertEquals(numExpandedAccountRequestRows, 0); + } + public void verifyLinkExpansionButtons(StudentAttributes student, InstructorAttributes instructor, AccountRequestAttributes accountRequest) { WebElement studentRow = getStudentRow(student); @@ -589,11 +828,11 @@ public void verifyLinkExpansionButtons(StudentAttributes student, assertEquals(numExpandedAccountRequestRows, 0); } - public void verifyRegenerateStudentKey(StudentAttributes student, String originalJoinLink) { - verifyStatusMessage("Student's key for this course has been successfully regenerated," + public void verifyRegenerateInstructorKey(Instructor instructor, String originalJoinLink) { + verifyStatusMessage("Instructor's key for this course has been successfully regenerated," + " and the email has been sent."); - String regeneratedJoinLink = getStudentJoinLink(student); + String regeneratedJoinLink = getInstructorJoinLink(instructor); assertNotEquals(regeneratedJoinLink, originalJoinLink); } @@ -604,5 +843,4 @@ public void verifyRegenerateInstructorKey(InstructorAttributes instructor, Strin String regeneratedJoinLink = getInstructorJoinLink(instructor); assertNotEquals(regeneratedJoinLink, originalJoinLink); } - } diff --git a/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java b/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java index e32bbcaaa96..11911490a04 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java @@ -392,6 +392,12 @@ public void fillNumScaleResponse(int qnNumber, String recipient, FeedbackRespons fillTextBox(getNumScaleInput(qnNumber, recipient), Double.toString(responseDetails.getAnswer())); } + public void fillNumScaleResponse(int qnNumber, String recipient, FeedbackResponse response) { + FeedbackNumericalScaleResponseDetails responseDetails = + (FeedbackNumericalScaleResponseDetails) response.getFeedbackResponseDetailsCopy(); + fillTextBox(getNumScaleInput(qnNumber, recipient), Double.toString(responseDetails.getAnswer())); + } + public void verifyNumScaleResponse(int qnNumber, String recipient, FeedbackResponseAttributes response) { FeedbackNumericalScaleResponseDetails responseDetails = (FeedbackNumericalScaleResponseDetails) response.getResponseDetailsCopy(); @@ -399,6 +405,13 @@ public void verifyNumScaleResponse(int qnNumber, String recipient, FeedbackRespo getDoubleString(responseDetails.getAnswer())); } + public void verifyNumScaleResponse(int qnNumber, String recipient, FeedbackResponse response) { + FeedbackNumericalScaleResponseDetails responseDetails = + (FeedbackNumericalScaleResponseDetails) response.getFeedbackResponseDetailsCopy(); + assertEquals(getNumScaleInput(qnNumber, recipient).getAttribute("value"), + getDoubleString(responseDetails.getAnswer())); + } + public void verifyConstSumQuestion(int qnNumber, String recipient, FeedbackConstantSumQuestionDetails questionDetails) { if (!questionDetails.isDistributeToRecipients()) { diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java index f104afcc7ba..8c824ccc1d7 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java @@ -674,6 +674,16 @@ public void addNumScaleQuestion(FeedbackQuestionAttributes feedbackQuestion) { clickSaveNewQuestionButton(); } + public void addNumScaleQuestion(FeedbackQuestion feedbackQuestion) { + addNewQuestion(5); + int questionNum = getNumQuestions(); + inputQuestionDetails(questionNum, feedbackQuestion); + FeedbackNumericalScaleQuestionDetails questionDetails = + (FeedbackNumericalScaleQuestionDetails) feedbackQuestion.getQuestionDetailsCopy(); + inputNumScaleDetails(questionNum, questionDetails); + clickSaveNewQuestionButton(); + } + public void editNumScaleQuestion(int questionNum, FeedbackNumericalScaleQuestionDetails questionDetails) { clickEditQuestionButton(questionNum); inputNumScaleDetails(questionNum, questionDetails); diff --git a/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json b/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json new file mode 100644 index 00000000000..94b28ae6ad2 --- /dev/null +++ b/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json @@ -0,0 +1,118 @@ +{ + "accounts": { + "instructor1OfCourse1": { + "id": "00000000-0000-4000-8000-000000000001", + "googleId": "tm.e2e.ASearch.instr1", + "name": "Instructor1 of Course1", + "email": "ASearch.instructor1@gmail.tmt" + }, + "instructor2OfCourse1": { + "id": "00000000-0000-4000-8000-000000000002", + "googleId": "tm.e2e.ASearch.instr2", + "name": "Instructor2 of Course1", + "email": "ASearch.instructor2@gmail.tmt" + }, + "student1InCourse1": { + "id": "00000000-0000-4000-8000-000000000003", + "googleId": "tm.e2e.ASearch.student1", + "name": "Student1 in course1", + "email": "ASearch.student@gmail.tmt" + } + }, + "accountRequests": { + "instructor1OfCourse1": { + "name": "Instructor1 of Course1", + "email": "ASearch.instructor1@gmail.tmt", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2011-01-01T00:00:00Z", + "registeredAt": "1970-02-14T00:00:00Z" + }, + "instructor2OfCourse1": { + "name": "Instructor2 of Course1", + "email": "ASearch.instructor2@gmail.tmt", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2011-01-01T00:00:00Z", + "registeredAt": "1970-02-14T00:00:00Z" + }, + "unregisteredInstructor1": { + "name": "Typical Instructor Name", + "email": "ASearch.unregisteredinstructor1@gmail.tmt", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2011-01-01T00:00:00Z" + } + }, + "courses": { + "typicalCourse1": { + "createdAt": "2012-04-01T23:59:00Z", + "id": "00000000-0000-4000-8000-000000000303", + "name": "ASearch Course 1", + "institute": "TEAMMATES Test Institute 0", + "timeZone": "Africa/Johannesburg" + } + }, + "sections": { + "section1InCourse1": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Section 1" + } + }, + "teams": { + "team1InCourse1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + } + }, + "instructors": { + "instructor1OfCourse1": { + "id": "00000000-0000-4000-8000-000000000501", + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "course": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Instructor1 of ASearch Course1", + "email": "ASearch.instructor@gmail.tmt", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "isDisplayedToStudents": true, + "displayName": "Instructor", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + } + } + }, + "students": { + "student1InCourse1": { + "id": "00000000-0000-4000-8000-000000000601", + "account": { + "id": "00000000-0000-4000-8000-000000000003" + }, + "course": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "email": "ASearch.student@gmail.tmt", + "name": "Student1 In ASearch Course1", + "comments": "comment for student1Course1" + } + } +} diff --git a/src/e2e/resources/data/FeedbackNumScaleQuestionE2ESqlTest.json b/src/e2e/resources/data/FeedbackNumScaleQuestionE2ESqlTest.json new file mode 100644 index 00000000000..908ecff638c --- /dev/null +++ b/src/e2e/resources/data/FeedbackNumScaleQuestionE2ESqlTest.json @@ -0,0 +1,268 @@ +{ + "accounts": { + "instructorWithSessions": { + "googleId": "tm.e2e.FNumScaleQn.instructor", + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000001" + }, + "tm.e2e.FNumScaleQn.alice.tmms": { + "googleId": "tm.e2e.FNumScaleQn.alice.tmms", + "name": "Alice Betsy", + "email": "alice.b.tmms@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000002" + } + }, + "accountRequests": {}, + "courses": { + "course": { + "id": "tm.e2e.FNumScaleQn.CS2104", + "name": "Programming Language Concepts", + "institute": "TEAMMATES Test Institute 1", + "timeZone": "Africa/Johannesburg" + }, + "course2": { + "id": "tm.e2e.FNumScaleQn.CS1101", + "name": "Programming Methodology", + "institute": "TEAMMATES Test Institute 1", + "timeZone": "Africa/Johannesburg" + } + }, + "instructors": { + "instructor": { + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "isDisplayedToStudents": true, + "privileges": { + "courseLevel": { + "canViewStudentInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true, + "canModifyCourse": true, + "canViewSessionInSections": true, + "canModifySession": true, + "canModifyStudent": true, + "canModifyInstructor": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "course": { + "id": "tm.e2e.FNumScaleQn.CS2104" + }, + "displayName": "Co-owner" + }, + "instructor2": { + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "isDisplayedToStudents": true, + "privileges": { + "courseLevel": { + "canViewStudentInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true, + "canModifyCourse": true, + "canViewSessionInSections": true, + "canModifySession": true, + "canModifyStudent": true, + "canModifyInstructor": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000502", + "course": { + "id": "tm.e2e.FNumScaleQn.CS1101" + }, + "displayName": "Co-owner" + } + }, + "sections": { + "ProgrammingLanguageConceptsNone": { + "id": "00000000-0000-4000-8000-000000000101", + "course": { + "id": "tm.e2e.FNumScaleQn.CS2104" + }, + "name": "None" + }, + "ProgrammingMethodologyNone": { + "id": "00000000-0000-4000-8000-000000000102", + "course": { + "id": "tm.e2e.FNumScaleQn.CS1101" + }, + "name": "None" + } + }, + "teams": { + "ProgrammingLanguageConceptsTeam1": { + "id": "00000000-0000-4000-8000-000000000201", + "section": { + "id": "00000000-0000-4000-8000-000000000101" + }, + "name": "Team 1" + }, + "ProgrammingLanguageConceptsTeam2": { + "id": "00000000-0000-4000-8000-000000000202", + "section": { + "id": "00000000-0000-4000-8000-000000000101" + }, + "name": "Team 2" + }, + "ProgrammingMethodologyTeam1": { + "id": "00000000-0000-4000-8000-000000000203", + "section": { + "id": "00000000-0000-4000-8000-000000000102" + }, + "name": "Team 1" + } + }, + "feedbackSessions": { + "openSession": { + "creatorEmail": "tmms.test@gmail.tmt", + "instructions": "

      Instructions for first session

      ", + "createdTime": "2012-04-01T23:59:00Z", + "startTime": "2012-04-01T22:00:00Z", + "endTime": "2026-04-30T22:00:00Z", + "sessionVisibleFromTime": "2012-04-01T22:00:00Z", + "resultsVisibleFromTime": "2026-05-01T22:00:00Z", + "timeZone": "Africa/Johannesburg", + "gracePeriod": 10, + "sentOpenEmail": false, + "sentClosingEmail": false, + "sentClosedEmail": false, + "sentPublishedEmail": false, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "studentDeadlines": {}, + "instructorDeadlines": {}, + "id": "00000000-0000-4000-8000-000000000701", + "course": { + "id": "tm.e2e.FNumScaleQn.CS2104" + }, + "name": "First Session" + }, + "openSession2": { + "creatorEmail": "tmms.test@gmail.tmt", + "instructions": "

      Instructions for second session

      ", + "createdTime": "2012-04-01T23:59:00Z", + "startTime": "2012-04-01T22:00:00Z", + "endTime": "2026-04-30T22:00:00Z", + "sessionVisibleFromTime": "2012-04-01T22:00:00Z", + "resultsVisibleFromTime": "2026-05-01T22:00:00Z", + "timeZone": "Africa/Johannesburg", + "gracePeriod": 10, + "sentOpenEmail": false, + "sentClosingEmail": false, + "sentClosedEmail": false, + "sentPublishedEmail": false, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "studentDeadlines": {}, + "instructorDeadlines": {}, + "id": "00000000-0000-4000-8000-000000000702", + "course": { + "id": "tm.e2e.FNumScaleQn.CS1101" + }, + "name": "Second Session" + } + }, + "feedbackQuestions": { + "qn1ForFirstSession": { + "id": "00000000-0000-4000-8000-000000000801", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000701" + }, + "questionDetails": { + "questionType": "NUMSCALE", + "questionText": "Rate this team's product", + "minScale": 0, + "maxScale": 10, + "step": 0.2 + }, + "description": "

      Testing description for first session

      ", + "questionNumber": 1, + "giverType": "STUDENTS", + "recipientType": "TEAMS_EXCLUDING_SELF", + "numOfEntitiesToGiveFeedbackTo": 1, + "showResponsesTo": ["INSTRUCTORS", "RECEIVER"], + "showGiverNameTo": ["INSTRUCTORS"], + "showRecipientNameTo": ["INSTRUCTORS", "RECEIVER"] + }, + "qn1ForSecondSession": { + "id": "00000000-0000-4000-8000-000000000802", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000702" + }, + "questionDetails": { + "questionType": "NUMSCALE", + "questionText": "Rate this team's teamwork", + "minScale": 1, + "maxScale": 10, + "step": 0.005 + }, + "description": "

      Testing description for second session

      ", + "questionNumber": 1, + "giverType": "STUDENTS", + "recipientType": "TEAMS_EXCLUDING_SELF", + "numOfEntitiesToGiveFeedbackTo": 1, + "showResponsesTo": ["INSTRUCTORS", "RECEIVER"], + "showGiverNameTo": ["INSTRUCTORS"], + "showRecipientNameTo": ["INSTRUCTORS", "RECEIVER"] + } + }, + "notifications": {}, + "readNotifications": {}, + "feedbackResponseComments": {}, + "students": { + "alice.tmms@FNumScaleQn.CS2104": { + "id": "00000000-0000-4000-8000-000000000601", + "account": { + "id": "00000000-0000-4000-8000-000000000002" + }, + "course": { + "id": "tm.e2e.FNumScaleQn.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "email": "alice.b.tmms@gmail.tmt", + "name": "Alice Betsy", + "comments": "This student's name is Alice Betsy" + }, + "benny.tmms@FNumScaleQn.CS2104": { + "id": "00000000-0000-4000-8000-000000000602", + "course": { + "id": "tm.e2e.FNumScaleQn.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000202" + }, + "email": "benny.tmms@gmail.tmt", + "name": "Benny Charles", + "comments": "This student's name is Benny Charles" + }, + "charlie.tmms@FNumScaleQn.CS1101": { + "id": "00000000-0000-4000-8000-000000000603", + "course": { + "id": "tm.e2e.FNumScaleQn.CS1101" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000203" + }, + "email": "charlie.tmms@gmail.tmt", + "name": "Charlie Davis", + "comments": "This student's name is Charlie Davis" + } + } +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index 78dcc2d13a1..61cc506ff93 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -9,8 +9,10 @@ + + diff --git a/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java b/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java index 408821c38b7..b10149b70b0 100644 --- a/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/GetCoursesActionIT.java @@ -122,6 +122,7 @@ public void testGetCoursesAction_withStudentEntityType_shouldReturnCorrectCourse loginAsStudent(student.getGoogleId()); CoursesData courses = getValidCourses(params); + courses.getCourses().sort((c1, c2) -> c1.getCourseId().compareTo(c2.getCourseId())); assertEquals(3, courses.getCourses().size()); Course expectedCourse1 = typicalBundle.courses.get("typicalCourse1"); Course expectedCourse2 = typicalBundle.courses.get("typicalCourse2"); diff --git a/src/lnp/java/teammates/lnp/sql/BaseLNPTestCase.java b/src/lnp/java/teammates/lnp/sql/BaseLNPTestCase.java new file mode 100644 index 00000000000..94cb0eb698b --- /dev/null +++ b/src/lnp/java/teammates/lnp/sql/BaseLNPTestCase.java @@ -0,0 +1,361 @@ +package teammates.lnp.sql; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.List; +import java.util.StringJoiner; + +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.jmeter.engine.StandardJMeterEngine; +import org.apache.jmeter.report.config.ConfigurationException; +import org.apache.jmeter.report.dashboard.GenerationException; +import org.apache.jmeter.report.dashboard.ReportGenerator; +import org.apache.jmeter.reporters.ResultCollector; +import org.apache.jmeter.reporters.Summariser; +import org.apache.jmeter.save.SaveService; +import org.apache.jmeter.util.JMeterUtils; +import org.apache.jorphan.collections.HashTree; +import org.apache.jorphan.collections.ListedHashTree; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.stream.JsonReader; + +import teammates.common.datatransfer.SqlDataBundle; +import teammates.common.exception.HttpRequestFailedException; +import teammates.common.util.JsonUtils; +import teammates.common.util.Logger; +import teammates.lnp.util.BackDoor; +import teammates.lnp.util.LNPResultsStatistics; +import teammates.lnp.util.LNPSpecification; +import teammates.lnp.util.LNPSqlTestData; +import teammates.lnp.util.TestProperties; +import teammates.test.BaseTestCase; +import teammates.test.FileHelper; + +/** + * Base class for all L&P test cases. + */ +public abstract class BaseLNPTestCase extends BaseTestCase { + + static final String GET = HttpGet.METHOD_NAME; + static final String POST = HttpPost.METHOD_NAME; + static final String PUT = HttpPut.METHOD_NAME; + static final String DELETE = HttpDelete.METHOD_NAME; + + private static final Logger log = Logger.getLogger(); + + private static final int RESULT_COUNT = 3; + + final BackDoor backdoor = BackDoor.getInstance(); + String timeStamp; + LNPSpecification specification; + + /** + * Returns the test data used for the current test. + */ + protected abstract LNPSqlTestData getTestData(); + + /** + * Returns the JMeter test plan for the L&P test case. + * @return A nested tree structure that consists of the various elements that are used in the JMeter test. + */ + protected abstract ListedHashTree getLnpTestPlan(); + + /** + * Sets up the specification for this L&P test case. + */ + protected abstract void setupSpecification(); + + /** + * Returns the path to the generated JSON data bundle file. + */ + protected String getJsonDataPath() { + return "/" + getClass().getSimpleName() + timeStamp + ".json"; + } + + /** + * Returns the path to the generated JMeter CSV config file. + */ + protected String getCsvConfigPath() { + return "/" + getClass().getSimpleName() + "Config" + timeStamp + ".csv"; + } + + /** + * Returns the path to the generated JTL test results file. + */ + protected String getJtlResultsPath() { + return "/" + getClass().getSimpleName() + timeStamp + ".jtl"; + } + + @Override + protected String getTestDataFolder() { + return TestProperties.LNP_TEST_DATA_FOLDER; + } + + /** + * Returns the path to the data file, relative to the project root directory. + */ + protected String getPathToTestDataFile(String fileName) { + return getTestDataFolder() + fileName; + } + + /** + * Returns the path to the JSON test results statistics file, relative to the project root directory. + */ + private String getPathToTestStatisticsResultsFile() { + return String.format("%s/%sStatistics%s.json", TestProperties.LNP_TEST_RESULTS_FOLDER, + this.getClass().getSimpleName(), this.timeStamp); + } + + String createFileAndDirectory(String directory, String fileName) throws IOException { + File dir = new File(directory); + if (!dir.exists()) { + dir.mkdir(); + } + + String pathToFile = directory + fileName; + File file = new File(pathToFile); + + // Write data to the file; overwrite if it already exists + if (file.exists()) { + file.delete(); + } + file.createNewFile(); + return pathToFile; + } + + /** + * Creates the JSON data and writes it to the file specified by {@link #getJsonDataPath()}. + */ + void createJsonDataFile(LNPSqlTestData testData) throws IOException { + SqlDataBundle jsonData = testData.generateJsonData(); + + String pathToResultFile = createFileAndDirectory(TestProperties.LNP_TEST_DATA_FOLDER, getJsonDataPath()); + try (BufferedWriter bw = Files.newBufferedWriter(Paths.get(pathToResultFile))) { + bw.write(JsonUtils.toJson(jsonData, SqlDataBundle.class)); + bw.flush(); + } + } + + /** + * Creates the CSV data and writes it to the file specified by {@link #getCsvConfigPath()}. + */ + private void createCsvConfigDataFile(LNPSqlTestData testData) throws IOException { + List headers = testData.generateCsvHeaders(); + List> valuesList = testData.generateCsvData(); + + String pathToCsvFile = createFileAndDirectory(TestProperties.LNP_TEST_DATA_FOLDER, getCsvConfigPath()); + try (BufferedWriter bw = Files.newBufferedWriter(Paths.get(pathToCsvFile))) { + // Write headers and data to the CSV file + bw.write(convertToCsv(headers)); + + for (List values : valuesList) { + bw.write(convertToCsv(values)); + } + + bw.flush(); + } + } + + /** + * Converts the list of {@code values} to a CSV row. + * @return A single string containing {@code values} separated by pipelines and ending with newline. + */ + String convertToCsv(List values) { + StringJoiner csvRow = new StringJoiner("|", "", "\n"); + for (String value : values) { + csvRow.add(value); + } + return csvRow.toString(); + } + + /** + * Returns the L&P test results statistics. + * @return The initialized result statistics from the L&P test results. + * @throws IOException if there is an error when loading the result file. + */ + private LNPResultsStatistics getResultsStatistics() throws IOException { + Gson gson = new Gson(); + JsonReader reader = new JsonReader(Files.newBufferedReader(Paths.get(getPathToTestStatisticsResultsFile()))); + JsonObject jsonObject = gson.fromJson(reader, JsonObject.class); + + JsonObject endpointStats = jsonObject.getAsJsonObject("HTTP Request Sampler"); + return gson.fromJson(endpointStats, LNPResultsStatistics.class); + } + + /** + * Renames the default results statistics file to the name of the test. + */ + private void renameStatisticsFile() { + File defaultFile = new File(TestProperties.LNP_TEST_RESULTS_FOLDER + "/statistics.json"); + File lnpStatisticsFile = new File(getPathToTestStatisticsResultsFile()); + + if (lnpStatisticsFile.exists()) { + lnpStatisticsFile.delete(); + } + if (!defaultFile.renameTo(lnpStatisticsFile)) { + log.warning("Failed to rename generated statistics.json file."); + } + } + + /** + * Setup and load the JMeter configuration and property files to run the Jmeter test. + * @throws IOException if the save service properties file cannot be loaded. + */ + private void setJmeterProperties() throws IOException { + JMeterUtils.loadJMeterProperties(TestProperties.JMETER_PROPERTIES_PATH); + JMeterUtils.setJMeterHome(TestProperties.JMETER_HOME); + JMeterUtils.initLocale(); + SaveService.loadProperties(); + } + + /** + * Creates the JSON test data and CSV config data files for the performance test from {@code testData}. + */ + protected void createTestData() throws IOException, HttpRequestFailedException { + LNPSqlTestData testData = getTestData(); + createJsonDataFile(testData); + persistTestData(); + createCsvConfigDataFile(testData); + } + + /** + * Creates the entities in the database from the JSON data file. + */ + protected void persistTestData() throws IOException, HttpRequestFailedException { + SqlDataBundle dataBundle = loadSqlDataBundle(getJsonDataPath()); + SqlDataBundle responseBody = backdoor.removeAndRestoreSqlDataBundle(dataBundle); + + String pathToResultFile = createFileAndDirectory(TestProperties.LNP_TEST_DATA_FOLDER, getJsonDataPath()); + String jsonValue = JsonUtils.toJson(responseBody, SqlDataBundle.class); + FileHelper.saveFile(pathToResultFile, jsonValue); + } + + /** + * Display the L&P results on the console. + */ + protected void displayLnpResults() throws IOException { + LNPResultsStatistics resultsStats = getResultsStatistics(); + + resultsStats.displayLnpResultsStatistics(); + specification.verifyLnpTestSuccess(resultsStats); + } + + /** + * Runs the JMeter test. + * @param shouldCreateJmxFile true if the generated test plan should be saved to a `.jmx` file which + * can be opened in the JMeter GUI, and false otherwise. + */ + protected void runJmeter(boolean shouldCreateJmxFile) throws IOException { + StandardJMeterEngine jmeter = new StandardJMeterEngine(); + setJmeterProperties(); + + HashTree testPlan = getLnpTestPlan(); + + if (shouldCreateJmxFile) { + String pathToConfigFile = createFileAndDirectory( + TestProperties.LNP_TEST_CONFIG_FOLDER, "/" + getClass().getSimpleName() + ".jmx"); + SaveService.saveTree(testPlan, Files.newOutputStream(Paths.get(pathToConfigFile))); + } + + // Add result collector to the test plan for generating results file + Summariser summariser = null; + String summariserName = JMeterUtils.getPropDefault("summariser.name", "summary"); + if (summariserName.length() > 0) { + summariser = new Summariser(summariserName); + } + + String resultsFile = createFileAndDirectory(TestProperties.LNP_TEST_RESULTS_FOLDER, getJtlResultsPath()); + ResultCollector resultCollector = new ResultCollector(summariser); + resultCollector.setFilename(resultsFile); + testPlan.add(testPlan.getArray()[0], resultCollector); + + // Run Jmeter Test + jmeter.configure(testPlan); + jmeter.run(); + + try { + ReportGenerator reportGenerator = new ReportGenerator(resultsFile, null); + reportGenerator.generate(); + } catch (ConfigurationException | GenerationException e) { + log.warning(e.getMessage()); + } + + renameStatisticsFile(); + } + + /** + * Deletes the data that was created in the database from the JSON data file. + */ + protected void deleteTestData() { + SqlDataBundle dataBundle = loadSqlDataBundle(getJsonDataPath()); + backdoor.removeSqlDataBundle(dataBundle); + } + + /** + * Deletes the JSON and CSV data files that were created. + */ + protected void deleteDataFiles() throws IOException { + String pathToJsonFile = getPathToTestDataFile(getJsonDataPath()); + String pathToCsvFile = getPathToTestDataFile(getCsvConfigPath()); + + Files.delete(Paths.get(pathToJsonFile)); + Files.delete(Paths.get(pathToCsvFile)); + } + + /** + * Deletes the oldest excess result .jtl file and the statistics file, if there are more than RESULT_COUNT. + */ + protected void cleanupResults() throws IOException { + File[] fileList = new File(TestProperties.LNP_TEST_RESULTS_FOLDER) + .listFiles((d, s) -> { + return s.contains(this.getClass().getSimpleName()); + }); + if (fileList == null) { + fileList = new File[] {}; + } + Arrays.sort(fileList, (a, b) -> { + return b.getName().compareTo(a.getName()); + }); + + int jtlCounter = 0; + int statisticsCounter = 0; + for (File file : fileList) { + if (file.getName().contains("Statistics")) { + statisticsCounter++; + if (statisticsCounter > RESULT_COUNT) { + Files.delete(file.toPath()); + } + } else { + jtlCounter++; + if (jtlCounter > RESULT_COUNT) { + Files.delete(file.toPath()); + } + } + } + } + + /** + * Sanitize the string to be CSV-safe string. + */ + protected String sanitizeForCsv(String originalString) { + return String.format("\"%s\"", originalString.replace(System.lineSeparator(), "").replace("\"", "\"\"")); + } + + /** + * Generates timestamp for generated statistics/CSV files in order to prevent concurrency issues. + */ + protected void generateTimeStamp() { + this.timeStamp = ZonedDateTime.now().format(DateTimeFormatter.ofPattern("_uuuuMMddHHmmss")); + } +} diff --git a/src/lnp/java/teammates/lnp/sql/InstructorCourseUpdateLNPTest.java b/src/lnp/java/teammates/lnp/sql/InstructorCourseUpdateLNPTest.java new file mode 100644 index 00000000000..6196fd1f916 --- /dev/null +++ b/src/lnp/java/teammates/lnp/sql/InstructorCourseUpdateLNPTest.java @@ -0,0 +1,216 @@ +package teammates.lnp.sql; + +import java.io.IOException; +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.jmeter.protocol.http.control.HeaderManager; +import org.apache.jorphan.collections.HashTree; +import org.apache.jorphan.collections.ListedHashTree; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.InstructorPermissionRole; +import teammates.common.datatransfer.InstructorPrivileges; +import teammates.common.datatransfer.SqlDataBundle; +import teammates.common.exception.HttpRequestFailedException; +import teammates.common.util.Const; +import teammates.common.util.JsonUtils; +import teammates.lnp.util.JMeterElements; +import teammates.lnp.util.LNPSpecification; +import teammates.lnp.util.LNPSqlTestData; +import teammates.storage.sqlentity.Account; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Instructor; +import teammates.ui.request.CourseUpdateRequest; + +/** + * L&P Test Case for course update cascade API. + */ +public class InstructorCourseUpdateLNPTest extends BaseLNPTestCase { + private static final int NUM_INSTRUCTORS = 1; + private static final int RAMP_UP_PERIOD = NUM_INSTRUCTORS * 2; + + private static final int NUM_FEEDBACK_SESSIONS = 500; + + private static final String COURSE_ID = "TestData.CS101"; + private static final String COURSE_NAME = "LnPCourse"; + private static final String COURSE_TIME_ZONE = "UTC"; + private static final String COURSE_INSTITUTE = "LnpInstitute"; + + private static final String ACCOUNT_NAME = "LnpAccount"; + + private static final String UPDATE_COURSE_NAME = "updatedCourse"; + private static final String UPDATE_COURSE_TIME_ZONE = "GMT"; + + private static final String INSTRUCTOR_ID = "LnPInstructor_id"; + private static final String INSTRUCTOR_NAME = "LnPInstructor"; + private static final String INSTRUCTOR_EMAIL = "tmms.test@gmail.tmt"; + + private static final String FEEDBACK_SESSION_NAME = "Test Feedback Session"; + + private static final double ERROR_RATE_LIMIT = 0.01; + private static final double MEAN_RESP_TIME_LIMIT = 10; + + @Override + protected LNPSqlTestData getTestData() { + Account instructorAccount = new Account(INSTRUCTOR_ID, ACCOUNT_NAME, INSTRUCTOR_EMAIL); + Course instructorCourse = new Course(COURSE_ID, COURSE_NAME, COURSE_TIME_ZONE, COURSE_INSTITUTE); + return new LNPSqlTestData() { + @Override + protected Map generateCourses() { + Map courses = new HashMap<>(); + + courses.put(COURSE_NAME, instructorCourse); + + return courses; + } + + @Override + protected Map generateAccounts() { + Map accounts = new HashMap<>(); + + accounts.put(ACCOUNT_NAME, instructorAccount); + + return accounts; + } + + @Override + protected Map generateInstructors() { + Map instructors = new HashMap<>(); + + Instructor instructor = new Instructor( + instructorCourse, INSTRUCTOR_NAME, INSTRUCTOR_EMAIL, + true, "Co-owner", InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_COOWNER, + new InstructorPrivileges(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_COOWNER)); + + instructor.setAccount(instructorAccount); + instructors.put(INSTRUCTOR_NAME, instructor); + + return instructors; + } + + @Override + protected Map generateFeedbackSessions() { + Map feedbackSessions = new LinkedHashMap<>(); + + for (int i = 1; i <= NUM_FEEDBACK_SESSIONS; i++) { + Instant now = Instant.now(); + FeedbackSession session = new FeedbackSession(FEEDBACK_SESSION_NAME + " " + i, + instructorCourse, INSTRUCTOR_EMAIL, "", + now.plus(Duration.ofMinutes(1)), now.plus(Duration.ofDays(1)), + now, now.plus(Duration.ofDays(2)), null, false, false, false); + + feedbackSessions.put(FEEDBACK_SESSION_NAME + " " + i, session); + } + + return feedbackSessions; + } + + @Override + public List generateCsvHeaders() { + List headers = new ArrayList<>(); + + headers.add("loginId"); + headers.add("courseId"); + headers.add("updateData"); + + return headers; + } + + @Override + public List> generateCsvData() { + SqlDataBundle dataBundle = loadSqlDataBundle(getJsonDataPath()); + List> csvData = new ArrayList<>(); + + dataBundle.instructors.forEach((key, instructor) -> { + List csvRow = new ArrayList<>(); + + csvRow.add(INSTRUCTOR_ID); + csvRow.add(COURSE_ID); + + CourseUpdateRequest courseUpdateRequest = new CourseUpdateRequest(); + courseUpdateRequest.setCourseName(UPDATE_COURSE_NAME); + courseUpdateRequest.setTimeZone(UPDATE_COURSE_TIME_ZONE); + + String updateData = sanitizeForCsv(JsonUtils.toJson(courseUpdateRequest)); + csvRow.add(updateData); + + csvData.add(csvRow); + }); + + return csvData; + } + }; + } + + private Map getRequestHeaders() { + Map headers = new HashMap<>(); + + headers.put(Const.HeaderNames.CSRF_TOKEN, "${csrfToken}"); + headers.put("Content-Type", "application/json"); + + return headers; + } + + private String getTestEndpoint() { + return Const.ResourceURIs.COURSE + "?courseid=${courseId}"; + } + + @Override + protected ListedHashTree getLnpTestPlan() { + ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + HashTree threadGroup = testPlan.add( + JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); + + threadGroup.add(JMeterElements.csvDataSet(getPathToTestDataFile(getCsvConfigPath()))); + threadGroup.add(JMeterElements.cookieManager()); + threadGroup.add(JMeterElements.defaultSampler()); + + threadGroup.add(JMeterElements.onceOnlyController()) + .add(JMeterElements.loginSampler()) + .add(JMeterElements.csrfExtractor("csrfToken")); + + // Add HTTP sampler for test endpoint + HeaderManager headerManager = JMeterElements.headerManager(getRequestHeaders()); + threadGroup.add(JMeterElements.httpSampler(getTestEndpoint(), PUT, "${updateData}")) + .add(headerManager); + + return testPlan; + } + + @Override + protected void setupSpecification() { + this.specification = LNPSpecification.builder() + .withErrorRateLimit(ERROR_RATE_LIMIT) + .withMeanRespTimeLimit(MEAN_RESP_TIME_LIMIT) + .build(); + } + + @BeforeClass + public void classSetup() throws IOException, HttpRequestFailedException { + generateTimeStamp(); + createTestData(); + setupSpecification(); + } + + @Test + public void runLnpTest() throws IOException { + runJmeter(false); + displayLnpResults(); + } + + @AfterClass + public void classTearDown() throws IOException { + deleteTestData(); + deleteDataFiles(); + cleanupResults(); + } +} diff --git a/src/lnp/java/teammates/lnp/sql/package-info.java b/src/lnp/java/teammates/lnp/sql/package-info.java new file mode 100644 index 00000000000..bf87f3a9fe8 --- /dev/null +++ b/src/lnp/java/teammates/lnp/sql/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains L&P test cases. + */ +package teammates.lnp.sql; diff --git a/src/lnp/java/teammates/lnp/util/LNPSqlTestData.java b/src/lnp/java/teammates/lnp/util/LNPSqlTestData.java new file mode 100644 index 00000000000..48aebf22f2d --- /dev/null +++ b/src/lnp/java/teammates/lnp/util/LNPSqlTestData.java @@ -0,0 +1,92 @@ +package teammates.lnp.util; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import teammates.common.datatransfer.SqlDataBundle; +import teammates.storage.sqlentity.Account; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackQuestion; +import teammates.storage.sqlentity.FeedbackResponse; +import teammates.storage.sqlentity.FeedbackResponseComment; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; + +/** + * L&P test data generator. + */ +public abstract class LNPSqlTestData { + + // CHECKSTYLE.OFF:MissingJavadocMethod generator for different entities are self-explained by the method name + + protected Map generateAccounts() { + return new HashMap<>(); + } + + protected Map generateCourses() { + return new HashMap<>(); + } + + protected Map generateInstructors() { + return new HashMap<>(); + } + + protected Map generateStudents() { + return new HashMap<>(); + } + + protected Map generateFeedbackSessions() { + return new HashMap<>(); + } + + protected Map generateFeedbackQuestions() { + return new HashMap<>(); + } + + protected Map generateFeedbackResponses() { + return new HashMap<>(); + } + + protected Map generateFeedbackResponseComments() { + return new HashMap<>(); + } + + // CHECKSTYLE.ON:MissingJavadocMethod + + /** + * Returns a JSON data bundle containing the data relevant for the performance test. + */ + public SqlDataBundle generateJsonData() { + SqlDataBundle dataBundle = new SqlDataBundle(); + + dataBundle.accounts = generateAccounts(); + dataBundle.courses = generateCourses(); + dataBundle.instructors = generateInstructors(); + dataBundle.students = generateStudents(); + dataBundle.feedbackSessions = generateFeedbackSessions(); + dataBundle.feedbackQuestions = generateFeedbackQuestions(); + dataBundle.feedbackResponses = generateFeedbackResponses(); + dataBundle.feedbackResponseComments = generateFeedbackResponseComments(); + + return dataBundle; + } + + /** + * Returns list of header fields for the data in the CSV file to be generated. + * + *

      Note that these header names should correspond to the variables used in the JMeter L&P test.

      + */ + public abstract List generateCsvHeaders(); + + /** + * Returns the data for the entries in the CSV file to be generated. + * The order of the field values for each entry should correspond to the order of headers specified + * in {@link #generateCsvHeaders()}. + * + * @return List of entries, which are made up of a list of field values. + */ + public abstract List> generateCsvData(); + +} diff --git a/src/main/java/teammates/common/util/HibernateUtil.java b/src/main/java/teammates/common/util/HibernateUtil.java index 5fb180758fc..8edcca6c807 100644 --- a/src/main/java/teammates/common/util/HibernateUtil.java +++ b/src/main/java/teammates/common/util/HibernateUtil.java @@ -111,15 +111,18 @@ public static void buildSessionFactory(String dbUrl, String username, String pas Configuration config = new Configuration() .setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect") .setProperty("hibernate.connection.driver_class", "org.postgresql.Driver") + .setProperty("hibernate.connection.provider_class", + "org.hibernate.hikaricp.internal.HikariCPConnectionProvider") .setProperty("hibernate.connection.username", username) .setProperty("hibernate.connection.password", password) .setProperty("hibernate.connection.url", dbUrl) - .setProperty("hibernate.hbm2ddl.auto", "update") + .setProperty("hibernate.hbm2ddl.auto", "validate") .setProperty("show_sql", "true") .setProperty("hibernate.current_session_context_class", "thread") - .setProperty("hibernate.agroal.minSize", "5") - .setProperty("hibernate.agroal.maxSize", "50") - .setProperty("hibernate.agroal.reapTimeout", "PT1M") + .setProperty("hibernate.hikari.minimumIdle", "10") + .setProperty("hibernate.hikari.maximumPoolSize", "30") + .setProperty("hibernate.hikari.idleTimeout", "300000") + .setProperty("hibernate.hikari.connectionTimeout", "30000") // Uncomment only during migration for optimized batch-insertion, batch-update, and batch-fetch. // .setProperty("hibernate.jdbc.batch_size", "50") // .setProperty("hibernate.order_updates", "true") @@ -127,6 +130,10 @@ public static void buildSessionFactory(String dbUrl, String username, String pas // .setProperty("hibernate.jdbc.fetch_size", "50") .addPackage("teammates.storage.sqlentity"); + if (Config.IS_DEV_SERVER) { + config.setProperty("hibernate.hbm2ddl.auto", "update"); + } + for (Class cls : ANNOTATED_CLASSES) { config = config.addAnnotatedClass(cls); } diff --git a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java index 2fb76991cc6..cc5fc4507e7 100644 --- a/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java +++ b/src/main/java/teammates/sqllogic/api/SqlEmailGenerator.java @@ -257,12 +257,10 @@ public EmailWrapper generateFeedbackSessionSummaryOfCourse( Course course = coursesLogic.getCourse(courseId); boolean isInstructor = emailType == EmailType.INSTRUCTOR_COURSE_LINKS_REGENERATED; - Student student = null; + Student student = usersLogic.getStudentForEmail(courseId, userEmail); Instructor instructor = null; if (isInstructor) { instructor = usersLogic.getInstructorForEmail(courseId, userEmail); - } else { - student = usersLogic.getStudentForEmail(courseId, userEmail); } List sessions = new ArrayList<>(); @@ -869,11 +867,11 @@ private EmailWrapper generateFeedbackSessionEmailBaseForNotifiedInstructors( } private boolean isYetToJoinCourse(Student student) { - return student.getAccount().getGoogleId() == null || student.getAccount().getGoogleId().isEmpty(); + return student.getAccount() == null || student.getAccount().getGoogleId().isEmpty(); } private boolean isYetToJoinCourse(Instructor instructor) { - return instructor.getAccount().getGoogleId() == null || instructor.getAccount().getGoogleId().isEmpty(); + return instructor.getAccount() == null || instructor.getAccount().getGoogleId().isEmpty(); } /** diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java index cf25a3897b5..9f91c1b552f 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java @@ -8,8 +8,6 @@ import java.util.UUID; import org.apache.commons.lang.StringUtils; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; import org.hibernate.annotations.UpdateTimestamp; @@ -92,12 +90,10 @@ public class FeedbackSession extends BaseEntity { private boolean isPublishedEmailSent; @OneToMany(mappedBy = "feedbackSession", cascade = CascadeType.REMOVE) - @Fetch(FetchMode.JOIN) @OnDelete(action = OnDeleteAction.CASCADE) private List deadlineExtensions = new ArrayList<>(); @OneToMany(mappedBy = "feedbackSession", cascade = CascadeType.REMOVE) - @Fetch(FetchMode.JOIN) @OnDelete(action = OnDeleteAction.CASCADE) private List feedbackQuestions = new ArrayList<>(); diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java index 9693901d041..ba135c7cae8 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java @@ -33,8 +33,7 @@ public FeedbackRankOptionsQuestion( String description, FeedbackParticipantType giverType, FeedbackParticipantType recipientType, Integer numOfEntitiesToGiveFeedbackTo, List showResponsesTo, List showGiverNameTo, List showRecipientNameTo, - FeedbackQuestionDetails feedbackQuestionDetails - ) { + FeedbackQuestionDetails feedbackQuestionDetails) { super(feedbackSession, questionNumber, description, giverType, recipientType, numOfEntitiesToGiveFeedbackTo, showResponsesTo, showGiverNameTo, showRecipientNameTo); setFeedBackQuestionDetails((FeedbackRankOptionsQuestionDetails) feedbackQuestionDetails); diff --git a/src/main/resources/db/changelog/db.changelog-root.xml b/src/main/resources/db/changelog/db.changelog-root.xml index 66d4b7d7c88..af5c5e34d7e 100644 --- a/src/main/resources/db/changelog/db.changelog-root.xml +++ b/src/main/resources/db/changelog/db.changelog-root.xml @@ -4,5 +4,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + diff --git a/src/main/resources/db/changelog/db.changelog-v9.0.0.xml b/src/main/resources/db/changelog/db.changelog-v9.0.0.xml new file mode 100644 index 00000000000..94c02f08ed6 --- /dev/null +++ b/src/main/resources/db/changelog/db.changelog-v9.0.0.xml @@ -0,0 +1,539 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-v9.xml b/src/main/resources/db/changelog/db.changelog-v9.xml deleted file mode 100644 index 57b6e7f9587..00000000000 --- a/src/main/resources/db/changelog/db.changelog-v9.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/java/teammates/architecture/ArchitectureTest.java b/src/test/java/teammates/architecture/ArchitectureTest.java index 1113db61372..83d1221a6e2 100644 --- a/src/test/java/teammates/architecture/ArchitectureTest.java +++ b/src/test/java/teammates/architecture/ArchitectureTest.java @@ -49,6 +49,7 @@ public class ArchitectureTest { private static final String LNP_PACKAGE = "teammates.lnp"; private static final String LNP_CASES_PACKAGE = LNP_PACKAGE + ".cases"; + private static final String LNP_SQL_PACKAGE = LNP_PACKAGE + ".sql"; private static final String LNP_UTIL_PACKAGE = LNP_PACKAGE + ".util"; private static final String CLIENT_PACKAGE = "teammates.client"; @@ -413,7 +414,13 @@ public void testArchitecture_lnp_lnpShouldBeSelfContained() { @Test public void testArchitecture_lnp_lnpShouldNotTouchProductionCodeExceptCommonAndRequests() { noClasses().that().resideInAPackage(includeSubpackages(LNP_PACKAGE)) - .should().accessClassesThat().resideInAPackage(includeSubpackages(STORAGE_PACKAGE)) + .should().accessClassesThat(new DescribedPredicate<>("") { + @Override + public boolean apply(JavaClass input) { + return input.getPackageName().startsWith(STORAGE_PACKAGE) + && !input.getPackageName().startsWith(STORAGE_SQL_ENTITY_PACKAGE); + } + }) .orShould().accessClassesThat().resideInAPackage(includeSubpackages(LOGIC_PACKAGE)) .orShould().accessClassesThat(new DescribedPredicate<>("") { @Override @@ -442,6 +449,23 @@ public boolean apply(JavaClass input) { }).check(forClasses(LNP_CASES_PACKAGE)); } + @Test + public void testArchitecture_lnp_lnpSqlTestCasesShouldBeIndependentOfEachOther() { + noClasses().that(new DescribedPredicate<>("") { + @Override + public boolean apply(JavaClass input) { + return input.getPackageName().startsWith(LNP_SQL_PACKAGE) && !input.isInnerClass(); + } + }).should().accessClassesThat(new DescribedPredicate<>("") { + @Override + public boolean apply(JavaClass input) { + return input.getPackageName().startsWith(LNP_SQL_PACKAGE) + && !input.getSimpleName().startsWith("Base") + && !input.isInnerClass(); + } + }).check(forClasses(LNP_SQL_PACKAGE)); + } + @Test public void testArchitecture_lnp_lnpShouldNotHaveAnyDependency() { noClasses().that().resideInAPackage(includeSubpackages(LNP_UTIL_PACKAGE)) From 8d506a13d6a11feb0d7129b1c2563e82b7b5527d Mon Sep 17 00:00:00 2001 From: DS Date: Sat, 13 Apr 2024 23:26:40 +0800 Subject: [PATCH 51/95] [#11843] Update front end for session activity logs (#12973) * Create FeedbackSessionLog entity * fix lint * Create UpdateFeedbackSessionLogsAction * Sort query results from logging service * Update type of feedbackSessionLogType * Fix naming * Fix enum in entity * Update filter to differentiate by session * Add Uri Info * Add tests * Update test case * Update to getOrderedFeedbackSessionLogs * Create skeleton * Implement logic and db layer * fix lint * Update entity * Fix tests * Update action to use fslDb * Fix tests * Update DbIT to use databundle * Fix bugs and optimize action * Prevent courseId from being null * Update GCP logs to store ids * Fix tests * Update action to use reference * Add some error handling * Fix tests * Add ids to api output * Fix lint * Update front end * Update cron.yaml * Update front end * Fix result display * Tidy up code * Update actions to use getUuid * Fix formatting * Fix bug * Add buttons to access page * Shift logging * fiox bug * fix fe tests * Fix bug * Fix tests * Add IT * remove email and fsname * fix ts lint * Fix status message * Remove front end error messages * Add assertion fortests * Fix migrated check * Change to use id * Update javadoc * Change cron job to 15 mins intervals * fix tests * fix fe bug * Add delay note * Update to use const * Add const * fix fe tests --- .../CreateFeedbackSessionLogActionIT.java | 160 ++++++++++++++++++ .../GetFeedbackSessionLogsActionIT.java | 17 +- .../UpdateFeedbackSessionLogsActionIT.java | 121 +++++-------- src/main/appengine/cron.yaml | 2 +- .../datatransfer/FeedbackSessionLogEntry.java | 8 +- .../java/teammates/common/util/Const.java | 5 + .../teammates/common/util/TimeHelper.java | 12 ++ .../teammates/logic/api/LogsProcessor.java | 5 +- .../external/GoogleCloudLoggingService.java | 17 +- .../logic/external/LocalLoggingService.java | 5 +- .../teammates/logic/external/LogService.java | 5 +- .../java/teammates/ui/constants/ApiConst.java | 4 +- .../java/teammates/ui/output/CourseData.java | 8 + .../CreateFeedbackSessionLogAction.java | 28 +-- .../webapi/GetFeedbackSessionLogsAction.java | 30 +++- .../UpdateFeedbackSessionLogsAction.java | 16 +- .../teammates/common/util/TimeHelperTest.java | 64 +++++++ .../logic/api/MockLogsProcessor.java | 11 +- .../GetFeedbackSessionLogsActionTest.java | 24 +-- .../UpdateFeedbackSessionLogsActionTest.java | 96 +++++------ .../CreateFeedbackSessionLogActionTest.java | 29 ++-- .../instructor-courses-page.component.html | 7 +- .../instructor-home-page.component.html | 5 + ...udent-activity-logs.component.spec.ts.snap | 42 +++-- ...uctor-student-activity-logs.component.html | 12 +- ...or-student-activity-logs.component.spec.ts | 10 +- ...tructor-student-activity-logs.component.ts | 120 +++++++++---- ...session-result-page.component.spec.ts.snap | 16 ++ .../session-result-page.component.spec.ts | 2 +- .../session-result-page.component.ts | 48 ++++-- ...ion-submission-page.component.spec.ts.snap | 16 ++ .../session-submission-page.component.ts | 53 +++--- src/web/services/log.service.ts | 20 +++ 33 files changed, 698 insertions(+), 320 deletions(-) create mode 100644 src/it/java/teammates/it/ui/webapi/CreateFeedbackSessionLogActionIT.java diff --git a/src/it/java/teammates/it/ui/webapi/CreateFeedbackSessionLogActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateFeedbackSessionLogActionIT.java new file mode 100644 index 00000000000..c15c45752cc --- /dev/null +++ b/src/it/java/teammates/it/ui/webapi/CreateFeedbackSessionLogActionIT.java @@ -0,0 +1,160 @@ +package teammates.it.ui.webapi; + +import java.util.UUID; + +import org.testng.annotations.Test; + +import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.Const; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Student; +import teammates.ui.output.MessageOutput; +import teammates.ui.webapi.CreateFeedbackSessionLogAction; +import teammates.ui.webapi.JsonResult; + +/** + * SUT: {@link CreateFeedbackSessionLogAction}. + */ +public class CreateFeedbackSessionLogActionIT extends BaseActionIT { + + @Override + protected String getActionUri() { + return Const.ResourceURIs.SESSION_LOGS; + } + + @Override + protected String getRequestMethod() { + return POST; + } + + @Test + @Override + protected void testExecute() throws Exception { + Course course1 = typicalBundle.courses.get("course1"); + String courseId1 = course1.getId(); + FeedbackSession fs1 = typicalBundle.feedbackSessions.get("session1InCourse1"); + FeedbackSession fs2 = typicalBundle.feedbackSessions.get("session2InTypicalCourse"); + Student student1 = typicalBundle.students.get("student1InCourse1"); + Student student2 = typicalBundle.students.get("student2InCourse1"); + Student student3 = typicalBundle.students.get("student1InCourse3"); + + ______TS("Failure case: not enough parameters"); + verifyHttpParameterFailure(Const.ParamsNames.COURSE_ID, courseId1); + verifyHttpParameterFailure( + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName() + ); + verifyHttpParameterFailure( + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail() + ); + verifyHttpParameterFailure( + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.ACCESS.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail() + ); + verifyHttpParameterFailure( + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_ID, fs2.getId().toString(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_SQL_ID, student2.getId().toString() + ); + + ______TS("Failure case: invalid log type"); + String[] paramsInvalid = { + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, "invalid log type", + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), + }; + verifyHttpParameterFailure(paramsInvalid); + + ______TS("Success case: typical access"); + String[] paramsSuccessfulAccess = { + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.ACCESS.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), + }; + JsonResult response = getJsonResult(getAction(paramsSuccessfulAccess)); + MessageOutput output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); + + ______TS("Success case: typical submission"); + String[] paramsSuccessfulSubmission = { + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs2.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student2.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs2.getId().toString(), + Const.ParamsNames.STUDENT_SQL_ID, student2.getId().toString(), + }; + response = getJsonResult(getAction(paramsSuccessfulSubmission)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); + + ______TS("Success case: should create even for invalid parameters"); + String[] paramsNonExistentCourseId = { + Const.ParamsNames.COURSE_ID, "non-existent-course-id", + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), + }; + response = getJsonResult(getAction(paramsNonExistentCourseId)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); + + ______TS("Success case: should create even for invalid parameters"); + String[] paramsNonExistentFsName = { + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, "non-existent-feedback-session-name", + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_ID, UUID.randomUUID().toString(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), + }; + response = getJsonResult(getAction(paramsNonExistentFsName)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); + + String[] paramsNonExistentStudentEmail = { + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, "non-existent-student@email.com", + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), + Const.ParamsNames.STUDENT_SQL_ID, UUID.randomUUID().toString(), + }; + response = getJsonResult(getAction(paramsNonExistentStudentEmail)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); + + ______TS("Success case: should create even when student cannot access feedback session in course"); + String[] paramsWithoutAccess = { + Const.ParamsNames.COURSE_ID, courseId1, + Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), + Const.ParamsNames.STUDENT_EMAIL, student3.getEmail(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), + Const.ParamsNames.STUDENT_SQL_ID, student3.getId().toString(), + }; + response = getJsonResult(getAction(paramsWithoutAccess)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); + } + + @Test + @Override + protected void testAccessControl() throws Exception { + verifyAnyUserCanAccess(); + } +} diff --git a/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java b/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java index 9413be9d691..238e9175465 100644 --- a/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/GetFeedbackSessionLogsActionIT.java @@ -41,7 +41,7 @@ protected String getRequestMethod() { return GET; } - @Test(enabled = false) + @Test @Override protected void testExecute() { JsonResult actionOutput; @@ -49,7 +49,6 @@ protected void testExecute() { Course course = typicalBundle.courses.get("course1"); String courseId = course.getId(); FeedbackSession fsa1 = typicalBundle.feedbackSessions.get("session1InCourse1"); - String fsa1Name = fsa1.getName(); Student student1 = typicalBundle.students.get("student1InCourse1"); Student student2 = typicalBundle.students.get("student2InCourse1"); String student1Email = student1.getEmail(); @@ -73,16 +72,16 @@ protected void testExecute() { ______TS("Failure case: invalid course id"); String[] paramsInvalid1 = { Const.ParamsNames.COURSE_ID, "fake-course-id", - Const.ParamsNames.STUDENT_EMAIL, student1Email, + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; verifyEntityNotFound(paramsInvalid1); - ______TS("Failure case: invalid student email"); + ______TS("Failure case: invalid student id"); String[] paramsInvalid2 = { Const.ParamsNames.COURSE_ID, courseId, - Const.ParamsNames.STUDENT_EMAIL, "fake-student-email@gmail.com", + Const.ParamsNames.STUDENT_SQL_ID, "00000000-0000-0000-0000-000000000000", Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; @@ -140,10 +139,10 @@ protected void testExecute() { assertEquals(fsLogEntries2.get(1).getStudentData().getEmail(), student1Email); assertEquals(fsLogEntries2.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); - ______TS("Success case: should accept optional email"); + ______TS("Success case: should accept optional student Id"); String[] paramsSuccessful2 = { Const.ParamsNames.COURSE_ID, courseId, - Const.ParamsNames.STUDENT_EMAIL, student1Email, + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; @@ -170,10 +169,10 @@ protected void testExecute() { assertEquals(fsLogEntries2.get(1).getStudentData().getEmail(), student1Email); assertEquals(fsLogEntries2.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); - ______TS("Success case: should accept feedback session"); + ______TS("Success case: should accept optional feedback session"); String[] paramsSuccessful3 = { Const.ParamsNames.COURSE_ID, courseId, - Const.ParamsNames.FEEDBACK_SESSION_NAME, fsa1Name, + Const.ParamsNames.FEEDBACK_SESSION_ID, fsa1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; diff --git a/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java index ce30c978426..b6f2a8b1f47 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java @@ -26,8 +26,8 @@ */ public class UpdateFeedbackSessionLogsActionIT extends BaseActionIT { - static final int COLLECTION_TIME_PERIOD = 60; // represents one hour - static final long SPAM_FILTER = 2000L; // in ms + static final long COLLECTION_TIME_PERIOD = Const.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL.toMinutes(); + static final long SPAM_FILTER = Const.STUDENT_ACTIVITY_LOGS_FILTER_WINDOW.toMillis(); Student student1InCourse1; Student student2InCourse1; @@ -51,7 +51,7 @@ protected void setUp() throws Exception { HibernateUtil.flushSession(); SearchManagerFactory.getStudentSearchManager().resetCollections(); - endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); + endTime = TimeHelper.getInstantNearestQuarterHourBefore(Instant.now()); startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); course1 = typicalBundle.courses.get("course1"); @@ -65,7 +65,7 @@ protected void setUp() throws Exception { session2InCourse1 = typicalBundle.feedbackSessions.get("session2InTypicalCourse"); session1InCourse3 = typicalBundle.feedbackSessions.get("ongoingSession1InCourse3"); - mockLogsProcessor.getOrderedFeedbackSessionLogs("", "GET", 0, 0, "DELETE").clear(); + mockLogsProcessor.getOrderedFeedbackSessionLogs("", "", 0, 0, "").clear(); } @Override @@ -84,56 +84,44 @@ protected void testExecute() { ______TS("No spam all logs added"); // Different Types mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(100).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.SUBMISSION.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.SUBMISSION.getLabel(), + startTime.plusSeconds(100).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.VIEW_RESULT.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.VIEW_RESULT.getLabel(), + startTime.plusSeconds(100).toEpochMilli()); // Different feedback sessions mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(600).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(200).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session2InCourse1.getId(), session2InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(600).toEpochMilli()); + session2InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(200).toEpochMilli()); // Different Student mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(900).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student2InCourse1.getId(), - student2InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(900).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); // Different course mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(1200).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(400).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course3.getId(), student1InCourse3.getId(), - student1InCourse3.getEmail(), - session1InCourse3.getId(), session1InCourse3.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(1200).toEpochMilli()); + session1InCourse3.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(400).toEpochMilli()); // Gap is larger than spam filter mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); @@ -153,44 +141,34 @@ protected void testExecute() { protected void testExecute_recentLogsWithSpam_someLogsCreated() { // Gap is smaller than spam filter mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER - 2).toEpochMilli()); // Filters multiple logs within one spam window mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER - 1).toEpochMilli()); // Correctly adds new log after filtering mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); // Filters out spam in the new window mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 2).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); List expected = new ArrayList<>(); - expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.toEpochMilli())); - expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); List actual = logic.getOrderedFeedbackSessionLogs(course1.getId(), null, null, startTime, endTime); @@ -201,37 +179,28 @@ protected void testExecute_recentLogsWithSpam_someLogsCreated() { protected void testExecute_badLogs_otherLogsCreated() { UUID badUuid = UUID.fromString("00000000-0000-0000-0000-000000000000"); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(100).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(900).toEpochMilli()); + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusSeconds(300).toEpochMilli()); // bad student id - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), badUuid, student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(600).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), badUuid, session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(200).toEpochMilli()); // bad session id - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - badUuid, session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(600).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), badUuid, + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(200).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); List expected = new ArrayList<>(); - expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(300).toEpochMilli())); - expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), - student1InCourse1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(900).toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(100).toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(300).toEpochMilli())); List actual = logic.getOrderedFeedbackSessionLogs(course1.getId(), null, null, startTime, endTime); diff --git a/src/main/appengine/cron.yaml b/src/main/appengine/cron.yaml index 996ff3d8401..f6426a84e1e 100644 --- a/src/main/appengine/cron.yaml +++ b/src/main/appengine/cron.yaml @@ -34,6 +34,6 @@ cron: timezone: 'Asia/Singapore' description: 'Compile severe logs and sends out email notifications.' - url: '/auto/updateFeedbackSessionLogs' - schedule: 'every 60 minutes from 00:15 to 23:59' + schedule: 'every 15 minutes from 00:01 to 23:59' timezone: 'Asia/Singapore' description: 'Process feedback session activity logs from logging service and store in the database.' diff --git a/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java b/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java index d0aef5ce481..10608f179fb 100644 --- a/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java +++ b/src/main/java/teammates/common/datatransfer/FeedbackSessionLogEntry.java @@ -25,13 +25,13 @@ public FeedbackSessionLogEntry(String courseId, String studentEmail, this.timestamp = timestamp; } - public FeedbackSessionLogEntry(String courseId, UUID studentId, String studentEmail, UUID feedbackSessionId, - String feedbackSessionName, String feedbackSessionLogType, long timestamp) { + public FeedbackSessionLogEntry(String courseId, UUID studentId, UUID feedbackSessionId, + String feedbackSessionLogType, long timestamp) { this.courseId = courseId; this.studentId = studentId; - this.studentEmail = studentEmail; + this.studentEmail = null; this.feedbackSessionId = feedbackSessionId; - this.feedbackSessionName = feedbackSessionName; + this.feedbackSessionName = null; this.feedbackSessionLogType = feedbackSessionLogType; this.timestamp = timestamp; } diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index 4aad059a211..c48fa64e0ed 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -45,6 +45,9 @@ public final class Const { public static final String MISSING_RESPONSE_TEXT = "No Response"; + public static final Duration STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL = Duration.ofMinutes(15); + public static final Duration STUDENT_ACTIVITY_LOGS_FILTER_WINDOW = Duration.ofSeconds(2); + // These constants are used as variable values to mean that the variable is in a 'special' state. public static final int INT_UNINITIALIZED = -9999; @@ -123,6 +126,7 @@ public static class ParamsNames { public static final String IS_CREATING_ACCOUNT = "iscreatingaccount"; public static final String IS_INSTRUCTOR = "isinstructor"; + public static final String FEEDBACK_SESSION_ID = "fsid"; public static final String FEEDBACK_SESSION_NAME = "fsname"; public static final String FEEDBACK_SESSION_STARTTIME = "starttime"; public static final String FEEDBACK_SESSION_ENDTIME = "endtime"; @@ -144,6 +148,7 @@ public static class ParamsNames { public static final String PREVIEWAS = "previewas"; + public static final String STUDENT_SQL_ID = "studentid"; public static final String STUDENT_ID = "googleid"; public static final String INVITER_ID = "invitergoogleid"; diff --git a/src/main/java/teammates/common/util/TimeHelper.java b/src/main/java/teammates/common/util/TimeHelper.java index 8122ff6f39a..de7d58f796a 100644 --- a/src/main/java/teammates/common/util/TimeHelper.java +++ b/src/main/java/teammates/common/util/TimeHelper.java @@ -29,6 +29,18 @@ public static Instant getInstantNearestHourBefore(Instant instant) { return parseInstant(nearestHourString); } + /** + * Returns an Instant that represents the nearest quarter hour before the given object. + * + *

      The time zone used is assumed to be the default timezone, namely UTC. + */ + public static Instant getInstantNearestQuarterHourBefore(Instant instant) { + ZonedDateTime zdt = instant.atZone(ZoneId.of(Const.DEFAULT_TIME_ZONE)); + int minutesPastQuarter = zdt.getMinute() % 15; + ZonedDateTime nearestQuarterZdt = zdt.minusMinutes(minutesPastQuarter).withSecond(0).withNano(0); + return nearestQuarterZdt.toInstant(); + } + /** * Returns an Instant that is offset by a number of days from now. * diff --git a/src/main/java/teammates/logic/api/LogsProcessor.java b/src/main/java/teammates/logic/api/LogsProcessor.java index 1aca48e7147..57d889be488 100644 --- a/src/main/java/teammates/logic/api/LogsProcessor.java +++ b/src/main/java/teammates/logic/api/LogsProcessor.java @@ -54,9 +54,8 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam /** * Creates a feedback session log. */ - public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, - String fslType) { - service.createFeedbackSessionLog(courseId, studentId, email, fsId, fsName, fslType); + public void createFeedbackSessionLog(String courseId, UUID studentId, UUID fsId, String fslType) { + service.createFeedbackSessionLog(courseId, studentId, fsId, fslType); } /** diff --git a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java index 6d49eb3f26a..be758f8809c 100644 --- a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java +++ b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java @@ -116,8 +116,7 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam } @Override - public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, - String fslType) { + public void createFeedbackSessionLog(String courseId, UUID studentId, UUID fsId, String fslType) { // This method is not necessary for production usage because a feedback session log // is already separately created through the standardized logging infrastructure. // However, this method is not removed as it is necessary to assist in local testing. @@ -163,10 +162,16 @@ public List getOrderedFeedbackSessionLogs(String course continue; } - FeedbackSessionLogEntry fslEntry = new FeedbackSessionLogEntry(details.getCourseId(), - UUID.fromString(details.getStudentId()), details.getStudentEmail(), - UUID.fromString(details.getFeedbackSessionId()), details.getFeedbackSessionName(), - details.getAccessType(), timestamp); + UUID studentId = details.getStudentId() != null ? UUID.fromString(details.getStudentId()) : null; + UUID fsId = details.getFeedbackSessionId() != null ? UUID.fromString(details.getFeedbackSessionId()) : null; + FeedbackSessionLogEntry fslEntry; + if (fsId != null && studentId != null) { + fslEntry = new FeedbackSessionLogEntry(details.getCourseId(), studentId, fsId, details.getAccessType(), + timestamp); + } else { + fslEntry = new FeedbackSessionLogEntry(details.getCourseId(), details.getStudentEmail(), + details.getFeedbackSessionName(), details.getAccessType(), timestamp); + } fsLogEntries.add(fslEntry); } diff --git a/src/main/java/teammates/logic/external/LocalLoggingService.java b/src/main/java/teammates/logic/external/LocalLoggingService.java index ac6c4c10fc2..9750206fa37 100644 --- a/src/main/java/teammates/logic/external/LocalLoggingService.java +++ b/src/main/java/teammates/logic/external/LocalLoggingService.java @@ -210,9 +210,8 @@ public void createFeedbackSessionLog(String courseId, String email, String fsNam } @Override - public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, - String fslType) { - FeedbackSessionLogEntry logEntry = new FeedbackSessionLogEntry(courseId, studentId, email, fsId, fsName, + public void createFeedbackSessionLog(String courseId, UUID studentId, UUID fsId, String fslType) { + FeedbackSessionLogEntry logEntry = new FeedbackSessionLogEntry(courseId, studentId, fsId, fslType, Instant.now().toEpochMilli()); FEEDBACK_SESSION_LOG_ENTRIES.computeIfAbsent(courseId, k -> new ArrayList<>()).add(logEntry); } diff --git a/src/main/java/teammates/logic/external/LogService.java b/src/main/java/teammates/logic/external/LogService.java index ab0b705fef4..08f3653d2d3 100644 --- a/src/main/java/teammates/logic/external/LogService.java +++ b/src/main/java/teammates/logic/external/LogService.java @@ -23,10 +23,9 @@ public interface LogService { void createFeedbackSessionLog(String courseId, String email, String fsName, String fslType); /** - * Creates a feedback session log. + * Creates a feedback session log for migrated courses. */ - void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, - String fslType); + void createFeedbackSessionLog(String courseId, UUID studentId, UUID fsId, String fslType); /** * Gets the feedback session logs as filtered by the given parameters ordered by ascending timestamp. diff --git a/src/main/java/teammates/ui/constants/ApiConst.java b/src/main/java/teammates/ui/constants/ApiConst.java index ce946c8f3e6..2a411e7b1bd 100644 --- a/src/main/java/teammates/ui/constants/ApiConst.java +++ b/src/main/java/teammates/ui/constants/ApiConst.java @@ -28,7 +28,9 @@ public enum ApiConst { RANK_RECIPIENTS_ANSWER_NOT_SUBMITTED(Const.POINTS_NOT_SUBMITTED), NO_VALUE(Const.POINTS_NO_VALUE), LOGS_RETENTION_PERIOD(Const.LOGS_RETENTION_PERIOD.toDays()), - SEARCH_QUERY_SIZE_LIMIT(Const.SEARCH_QUERY_SIZE_LIMIT); + SEARCH_QUERY_SIZE_LIMIT(Const.SEARCH_QUERY_SIZE_LIMIT), + STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL(Const.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL.toMinutes()); + // CHECKSTYLE.ON:JavadocVariable private final Object value; diff --git a/src/main/java/teammates/ui/output/CourseData.java b/src/main/java/teammates/ui/output/CourseData.java index b2ce6334483..89b751de3fd 100644 --- a/src/main/java/teammates/ui/output/CourseData.java +++ b/src/main/java/teammates/ui/output/CourseData.java @@ -15,6 +15,8 @@ public class CourseData extends ApiOutput { private final String courseName; private final String timeZone; private final String institute; + @Nullable + private final Boolean isMigrated; private long creationTimestamp; private long deletionTimestamp; @Nullable @@ -29,6 +31,7 @@ public CourseData(CourseAttributes courseAttributes) { if (courseAttributes.getDeletedAt() != null) { this.deletionTimestamp = courseAttributes.getDeletedAt().toEpochMilli(); } + this.isMigrated = false; } public CourseData(Course course) { @@ -40,6 +43,7 @@ public CourseData(Course course) { if (course.getDeletedAt() != null) { this.deletionTimestamp = course.getDeletedAt().toEpochMilli(); } + this.isMigrated = true; } public String getCourseId() { @@ -66,6 +70,10 @@ public long getDeletionTimestamp() { return deletionTimestamp; } + public Boolean getIsMigrated() { + return isMigrated; + } + public InstructorPermissionSet getPrivileges() { return privileges; } diff --git a/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java b/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java index 69b5e43d0e6..5ea725da87b 100644 --- a/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java +++ b/src/main/java/teammates/ui/webapi/CreateFeedbackSessionLogAction.java @@ -6,13 +6,11 @@ import teammates.common.datatransfer.logs.FeedbackSessionLogType; import teammates.common.util.Const; import teammates.common.util.Logger; -import teammates.storage.sqlentity.FeedbackSession; -import teammates.storage.sqlentity.Student; /** * Action: creates a feedback session log for the purposes of tracking and auditing. */ -class CreateFeedbackSessionLogAction extends Action { +public class CreateFeedbackSessionLogAction extends Action { private static final Logger log = Logger.getLogger(); @@ -37,7 +35,8 @@ public JsonResult execute() { String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); String fsName = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); String studentEmail = getNonNullRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); - // Skip rigorous validations to avoid incurring extra db reads and to keep the endpoint light + // Skip rigorous validations to avoid incurring extra db reads and to keep the endpoint + // light FeedbackSessionAuditLogDetails details = new FeedbackSessionAuditLogDetails(); details.setCourseId(courseId); @@ -46,26 +45,17 @@ public JsonResult execute() { details.setAccessType(fslType); if (isCourseMigrated(courseId)) { - // TODO: remove unnecessary db reads after updating the front end - Student student = sqlLogic.getStudentForEmail(courseId, studentEmail); - FeedbackSession feedbackSession = sqlLogic.getFeedbackSession(fsName, courseId); - UUID studentId = null; - UUID fsId = null; + UUID studentId = getUuidRequestParamValue(Const.ParamsNames.STUDENT_SQL_ID); + UUID fsId = getUuidRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_ID); - if (student != null) { - studentId = student.getId(); - details.setStudentId(studentId.toString()); - } + details.setStudentId(studentId.toString()); + details.setFeedbackSessionId(fsId.toString()); - if (feedbackSession != null) { - fsId = feedbackSession.getId(); - details.setFeedbackSessionId(fsId.toString()); - } // Necessary to assist local testing. For production usage, this will be a no-op. - logsProcessor.createFeedbackSessionLog(courseId, studentId, studentEmail, fsId, fsName, fslType); + logsProcessor.createFeedbackSessionLog(courseId, studentId, fsId, fslType); } else { // Necessary to assist local testing. For production usage, this will be a no-op. - logsProcessor.createFeedbackSessionLog(courseId, null, studentEmail, null, fsName, fslType); + logsProcessor.createFeedbackSessionLog(courseId, studentEmail, fsName, fslType); } log.event("Feedback session audit event: " + fslType, details); diff --git a/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java b/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java index 8a3a5514514..720ec6e726b 100644 --- a/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java +++ b/src/main/java/teammates/ui/webapi/GetFeedbackSessionLogsAction.java @@ -6,6 +6,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; import teammates.common.datatransfer.FeedbackSessionLogEntry; @@ -109,25 +110,34 @@ public JsonResult execute() { } } - String email = getRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); - String feedbackSessionName = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); - if (isCourseMigrated(courseId)) { - // TODO: replace null ids with value from request after FE changes and enable test + UUID studentId = null; + UUID feedbackSessionId = null; + String studentIdString = getRequestParamValue(Const.ParamsNames.STUDENT_SQL_ID); + String feedbackSessionIdString = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_ID); + + if (studentIdString != null) { + studentId = getUuidFromString(Const.ParamsNames.STUDENT_SQL_ID, studentIdString); + } + + if (feedbackSessionIdString != null) { + feedbackSessionId = getUuidFromString(Const.ParamsNames.FEEDBACK_SESSION_ID, feedbackSessionIdString); + } + if (sqlLogic.getCourse(courseId) == null) { throw new EntityNotFoundException("Course not found"); } - if (email != null && sqlLogic.getStudentForEmail(courseId, email) == null) { + if (studentId != null && sqlLogic.getStudent(studentId) == null) { throw new EntityNotFoundException("Student not found"); } - if (feedbackSessionName != null && sqlLogic.getFeedbackSession(feedbackSessionName, courseId) == null) { + if (feedbackSessionId != null && sqlLogic.getFeedbackSession(feedbackSessionId) == null) { throw new EntityNotFoundException("Feedback session not found"); } - List fsLogEntries = sqlLogic.getOrderedFeedbackSessionLogs(courseId, null, - null, Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime)); + List fsLogEntries = sqlLogic.getOrderedFeedbackSessionLogs(courseId, studentId, + feedbackSessionId, Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime)); Map studentsMap = new HashMap<>(); Map sessionsMap = new HashMap<>(); List feedbackSessions = sqlLogic.getFeedbackSessionsForCourse(courseId); @@ -142,7 +152,7 @@ public JsonResult execute() { } if (!studentsMap.containsKey(logEntry.getStudent().getEmail())) { - Student student = sqlLogic.getStudentForEmail(courseId, logEntry.getStudent().getEmail()); + Student student = sqlLogic.getStudent(logEntry.getStudent().getId()); if (student == null) { // If the student email retrieved from the log is invalid, ignore the log return false; @@ -163,10 +173,12 @@ public JsonResult execute() { throw new EntityNotFoundException("Course not found"); } + String email = getRequestParamValue(Const.ParamsNames.STUDENT_EMAIL); if (email != null && logic.getStudentForEmail(courseId, email) == null) { throw new EntityNotFoundException("Student not found"); } + String feedbackSessionName = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); if (feedbackSessionName != null && logic.getFeedbackSession(feedbackSessionName, courseId) == null) { throw new EntityNotFoundException("Feedback session not found"); } diff --git a/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java b/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java index 164db9fa344..9324d4615df 100644 --- a/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateFeedbackSessionLogsAction.java @@ -9,7 +9,9 @@ import java.util.UUID; import teammates.common.datatransfer.FeedbackSessionLogEntry; +import teammates.common.datatransfer.attributes.CourseAttributes; import teammates.common.datatransfer.logs.FeedbackSessionLogType; +import teammates.common.util.Const; import teammates.common.util.TimeHelper; import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.FeedbackSessionLog; @@ -21,23 +23,29 @@ */ public class UpdateFeedbackSessionLogsAction extends AdminOnlyAction { - static final int COLLECTION_TIME_PERIOD = 60; // represents one hour - static final long SPAM_FILTER = 2000L; // in ms + static final long COLLECTION_TIME_PERIOD = Const.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL.toMinutes(); + static final long SPAM_FILTER = Const.STUDENT_ACTIVITY_LOGS_FILTER_WINDOW.toMillis(); @Override public JsonResult execute() { List filteredLogs = new ArrayList<>(); - Instant endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); + Instant endTime = TimeHelper.getInstantNearestQuarterHourBefore(Instant.now()); Instant startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); List logEntries = logsProcessor.getOrderedFeedbackSessionLogs(null, null, startTime.toEpochMilli(), endTime.toEpochMilli(), null); Map>>> lastSavedTimestamps = new HashMap<>(); + Map isCourseMigratedMap = new HashMap<>(); for (FeedbackSessionLogEntry logEntry : logEntries) { - if (!isCourseMigrated(logEntry.getCourseId())) { + isCourseMigratedMap.computeIfAbsent(logEntry.getCourseId(), k -> { + CourseAttributes course = logic.getCourse(logEntry.getCourseId()); + return course == null || course.isMigrated(); + }); + + if (!isCourseMigratedMap.get(logEntry.getCourseId())) { continue; } diff --git a/src/test/java/teammates/common/util/TimeHelperTest.java b/src/test/java/teammates/common/util/TimeHelperTest.java index 3c805252f97..9f9ca7035ab 100644 --- a/src/test/java/teammates/common/util/TimeHelperTest.java +++ b/src/test/java/teammates/common/util/TimeHelperTest.java @@ -146,4 +146,68 @@ public void testGetInstantMonthsOffsetFromNow() { assertEquals(expected, actual); } + @Test + public void getInstantNearestQuarterHourBefore() { + Instant expectedQ1 = Instant.parse("2020-12-31T16:00:00Z"); + Instant actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:00:00Z")); + + assertEquals(expectedQ1, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:09:30Z")); + + assertEquals(expectedQ1, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:14:59Z")); + + assertEquals(expectedQ1, actual); + + actual = TimeHelper + .getInstantNearestQuarterHourBefore(OffsetDateTime.parse("2021-01-01T00:10:00+08:00").toInstant()); + + assertEquals(expectedQ1, actual); + + actual = TimeHelper + .getInstantNearestQuarterHourBefore(OffsetDateTime.parse("2020-12-31T12:09:00-04:00").toInstant()); + + assertEquals(expectedQ1, actual); + + Instant expectedQ2 = Instant.parse("2020-12-31T16:15:00Z"); + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:15:00Z")); + + assertEquals(expectedQ2, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:19:30Z")); + + assertEquals(expectedQ2, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:29:59Z")); + + assertEquals(expectedQ2, actual); + + Instant expectedQ3 = Instant.parse("2020-12-31T16:30:00Z"); + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:30:00Z")); + + assertEquals(expectedQ3, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:39:30Z")); + + assertEquals(expectedQ3, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:44:59Z")); + + assertEquals(expectedQ3, actual); + + Instant expectedQ4 = Instant.parse("2020-12-31T16:45:00Z"); + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:45:00Z")); + + assertEquals(expectedQ4, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:49:30Z")); + + assertEquals(expectedQ4, actual); + + actual = TimeHelper.getInstantNearestQuarterHourBefore(Instant.parse("2020-12-31T16:59:59Z")); + + assertEquals(expectedQ4, actual); + } } diff --git a/src/test/java/teammates/logic/api/MockLogsProcessor.java b/src/test/java/teammates/logic/api/MockLogsProcessor.java index fbff7904f4d..60299b538be 100644 --- a/src/test/java/teammates/logic/api/MockLogsProcessor.java +++ b/src/test/java/teammates/logic/api/MockLogsProcessor.java @@ -33,10 +33,10 @@ public void insertFeedbackSessionLog(String courseId, String studentEmail, Strin /** * Simulates insertion of feedback session logs. */ - public void insertFeedbackSessionLog(String courseId, UUID studentId, String studentEmail, - UUID feedbackSessionId, String feedbackSessionName, String fslType, long timestamp) { - feedbackSessionLogs.add(new FeedbackSessionLogEntry(courseId, studentId, studentEmail, feedbackSessionId, - feedbackSessionName, fslType, timestamp)); + public void insertFeedbackSessionLog(String courseId, UUID studentId, UUID feedbackSessionId, + String fslType, long timestamp) { + feedbackSessionLogs + .add(new FeedbackSessionLogEntry(courseId, studentId, feedbackSessionId, fslType, timestamp)); } /** @@ -108,8 +108,7 @@ public QueryLogsResults queryLogs(QueryLogsParams queryLogsParams) { } @Override - public void createFeedbackSessionLog(String courseId, UUID studentId, String email, UUID fsId, String fsName, - String fslType) { + public void createFeedbackSessionLog(String courseId, UUID studentId, UUID fsId, String fslType) { // No-op } diff --git a/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java b/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java index 5c50ecf1638..73af8c67f3d 100644 --- a/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java +++ b/src/test/java/teammates/sqlui/webapi/GetFeedbackSessionLogsActionTest.java @@ -75,9 +75,9 @@ void setUp() { fs2.setCreatedAt(Instant.now()); when(mockLogic.getCourse(course.getId())).thenReturn(course); - when(mockLogic.getFeedbackSession(fs1.getName(), course.getId())).thenReturn(fs1); - when(mockLogic.getStudentForEmail(course.getId(), student1.getEmail())).thenReturn(student1); - when(mockLogic.getStudentForEmail(course.getId(), student2.getEmail())).thenReturn(student2); + when(mockLogic.getFeedbackSession(fs1.getId())).thenReturn(fs1); + when(mockLogic.getStudent(student1.getId())).thenReturn(student1); + when(mockLogic.getStudent(student2.getId())).thenReturn(student2); List feedbackSessions = new ArrayList<>(); feedbackSessions.add(fs1); @@ -124,7 +124,7 @@ void setUp() { Instant.ofEpochMilli(startTime), Instant.ofEpochMilli(endTime))).thenReturn(student1Fs1Logs); } - @Test(enabled = false) + @Test protected void testExecute() { JsonResult actionOutput; @@ -142,16 +142,16 @@ protected void testExecute() { ______TS("Failure case: invalid course id"); String[] paramsInvalid1 = { Const.ParamsNames.COURSE_ID, "fake-course-id", - Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; verifyEntityNotFound(paramsInvalid1); - ______TS("Failure case: invalid student email"); + ______TS("Failure case: invalid student id"); String[] paramsInvalid2 = { Const.ParamsNames.COURSE_ID, course.getId(), - Const.ParamsNames.STUDENT_EMAIL, "fake-student-email@gmail.com", + Const.ParamsNames.STUDENT_SQL_ID, "00000000-0000-0000-0000-000000000000", Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; @@ -204,10 +204,10 @@ protected void testExecute() { assertEquals(fsLogEntries2.get(1).getStudentData().getEmail(), student1.getEmail()); assertEquals(fsLogEntries2.get(1).getFeedbackSessionLogType(), FeedbackSessionLogType.SUBMISSION); - ______TS("Success case: should accept optional email"); + ______TS("Success case: should accept optional student id"); String[] paramsSuccessful2 = { Const.ParamsNames.COURSE_ID, course.getId(), - Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; @@ -233,7 +233,7 @@ protected void testExecute() { ______TS("Success case: should accept optional feedback session"); String[] paramsSuccessful3 = { Const.ParamsNames.COURSE_ID, course.getId(), - Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; @@ -257,8 +257,8 @@ protected void testExecute() { ______TS("Success case: should accept all optional params"); String[] paramsSuccessful4 = { Const.ParamsNames.COURSE_ID, course.getId(), - Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), - Const.ParamsNames.FEEDBACK_SESSION_NAME, fs1.getName(), + Const.ParamsNames.STUDENT_SQL_ID, student1.getId().toString(), + Const.ParamsNames.FEEDBACK_SESSION_ID, fs1.getId().toString(), Const.ParamsNames.FEEDBACK_SESSION_LOG_STARTTIME, String.valueOf(startTime), Const.ParamsNames.FEEDBACK_SESSION_LOG_ENDTIME, String.valueOf(endTime), }; diff --git a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java index 72a8ec36802..6fcaf98daff 100644 --- a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java +++ b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java @@ -32,8 +32,8 @@ public class UpdateFeedbackSessionLogsActionTest extends BaseActionTest { - static final int COLLECTION_TIME_PERIOD = 60; // represents one hour - static final long SPAM_FILTER = 2000L; // in ms + static final long COLLECTION_TIME_PERIOD = Const.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL.toMinutes(); + static final long SPAM_FILTER = Const.STUDENT_ACTIVITY_LOGS_FILTER_WINDOW.toMillis(); Student student1; Student student2; @@ -60,7 +60,7 @@ String getRequestMethod() { @BeforeMethod void setUp() { - endTime = TimeHelper.getInstantNearestHourBefore(Instant.now()); + endTime = TimeHelper.getInstantNearestQuarterHourBefore(Instant.now()); startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES); course1 = getTypicalCourse(); @@ -114,47 +114,36 @@ public void testExecute_noRecentLogs_noLogsCreated() public void testExecute_recentLogsNoSpam_allLogsCreated() throws EntityAlreadyExistsException, InvalidParametersException { // Different Types - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.SUBMISSION.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.VIEW_RESULT.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(100).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.SUBMISSION.getLabel(), startTime.plusSeconds(100).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.VIEW_RESULT.getLabel(), startTime.plusSeconds(100).toEpochMilli()); // Different feedback sessions - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(600).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session2InCourse1.getId(), session2InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(600).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(200).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session2InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(200).toEpochMilli()); // Different Student - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(900).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student2.getId(), student2.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(900).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(300).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student2.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(300).toEpochMilli()); // Different course - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(1200).toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course2.getId(), student1.getId(), student1.getEmail(), - session1InCourse2.getId(), session1InCourse2.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(1200).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(400).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course2.getId(), student1.getId(), session1InCourse2.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusSeconds(400).toEpochMilli()); // Gap is larger than spam filter - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); @@ -169,38 +158,31 @@ public void testExecute_recentLogsNoSpam_allLogsCreated() public void testExecute_recentLogsWithSpam_someLogsCreated() throws EntityAlreadyExistsException, InvalidParametersException { // Gap is smaller than spam filter - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER - 2).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER - 2).toEpochMilli()); // Filters multiple logs within one spam window - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER - 1).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER - 1).toEpochMilli()); // Correctly adds new log after filtering - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); // Filters out spam in the new window - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER + 2).toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 2).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); List expected = new ArrayList<>(); - expected.add(new FeedbackSessionLogEntry(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.toEpochMilli())); - expected.add(new FeedbackSessionLogEntry(course1.getId(), student1.getId(), student1.getEmail(), - session1InCourse1.getId(), session1InCourse1.getName(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli())); + expected.add(new FeedbackSessionLogEntry(course1.getId(), student1.getId(), session1InCourse1.getId(), + FeedbackSessionLogType.ACCESS.getLabel(), startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli())); verify(mockLogic).createFeedbackSessionLogs(argThat(filteredLogs -> isEqual(expected, filteredLogs))); } diff --git a/src/test/java/teammates/ui/webapi/CreateFeedbackSessionLogActionTest.java b/src/test/java/teammates/ui/webapi/CreateFeedbackSessionLogActionTest.java index dd5974c4243..dad8b7ad1a4 100644 --- a/src/test/java/teammates/ui/webapi/CreateFeedbackSessionLogActionTest.java +++ b/src/test/java/teammates/ui/webapi/CreateFeedbackSessionLogActionTest.java @@ -7,6 +7,7 @@ import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.common.datatransfer.logs.FeedbackSessionLogType; import teammates.common.util.Const; +import teammates.ui.output.MessageOutput; /** * SUT: {@link CreateFeedbackSessionLogAction}. @@ -61,7 +62,9 @@ protected void testExecute() { Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.ACCESS.getLabel(), Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), }; - getJsonResult(getAction(paramsSuccessfulAccess)); + JsonResult response = getJsonResult(getAction(paramsSuccessfulAccess)); + MessageOutput output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); ______TS("Success case: typical submission"); String[] paramsSuccessfulSubmission = { @@ -70,24 +73,20 @@ protected void testExecute() { Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), Const.ParamsNames.STUDENT_EMAIL, student2.getEmail(), }; - getJsonResult(getAction(paramsSuccessfulSubmission)); + response = getJsonResult(getAction(paramsSuccessfulSubmission)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); ______TS("Success case: should create even for invalid parameters"); - String[] paramsNonExistentCourseId = { - Const.ParamsNames.COURSE_ID, "non-existent-course-id", - Const.ParamsNames.FEEDBACK_SESSION_NAME, fsa1.getFeedbackSessionName(), - Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), - Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), - }; - getJsonResult(getAction(paramsNonExistentCourseId)); - String[] paramsNonExistentFsName = { Const.ParamsNames.COURSE_ID, courseId1, Const.ParamsNames.FEEDBACK_SESSION_NAME, "non-existent-feedback-session-name", Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), Const.ParamsNames.STUDENT_EMAIL, student1.getEmail(), }; - getJsonResult(getAction(paramsNonExistentFsName)); + response = getJsonResult(getAction(paramsNonExistentFsName)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); String[] paramsNonExistentStudentEmail = { Const.ParamsNames.COURSE_ID, courseId1, @@ -95,7 +94,9 @@ protected void testExecute() { Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), Const.ParamsNames.STUDENT_EMAIL, "non-existent-student@email.com", }; - getJsonResult(getAction(paramsNonExistentStudentEmail)); + response = getJsonResult(getAction(paramsNonExistentStudentEmail)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); ______TS("Success case: should create even when student cannot access feedback session in course"); String[] paramsWithoutAccess = { @@ -104,7 +105,9 @@ protected void testExecute() { Const.ParamsNames.FEEDBACK_SESSION_LOG_TYPE, FeedbackSessionLogType.SUBMISSION.getLabel(), Const.ParamsNames.STUDENT_EMAIL, student3.getEmail(), }; - getJsonResult(getAction(paramsWithoutAccess)); + response = getJsonResult(getAction(paramsWithoutAccess)); + output = (MessageOutput) response.getOutput(); + assertEquals("Successful", output.getMessage()); } @Test diff --git a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html index b8d08573d05..5926e1db649 100644 --- a/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html +++ b/src/web/app/pages-instructor/instructor-courses-page/instructor-courses-page.component.html @@ -166,9 +166,10 @@

      Active courses

      placement="left" container="body"> Archive - - - + + View Logs +

    tmRouterLink="./"> Copy + + View Logs + + @@ -31,7 +32,11 @@ exports[`InstructorStudentActivityLogsComponent should snap when page is still l owner or manager privileges - for the course. The earliest date you can search for is + for the course. Please note that recent logs may be shown as the information is updated every + + 15 minutes + + . The earliest date you can search for is 30 days @@ -64,6 +69,7 @@ exports[`InstructorStudentActivityLogsComponent should snap when searching for d LOGS_DATE_TIME_FORMAT={[Function String]} LOGS_RETENTION_PERIOD={[Function Number]} LOG_TYPES={[Function Array]} + STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL={[Function Number]} SortBy={[Function Object]} course={[Function Object]} courseService={[Function CourseService]} @@ -78,8 +84,8 @@ exports[`InstructorStudentActivityLogsComponent should snap when searching for d route={[Function ActivatedRoute]} searchResults={[Function Array]} statusMessageService={[Function StatusMessageService]} + studentLogsMap={[Function Map]} studentService={[Function StudentService]} - studentToLog={[Function Object]} students={[Function Array]} timezoneService={[Function TimezoneService]} > @@ -90,7 +96,11 @@ exports[`InstructorStudentActivityLogsComponent should snap when searching for d owner or manager privileges - for the course. The earliest date you can search for is + for the course. Please note that recent logs may be shown as the information is updated every + + 15 minutes + + . The earliest date you can search for is 30 days @@ -351,7 +361,7 @@ exports[`InstructorStudentActivityLogsComponent should snap when searching for d id="student-name-dropdown" > @@ -567,7 +577,7 @@ exports[`InstructorStudentActivityLogsComponent should snap when searching for d id="session-dropdown" >
    - + + diff --git a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.spec.ts b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.spec.ts index b9ec1db2edf..612245422de 100644 --- a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.spec.ts +++ b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.spec.ts @@ -145,9 +145,9 @@ describe('InstructorStudentActivityLogsComponent', () => { logsTimeFrom: { hour: 23, minute: 59 }, logsDateTo: { year: 1998, month: 9, day: 11 }, logsTimeTo: { hour: 15, minute: 0 }, - studentEmail: 'doejohn@email.com', + selectedStudent: { studentEmail: 'doejohn@email.com', studentId: undefined }, logType: 'session access', - feedbackSessionName: '', + selectedSession: { feedbackSessionName: undefined, sessionId: undefined }, showActions: false, showInactions: false, }; @@ -232,9 +232,9 @@ describe('InstructorStudentActivityLogsComponent', () => { logsTimeFrom: { hour: 23, minute: 59 }, logsDateTo: { year: 2020, month: 12, day: 31 }, logsTimeTo: { hour: 23, minute: 59 }, - studentEmail: testStudent.email, + selectedStudent: { studentEmail: testStudent.email, studentId: '' }, logType: 'submission', - feedbackSessionName: '', + selectedSession: { feedbackSessionName: '', sessionId: '' }, showActions: true, showInactions: false, }; @@ -261,6 +261,8 @@ describe('InstructorStudentActivityLogsComponent', () => { studentEmail: testStudent.email, sessionName: '', logType: 'submission', + studentId: '', + sessionId: '', }); expect(component.searchResults.length).toEqual(2); diff --git a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts index 211e3fd0a53..e7301844772 100644 --- a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts +++ b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts @@ -37,8 +37,8 @@ interface SearchLogsFormModel { logsTimeFrom: TimeFormat; logsTimeTo: TimeFormat; logType: string; - feedbackSessionName: string; - studentEmail: string; + selectedSession: SelectedSession; + selectedStudent: SelectedStudent; showActions: boolean; showInactions: boolean; } @@ -48,6 +48,16 @@ interface LogType { value: string; } +interface SelectedStudent { + studentEmail?: string; + studentId?: string; +} + +interface SelectedSession { + feedbackSessionName?: string; + sessionId?: string; +} + /** * Model for displaying of feedback session logs */ @@ -70,6 +80,7 @@ interface FeedbackSessionLogModel { export class InstructorStudentActivityLogsComponent implements OnInit { LOGS_DATE_TIME_FORMAT: string = 'ddd, DD MMM YYYY hh:mm:ss A'; LOGS_RETENTION_PERIOD: number = ApiConst.LOGS_RETENTION_PERIOD; + STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL: number = ApiConst.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL; LOG_TYPES: LogType[] = [ { label: 'session access', value: 'access' }, { label: 'session submission', value: 'submission' }, @@ -86,8 +97,8 @@ export class InstructorStudentActivityLogsComponent implements OnInit { logsDateTo: getDefaultDateFormat(), logsTimeTo: getDefaultTimeFormat(), logType: '', - studentEmail: '', - feedbackSessionName: '', + selectedStudent: { studentEmail: '', studentId: '' }, + selectedSession: { feedbackSessionName: '', sessionId: '' }, showActions: false, showInactions: false, }; @@ -101,7 +112,7 @@ export class InstructorStudentActivityLogsComponent implements OnInit { }; dateToday: DateFormat = getDefaultDateFormat(); earliestSearchDate: DateFormat = getDefaultDateFormat(); - studentToLog: Record = {}; + studentLogsMap: Map = new Map(); students: Student[] = []; feedbackSessions: Map = new Map(); searchResults: FeedbackSessionLogModel[] = []; @@ -158,7 +169,12 @@ export class InstructorStudentActivityLogsComponent implements OnInit { * Search for logs of student activity */ search(): void { - this.studentToLog = {}; + if (this.formModel.logType === '') { + this.statusMessageService.showErrorToast('Please select an activity type'); + return; + } + + this.studentLogsMap = new Map(); this.searchResults = []; this.isSearching = true; @@ -172,29 +188,44 @@ export class InstructorStudentActivityLogsComponent implements OnInit { courseId: this.course.courseId, searchFrom: searchFrom.toString(), searchUntil: searchUntil.toString(), - studentEmail: this.formModel.studentEmail, + studentEmail: this.formModel.selectedStudent.studentEmail, logType: this.formModel.logType, - sessionName: this.formModel.feedbackSessionName, + sessionName: this.formModel.selectedSession.feedbackSessionName, + studentId: this.formModel.selectedStudent.studentId, + sessionId: this.formModel.selectedSession.sessionId, }).pipe( finalize(() => { this.isSearching = false; }), ).subscribe({ next: (logs: FeedbackSessionLogs) => { - if (this.formModel.feedbackSessionName === '') { + if (this.formModel.selectedSession.feedbackSessionName === '') { logs.feedbackSessionLogs.forEach((log: FeedbackSessionLog) => { log.feedbackSessionLogEntries.forEach((entry: FeedbackSessionLogEntry) => { - this.studentToLog[this.getStudentKey(log, entry.studentData.email)] = entry; + const arr: FeedbackSessionLogEntry[] | undefined = + this.studentLogsMap.get(this.getStudentKey(log, entry.studentData.email)); + if (arr) { + arr.push(entry); + } else { + this.studentLogsMap.set(this.getStudentKey(log, entry.studentData.email), [entry]); + } }); this.searchResults.push(this.toFeedbackSessionLogModel(log)); }); } else { const targetFeedbackSessionLog = logs.feedbackSessionLogs.find((log: FeedbackSessionLog) => - log.feedbackSessionData.feedbackSessionName === this.formModel.feedbackSessionName); + log.feedbackSessionData.feedbackSessionName === this.formModel.selectedSession.feedbackSessionName); if (targetFeedbackSessionLog) { targetFeedbackSessionLog.feedbackSessionLogEntries.forEach((entry: FeedbackSessionLogEntry) => { - this.studentToLog[this.getStudentKey(targetFeedbackSessionLog, entry.studentData.email)] = entry; + const arr: FeedbackSessionLogEntry[] | undefined = + this.studentLogsMap.get(this.getStudentKey(targetFeedbackSessionLog, entry.studentData.email)); + if (arr) { + arr.push(entry); + } else { + this.studentLogsMap.set( + this.getStudentKey(targetFeedbackSessionLog, entry.studentData.email), [entry]); + } }); this.searchResults.push(this.toFeedbackSessionLogModel(targetFeedbackSessionLog)); } @@ -283,7 +314,10 @@ export class InstructorStudentActivityLogsComponent implements OnInit { return false; } - if (this.formModel.studentEmail !== '' && student.email !== this.formModel.studentEmail) { + if ( + this.formModel.selectedStudent.studentEmail !== '' + && student.email !== this.formModel.selectedStudent.studentEmail + ) { return false; } @@ -293,7 +327,7 @@ export class InstructorStudentActivityLogsComponent implements OnInit { const studentKey = this.getStudentKey(log, student.email); - if (studentKey in this.studentToLog) { + if (this.studentLogsMap.has(studentKey)) { if (this.formModel.showInactions) { return false; } @@ -303,33 +337,45 @@ export class InstructorStudentActivityLogsComponent implements OnInit { return true; }) - .map((student: Student) => { + .flatMap((student: Student) => { let status: string; let dataStyle: string = 'font-family:monospace; white-space:pre;'; - const statusPrefix = this.logTypeToActivityDisplay(this.formModel.logType); const studentKey = this.getStudentKey(log, student.email); - if (studentKey in this.studentToLog) { - const entry: FeedbackSessionLogEntry = this.studentToLog[studentKey]; - const timestamp: string = this.timezoneService.formatToString( + const entries: FeedbackSessionLogEntry[] | undefined = this.studentLogsMap.get(studentKey); + const rows: any[] = []; + if (entries) { + entries.forEach((entry: FeedbackSessionLogEntry) => { + const timestamp: string = this.timezoneService.formatToString( entry.timestamp, log.feedbackSessionData.timeZone, this.LOGS_DATE_TIME_FORMAT); - status = `${statusPrefix} at ${timestamp}`; + status = `${this.logTypeToActivityDisplay(entry.feedbackSessionLogType)} at ${timestamp}`; + status = status.charAt(0).toUpperCase() + status.slice(1); + rows.push([{ + value: status, + style: dataStyle, + }, + { value: student.name }, + { value: student.email }, + { value: student.sectionName }, + { value: student.teamName }]); + }); } else { const timestamp: string = this.timezoneService.formatToString( - notViewedSince, log.feedbackSessionData.timeZone, this.LOGS_DATE_TIME_FORMAT); - status = `Not ${statusPrefix.toLowerCase()} since ${timestamp}`; + notViewedSince, log.feedbackSessionData.timeZone, this.LOGS_DATE_TIME_FORMAT); + status = `Not ${this.logTypeToActivityDisplay(this.formModel.logType)} since ${timestamp}`; dataStyle += 'color:red;'; + rows.push([ + { + value: status, + style: dataStyle, + }, + { value: student.name }, + { value: student.email }, + { value: student.sectionName }, + { value: student.teamName }, + ]); } - return [ - { - value: status, - style: dataStyle, - }, - { value: student.name }, - { value: student.email }, - { value: student.sectionName }, - { value: student.teamName }, - ]; + return rows; }), isTabExpanded: (log.feedbackSessionLogEntries.length !== 0 && this.formModel.showActions) || (log.feedbackSessionLogEntries.length === 0 && this.formModel.showInactions), @@ -339,15 +385,15 @@ export class InstructorStudentActivityLogsComponent implements OnInit { private logTypeToActivityDisplay(logType: string): string { switch (logType.toUpperCase()) { case 'ACCESS': - return 'Viewed the submission page'; + return 'viewed the submission page'; case 'SUBMISSION': - return 'Submitted responses'; + return 'submitted responses'; case 'VIEW RESULT': - return 'Viewed the session results'; + return 'viewed the session results'; case 'ACCESS,SUBMISSION': - return 'Viewed the submission page or submitted responses'; + return 'viewed the submission page or submitted responses'; default: - return 'Unknown activity'; + return 'unknown activity'; } } diff --git a/src/web/app/pages-session/session-result-page/__snapshots__/session-result-page.component.spec.ts.snap b/src/web/app/pages-session/session-result-page/__snapshots__/session-result-page.component.spec.ts.snap index 1b96764aa89..1fb615bcc24 100644 --- a/src/web/app/pages-session/session-result-page/__snapshots__/session-result-page.component.spec.ts.snap +++ b/src/web/app/pages-session/session-result-page/__snapshots__/session-result-page.component.spec.ts.snap @@ -11,6 +11,7 @@ exports[`SessionResultPageComponent should snap when previewing results 1`] = ` courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -35,6 +36,7 @@ exports[`SessionResultPageComponent should snap when previewing results 1`] = ` route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -157,6 +159,7 @@ exports[`SessionResultPageComponent should snap when session results failed to l courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -181,6 +184,7 @@ exports[`SessionResultPageComponent should snap when session results failed to l route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -307,6 +311,7 @@ exports[`SessionResultPageComponent should snap with an open feedback session wi courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -331,6 +336,7 @@ exports[`SessionResultPageComponent should snap with an open feedback session wi route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -454,6 +460,7 @@ exports[`SessionResultPageComponent should snap with default fields 1`] = ` courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -478,6 +485,7 @@ exports[`SessionResultPageComponent should snap with default fields 1`] = ` route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -601,6 +609,7 @@ exports[`SessionResultPageComponent should snap with session details and results courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -625,6 +634,7 @@ exports[`SessionResultPageComponent should snap with session details and results route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -697,6 +707,7 @@ exports[`SessionResultPageComponent should snap with session details loaded and courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -721,6 +732,7 @@ exports[`SessionResultPageComponent should snap with session details loaded and route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -844,6 +856,7 @@ exports[`SessionResultPageComponent should snap with user that is logged in and courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -868,6 +881,7 @@ exports[`SessionResultPageComponent should snap with user that is logged in and route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} @@ -992,6 +1006,7 @@ exports[`SessionResultPageComponent should snap with user that is not logged in courseService={[Function CourseService]} entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} + feedbackSessionId="" feedbackSessionName={[Function String]} feedbackSessionsService={[Function FeedbackSessionsService]} formattedSessionClosingTime="" @@ -1016,6 +1031,7 @@ exports[`SessionResultPageComponent should snap with user that is not logged in route={[Function Object]} session={[Function Object]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} visibilityRecipient={[Function String]} diff --git a/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts b/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts index dfda80f2254..9c13a60836e 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts +++ b/src/web/app/pages-session/session-result-page/session-result-page.component.spec.ts @@ -291,7 +291,7 @@ describe('SessionResultPageComponent', () => { jest.spyOn(authService, 'getAuthRegkeyValidity').mockReturnValue(of(testValidity)); jest.spyOn(studentService, 'getStudent').mockReturnValue(of({ name: 'student-name', - email: '', + email: 'student@tmt.tmt', courseId: '', sectionName: '', teamName: '', diff --git a/src/web/app/pages-session/session-result-page/session-result-page.component.ts b/src/web/app/pages-session/session-result-page/session-result-page.component.ts index 9dcbeb6563a..5769cbda252 100644 --- a/src/web/app/pages-session/session-result-page/session-result-page.component.ts +++ b/src/web/app/pages-session/session-result-page/session-result-page.component.ts @@ -103,6 +103,9 @@ export class SessionResultPageComponent implements OnInit { hasFeedbackSessionResultsLoadingFailed: boolean = false; retryAttempts: number = DEFAULT_NUMBER_OF_RETRY_ATTEMPTS; + feedbackSessionId: string | undefined = ''; + studentId: string | undefined = ''; + private backendUrl: string = environment.backendUrl; constructor(private feedbackQuestionsService: FeedbackQuestionsService, @@ -252,20 +255,10 @@ export class SessionResultPageComponent implements OnInit { this.previewAsPerson, this.regKey, ).subscribe((student: Student) => { + this.studentId = student.studentId; this.personName = student.name; this.personEmail = student.email; - - this.logService.createFeedbackSessionLog({ - courseId: this.courseId, - feedbackSessionName: this.feedbackSessionName, - studentEmail: this.personEmail, - logType: FeedbackSessionLogType.VIEW_RESULT, - }).subscribe({ - next: () => { - // No action needed if log is successfully created. - }, - error: () => this.statusMessageService.showWarningToast('Failed to log feedback session view'), - }); + this.logStudentView(); }); break; case Intent.INSTRUCTOR_RESULT: @@ -294,15 +287,21 @@ export class SessionResultPageComponent implements OnInit { key: this.regKey, previewAs: this.previewAsPerson, }) - .pipe(finalize(() => { this.isFeedbackSessionDetailsLoading = false; })) + .pipe(finalize(() => { + this.isFeedbackSessionDetailsLoading = false; + })) .subscribe({ next: (feedbackSession: FeedbackSession) => { const TIME_FORMAT: string = 'ddd, DD MMM, YYYY, hh:mm A zz'; this.session = feedbackSession; + this.feedbackSessionId = feedbackSession.feedbackSessionId; this.formattedSessionOpeningTime = this.timezoneService .formatToString(this.session.submissionStartTimestamp, this.session.timeZone, TIME_FORMAT); this.formattedSessionClosingTime = this.timezoneService .formatToString(this.session.submissionEndTimestamp, this.session.timeZone, TIME_FORMAT); + + this.logStudentView(); + this.feedbackQuestionsService.getFeedbackQuestions({ courseId: this.courseId, feedbackSessionName: this.feedbackSessionName, @@ -378,4 +377,27 @@ export class SessionResultPageComponent implements OnInit { this.statusMessageService.showErrorToast(resp.error.message); } } + + /** + * Logs student activity after student/session details have been fetched. + */ + logStudentView(): void { + if (this.intent !== Intent.STUDENT_RESULT) { + return; + } + + // dummy vars to check that both student and session has been loaded + if (!this.personEmail || !this.session.courseId) { + return; + } + + this.logService.createFeedbackSessionLog({ + courseId: this.courseId, + feedbackSessionName: this.feedbackSessionName, + studentEmail: this.personEmail, + logType: FeedbackSessionLogType.VIEW_RESULT, + feedbackSessionId: this.feedbackSessionId, + studentId: this.studentId, + }).subscribe(); + } } diff --git a/src/web/app/pages-session/session-submission-page/__snapshots__/session-submission-page.component.spec.ts.snap b/src/web/app/pages-session/session-submission-page/__snapshots__/session-submission-page.component.spec.ts.snap index 1edb9658bb7..5110ed14b92 100644 --- a/src/web/app/pages-session/session-submission-page/__snapshots__/session-submission-page.component.spec.ts.snap +++ b/src/web/app/pages-session/session-submission-page/__snapshots__/session-submission-page.component.spec.ts.snap @@ -18,6 +18,7 @@ exports[`SessionSubmissionPageComponent should snap when feedback session questi entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -54,6 +55,7 @@ exports[`SessionSubmissionPageComponent should snap when feedback session questi route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -174,6 +176,7 @@ exports[`SessionSubmissionPageComponent should snap when saving responses 1`] = entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -210,6 +213,7 @@ exports[`SessionSubmissionPageComponent should snap when saving responses 1`] = route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -327,6 +331,7 @@ exports[`SessionSubmissionPageComponent should snap with default fields 1`] = ` entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -363,6 +368,7 @@ exports[`SessionSubmissionPageComponent should snap with default fields 1`] = ` route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -480,6 +486,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session and us entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions={[Function String]} feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -516,6 +523,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session and us route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -766,6 +774,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -802,6 +811,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -3776,6 +3786,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -3812,6 +3823,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -6816,6 +6828,7 @@ exports[`SessionSubmissionPageComponent should snap with user that is logged in entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -6852,6 +6865,7 @@ exports[`SessionSubmissionPageComponent should snap with user that is logged in route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} @@ -6970,6 +6984,7 @@ exports[`SessionSubmissionPageComponent should snap with user that is not logged entityType={[Function String]} feedbackQuestionsService={[Function FeedbackQuestionsService]} feedbackResponsesService={[Function FeedbackResponsesService]} + feedbackSessionId="" feedbackSessionInstructions="" feedbackSessionName={[Function String]} feedbackSessionSubmissionStatus={[Function String]} @@ -7006,6 +7021,7 @@ exports[`SessionSubmissionPageComponent should snap with user that is not logged route={[Function Object]} simpleModalService={[Function SimpleModalService]} statusMessageService={[Function StatusMessageService]} + studentId="" studentService={[Function StudentService]} timezoneService={[Function TimezoneService]} ungroupableQuestions={[Function Set]} diff --git a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts index 696f6fa2012..3761289f162 100644 --- a/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts +++ b/src/web/app/pages-session/session-submission-page/session-submission-page.component.ts @@ -127,6 +127,9 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { ungroupableQuestions: Set = new Set(); ungroupableQuestionsSorted: number[] = []; + feedbackSessionId: string | undefined = ''; + studentId: string | undefined = ''; + private backendUrl: string = environment.backendUrl; constructor(private route: ActivatedRoute, @@ -322,21 +325,10 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { this.moderatedPerson || this.previewAsPerson, this.regKey, ).subscribe((student: Student) => { + this.studentId = student.studentId; this.personName = student.name; this.personEmail = student.email; - - this.logService.createFeedbackSessionLog({ - courseId: this.courseId, - feedbackSessionName: this.feedbackSessionName, - studentEmail: this.personEmail, - logType: FeedbackSessionLogType.ACCESS, - }).subscribe({ - next: () => {}, - error: () => { - this.statusMessageService.showWarningToast('Failed to log feedback session access'); - }, - }); - + this.logStudentAccess(); }); break; case Intent.INSTRUCTOR_SUBMISSION: @@ -381,6 +373,7 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { })) .subscribe({ next: (feedbackSession: FeedbackSession) => { + this.feedbackSessionId = feedbackSession.feedbackSessionId; this.feedbackSessionInstructions = feedbackSession.instructions; this.formattedSessionOpeningTime = this.timezoneService .formatToString(feedbackSession.submissionStartTimestamp, feedbackSession.timeZone, TIME_FORMAT); @@ -390,6 +383,8 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { this.feedbackSessionSubmissionStatus = feedbackSession.submissionStatus; this.feedbackSessionTimezone = feedbackSession.timeZone; + this.logStudentAccess(); + // don't show alert modal in moderation if (!this.moderatedPerson) { let modalContent: string; @@ -761,12 +756,9 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { feedbackSessionName: this.feedbackSessionName, studentEmail: this.personEmail, logType: FeedbackSessionLogType.SUBMISSION, - }).subscribe({ - next: () => {}, - error: () => { - this.statusMessageService.showWarningToast('Failed to log feedback session submission'); - }, - }); + feedbackSessionId: this.feedbackSessionId, + studentId: this.studentId, + }).subscribe(); questionSubmissionForms.forEach((questionSubmissionFormModel: QuestionSubmissionFormModel) => { let isQuestionFullyAnswered: boolean = true; @@ -1138,4 +1130,27 @@ export class SessionSubmissionPageComponent implements OnInit, AfterViewInit { return recipient ? recipient.recipientName : 'Unknown'; } + + /** + * Logs student activity after student/session details have been fetched. + */ + logStudentAccess(): void { + if (this.intent !== Intent.STUDENT_SUBMISSION) { + return; + } + + // dummy vars to check that both student and session has been loaded + if (!this.personEmail || !this.feedbackSessionTimezone) { + return; + } + + this.logService.createFeedbackSessionLog({ + courseId: this.courseId, + feedbackSessionName: this.feedbackSessionName, + studentEmail: this.personEmail, + logType: FeedbackSessionLogType.ACCESS, + feedbackSessionId: this.feedbackSessionId, + studentId: this.studentId, + }).subscribe(); + } } diff --git a/src/web/services/log.service.ts b/src/web/services/log.service.ts index c61f88ce0c1..3be61aa6d9f 100644 --- a/src/web/services/log.service.ts +++ b/src/web/services/log.service.ts @@ -28,6 +28,8 @@ export class LogService { feedbackSessionName: string, studentEmail: string, logType: FeedbackSessionLogType, + feedbackSessionId?: string, + studentId?: string, }): Observable { const paramMap: Record = { courseid: queryParams.courseId, @@ -36,6 +38,14 @@ export class LogService { fsltype: queryParams.logType.toString(), }; + if (queryParams.feedbackSessionId) { + paramMap['fsid'] = queryParams.feedbackSessionId; + } + + if (queryParams.studentId) { + paramMap['studentid'] = queryParams.studentId; + } + return this.httpRequestService.post(ResourceEndpoints.SESSION_LOGS, paramMap); } @@ -49,6 +59,8 @@ export class LogService { studentEmail?: string, sessionName?: string, logType?: string, + studentId?: string, + sessionId?: string, }): Observable { const paramMap: Record = { courseid: queryParams.courseId, @@ -68,6 +80,14 @@ export class LogService { paramMap['fsltype'] = queryParams.logType; } + if (queryParams.studentId) { + paramMap['studentid'] = queryParams.studentId; + } + + if (queryParams.sessionId) { + paramMap['fsid'] = queryParams.sessionId; + } + return this.httpRequestService.get(ResourceEndpoints.SESSION_LOGS, paramMap); } From 4682dffb71e4566ed72a9e8a7b2b814e8d16f869 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Sun, 14 Apr 2024 19:22:50 +0800 Subject: [PATCH 52/95] [#11878] Add tests for Account Request Table (#12977) * add component tests for account request table * modify tests * remove old tests * remove comment * remove unnecessary code * add tests * update disabled criteria * remove extra builders and update snaps --- ...count-request-table.component.spec.ts.snap | 758 ++++++++++++++++++ .../account-request-table.component.html | 8 +- .../account-request-table.component.spec.ts | 497 ++++++++++++ .../account-request-table.component.ts | 6 +- ...-edit-request-modal.component.spec.ts.snap | 215 +++++ .../admin-edit-request-modal.component.html | 2 +- ...admin-edit-request-modal.component.spec.ts | 60 ++ ...t-with-reason-modal.component.spec.ts.snap | 84 ++ ...reject-with-reason-modal.component.spec.ts | 80 ++ .../admin-search-page.component.spec.ts.snap | 202 ----- .../admin-search-page.component.spec.ts | 193 ----- src/web/services/account.service.ts | 2 +- 12 files changed, 1703 insertions(+), 404 deletions(-) create mode 100644 src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap create mode 100644 src/web/app/components/account-requests-table/account-request-table.component.spec.ts create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/__snapshots__/admin-edit-request-modal.component.spec.ts.snap create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.spec.ts create mode 100644 src/web/app/components/account-requests-table/admin-reject-with-reason-modal/__snapshots__/admin-reject-with-reason-modal.component.spec.ts.snap create mode 100644 src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.spec.ts diff --git a/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap b/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap new file mode 100644 index 00000000000..51ad25e8f44 --- /dev/null +++ b/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap @@ -0,0 +1,758 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`AccountRequestTableComponent should display account requests with no reset or expand links button 1`] = ` + +
    +
    + + Pending Account Requests + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Name + + Email + + Status + + Institute, Country + + Created At + + Comments + + Options +
    + name + + email + + PENDING + + institute + + Tue, 08 Feb 2022, 08:23 AM +00:00 + +
    + comment +
    +     		+
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + + + +
    + + +
    +     +
    +
    + name + + email + + PENDING + + institute + + Tue, 08 Feb 2022, 08:23 AM +00:00 + +
    + comment +
    +     		+
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + + + +
    + + +
    +     +
    +
    +
    +
    +     +`; + +exports[`AccountRequestTableComponent should display account requests with reset button and expandable links buttons 1`] = ` + +
    +
    +
    + + Account Requests Found + +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Name + + Email + + Status + + Institute, Country + + Created At + + Registered At + + Comments + + Options +
    + name + + email + + APPROVED + + institute + + Tue, 08 Feb 2022, 08:23 AM +00:00 + + Not Registered Yet + +
    + comment +
    +     		+
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + + + +
    + + +
    +     +
    + +
    +
    +
    + name + + email + + REGISTERED + + institute + + Tue, 08 Feb 2022, 08:23 AM +00:00 + + Not Registered Yet + +
    + comment +
    +     		+
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + + + +
    + + +
    +     +
    + +
    +
    +
    +
    +
    +     +`; + +exports[`AccountRequestTableComponent should snap with an expanded account requests table 1`] = ` + +
    +
    + + Pending Account Requests + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + Name + + Email + + Status + + Institute, Country + + Created At + + Comments + + Options +
    + name + + email + + PENDING + + institute + + Tue, 08 Feb 2022, 08:23 AM +00:00 + +
    + comment +
    +     		+
    +
    + + + +
    +
    + + + +
    +
    + + + +
    + + + +
    + + +
    +     +
    +
    +
    +
    +     +`; diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html index 5095fac7a61..7bf55527f90 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.html +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -66,12 +66,12 @@
    - + - +
    - - + +
    diff --git a/src/web/app/components/account-requests-table/account-request-table.component.spec.ts b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts new file mode 100644 index 00000000000..6de7c277b22 --- /dev/null +++ b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts @@ -0,0 +1,497 @@ +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { of, throwError } from 'rxjs'; +import { AccountRequestTableRowModel } from './account-request-table-model'; +import { AccountRequestTableComponent } from './account-request-table.component'; +import { AccountRequestTableModule } from './account-request-table.module'; +import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; +import { + RejectWithReasonModalComponent, +} from './admin-reject-with-reason-modal/admin-reject-with-reason-modal.component'; +import { AccountService } from '../../../services/account.service'; +import { SimpleModalService } from '../../../services/simple-modal.service'; +import { StatusMessageService } from '../../../services/status-message.service'; +import { createBuilder } from '../../../test-helpers/generic-builder'; +import { createMockNgbModalRef } from '../../../test-helpers/mock-ngb-modal-ref'; +import { AccountRequest, AccountRequestStatus } from '../../../types/api-output'; +import { SimpleModalType } from '../simple-modal/simple-modal-type'; + +describe('AccountRequestTableComponent', () => { + let component: AccountRequestTableComponent; + let fixture: ComponentFixture; + let accountService: AccountService; + let statusMessageService: StatusMessageService; + let simpleModalService: SimpleModalService; + let ngbModal: NgbModal; + + const accountRequestDetailsBuilder = createBuilder({ + id: '', + email: '', + name: '', + instituteAndCountry: '', + registrationLink: '', + status: AccountRequestStatus.PENDING, + comments: '', + registeredAtText: '', + createdAtText: '', + showLinks: false, + }); + + const DEFAULT_ACCOUNT_REQUEST = accountRequestDetailsBuilder + .email('email') + .name('name') + .status(AccountRequestStatus.PENDING) + .instituteAndCountry('institute') + .createdAtText('Tue, 08 Feb 2022, 08:23 AM +00:00') + .comments('comment'); + + const resetModalContent = `Are you sure you want to reset the account request for + name with email email from + institute? + An email with the account registration link will also be sent to the instructor.`; + const resetModalTitle = 'Reset account request for name?'; + const deleteModalContent = `Are you sure you want to delete the account request for + name with email email from + institute?`; + const deleteModalTitle = 'Delete account request for name?'; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [AccountRequestTableComponent], + imports: [ + AccountRequestTableModule, + BrowserAnimationsModule, + HttpClientTestingModule, + ], + providers: [ + AccountService, SimpleModalService, + ], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AccountRequestTableComponent); + component = fixture.componentInstance; + accountService = TestBed.inject(AccountService); + statusMessageService = TestBed.inject(StatusMessageService); + simpleModalService = TestBed.inject(SimpleModalService); + ngbModal = TestBed.inject(NgbModal); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should snap with an expanded account requests table', () => { + const accountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST.build(); + component.accountRequests = [ + accountRequestResult, + ]; + + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should show account request links when expand all button clicked', () => { + const accountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST.build(); + accountRequestResult.status = AccountRequestStatus.APPROVED; + accountRequestResult.registrationLink = 'registrationLink'; + component.accountRequests = [ + accountRequestResult, + ]; + component.searchString = 'test'; + fixture.detectChanges(); + + const button: any = fixture.debugElement.nativeElement.querySelector('#show-account-request-links'); + button.click(); + expect(component.accountRequests[0].showLinks).toEqual(true); + }); + + it('should display account requests with no reset or expand links button', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should display account requests with reset button and expandable links buttons', + () => { + const approvedAccountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST.build(); + approvedAccountRequestResult.status = AccountRequestStatus.APPROVED; + approvedAccountRequestResult.registrationLink = 'registrationLink'; + + const registeredAccountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST.build(); + registeredAccountRequestResult.status = AccountRequestStatus.REGISTERED; + registeredAccountRequestResult.registrationLink = 'registrationLink'; + + const accountRequestResults: AccountRequestTableRowModel[] = [ + approvedAccountRequestResult, + registeredAccountRequestResult, + ]; + + component.accountRequests = accountRequestResults; + component.searchString = 'test'; + fixture.detectChanges(); + expect(fixture).toMatchSnapshot(); + }); + + it('should show success message when deleting account request is successful', () => { + component.accountRequests = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(simpleModalService, 'openConfirmationModal').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + jest.spyOn(accountService, 'deleteAccountRequest').mockReturnValue(of({ + message: 'Account request successfully deleted.', + })); + + const spyStatusMessageService: any = jest.spyOn(statusMessageService, 'showSuccessToast') + .mockImplementation((args: string) => { + expect(args).toEqual('Account request successfully deleted.'); + }); + + const deleteButton: any = fixture.debugElement.nativeElement.querySelector('#delete-account-request-0'); + deleteButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(deleteModalTitle, SimpleModalType.DANGER, deleteModalContent); + }); + + it('should show error message when deleting account request is unsuccessful', () => { + component.accountRequests = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + fixture.detectChanges(); + + const modalSpy = jest.spyOn(simpleModalService, 'openConfirmationModal').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + jest.spyOn(accountService, 'deleteAccountRequest').mockReturnValue(throwError(() => ({ + error: { + message: 'This is the error message.', + }, + }))); + + const spyStatusMessageService: any = jest.spyOn(statusMessageService, 'showErrorToast') + .mockImplementation((args: string) => { + expect(args).toEqual('This is the error message.'); + }); + + const deleteButton: any = fixture.debugElement.nativeElement.querySelector('#delete-account-request-0'); + deleteButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(deleteModalTitle, SimpleModalType.DANGER, deleteModalContent); + }); + + it('should show success message when resetting account request is successful', () => { + const registeredAccountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST.build(); + registeredAccountRequestResult.status = AccountRequestStatus.REGISTERED; + registeredAccountRequestResult.registrationLink = 'registrationLink'; + registeredAccountRequestResult.registeredAtText = 'registeredTime'; + component.accountRequests = [ + registeredAccountRequestResult, + ]; + + component.searchString = 'test'; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(simpleModalService, 'openConfirmationModal').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + jest.spyOn(accountService, 'resetAccountRequest').mockReturnValue(of({ + joinLink: 'joinlink', + })); + + const spyStatusMessageService = jest.spyOn(statusMessageService, 'showSuccessToast') + .mockImplementation((args: string) => { + expect(args) + .toEqual('Reset successful. An email has been sent to email.'); + }); + + const resetButton = fixture.debugElement.nativeElement.querySelector('#reset-account-request-0'); + resetButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(resetModalTitle, SimpleModalType.WARNING, resetModalContent); + }); + + it('should show error message when resetting account request is unsuccessful', () => { + const registeredAccountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST.build(); + registeredAccountRequestResult.status = AccountRequestStatus.REGISTERED; + registeredAccountRequestResult.registrationLink = 'registrationLink'; + registeredAccountRequestResult.registeredAtText = 'registeredTime'; + component.accountRequests = [ + registeredAccountRequestResult, + ]; + + component.searchString = 'test'; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(simpleModalService, 'openConfirmationModal').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + jest.spyOn(accountService, 'resetAccountRequest').mockReturnValue(throwError(() => ({ + error: { + message: 'This is the error message.', + }, + }))); + + const spyStatusMessageService = jest.spyOn(statusMessageService, 'showErrorToast') + .mockImplementation((args: string) => { + expect(args).toEqual('This is the error message.'); + }); + + const resetButton = fixture.debugElement.nativeElement.querySelector('#reset-account-request-0'); + resetButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(resetModalTitle, SimpleModalType.WARNING, resetModalContent); + }); + + it('should display comment modal', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(simpleModalService, 'openInformationModal') + .mockReturnValue(createMockNgbModalRef()); + + const viewCommentButton: any = fixture.debugElement.nativeElement.querySelector('#view-account-request-0'); + viewCommentButton.click(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith('Comments for name Request', + SimpleModalType.INFO, 'Comment: comment'); + }); + + it('should display edit modal when edit button is clicked', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + const editButton: any = fixture.debugElement.nativeElement.querySelector('#edit-account-request-0'); + editButton.click(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(EditRequestModalComponent); + }); + + it('should display reject modal when reject button is clicked', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + const rejectButton: any = fixture.debugElement.nativeElement.querySelector('#reject-request-with-reason-0'); + rejectButton.click(); + fixture.detectChanges(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(RejectWithReasonModalComponent); + }); + + it('should display error message when rejection was unsuccessful', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + jest.spyOn(accountService, 'rejectAccountRequest').mockReturnValue(throwError(() => ({ + error: { + message: 'This is the error message.', + }, + }))); + + const spyStatusMessageService = jest.spyOn(statusMessageService, 'showErrorToast') + .mockImplementation((args: string) => { + expect(args).toEqual('This is the error message.'); + }); + + const rejectButton = fixture.debugElement.nativeElement.querySelector('#reject-request-0'); + rejectButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + }); + + it('should display error message when approval was unsuccessful', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + jest.spyOn(accountService, 'approveAccountRequest').mockReturnValue(throwError(() => ({ + error: { + message: 'This is the error message.', + }, + }))); + + const spyStatusMessageService: any = jest.spyOn(statusMessageService, 'showErrorToast') + .mockImplementation((args: string) => { + expect(args).toEqual('This is the error message.'); + }); + + const approveButton: any = fixture.debugElement.nativeElement.querySelector('#approve-account-request-0'); + approveButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + }); + + it('should display error message when edit was unsuccessful', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + jest.spyOn(ngbModal, 'open').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + jest.spyOn(accountService, 'editAccountRequest').mockReturnValue(throwError(() => ({ + error: { + message: 'This is the error message.', + }, + }))); + + const spyStatusMessageService = jest.spyOn(statusMessageService, 'showErrorToast') + .mockImplementation((args: string) => { + expect(args).toEqual('This is the error message.'); + }); + + const editButton = fixture.debugElement.nativeElement.querySelector('#edit-account-request-0'); + editButton.click(); + + expect(spyStatusMessageService).toHaveBeenCalled(); + }); + + it('should update request when edit is succcessful', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => { + return createMockNgbModalRef({}); + }); + + const editedAccountRequest : AccountRequest = { + id: 'id', + comments: 'new comment', + email: 'new email', + institute: 'new institute', + registrationKey: 'registration key', + name: 'new name', + createdAt: 1, + status: AccountRequestStatus.PENDING, + }; + + jest.spyOn(accountService, 'editAccountRequest').mockReturnValue(of(editedAccountRequest)); + + const editButton: any = fixture.debugElement.nativeElement.querySelector('#edit-account-request-0'); + editButton.click(); + expect(modalSpy).toHaveBeenCalledTimes(1); + expect(modalSpy).toHaveBeenCalledWith(EditRequestModalComponent); + + fixture.detectChanges(); + expect(component.accountRequests[0].comments).toEqual('new comment'); + expect(component.accountRequests[0].email).toEqual('new email'); + expect(component.accountRequests[0].instituteAndCountry).toEqual('new institute'); + expect(component.accountRequests[0].name).toEqual('new name'); + }); + + it('should update status when approval is succcessful', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + const approvedRequest : AccountRequest = { + id: component.accountRequests[0].id, + comments: component.accountRequests[0].comments, + email: component.accountRequests[0].email, + institute: component.accountRequests[0].instituteAndCountry, + registrationKey: 'registration key', + name: component.accountRequests[0].name, + createdAt: 1, + status: AccountRequestStatus.APPROVED, + }; + + jest.spyOn(accountService, 'approveAccountRequest').mockReturnValue(of(approvedRequest)); + + const approveButton: any = fixture.debugElement.nativeElement.querySelector('#approve-account-request-0'); + approveButton.click(); + + fixture.detectChanges(); + expect(component.accountRequests[0].status).toEqual(AccountRequestStatus.APPROVED); + }); + + it('should update status when rejection is succcessful', () => { + const accountRequestResults: AccountRequestTableRowModel[] = [ + DEFAULT_ACCOUNT_REQUEST.build(), + ]; + + component.accountRequests = accountRequestResults; + fixture.detectChanges(); + + const rejectedRequest : AccountRequest = { + id: component.accountRequests[0].id, + comments: component.accountRequests[0].comments, + email: component.accountRequests[0].email, + institute: component.accountRequests[0].instituteAndCountry, + registrationKey: 'registration key', + name: component.accountRequests[0].name, + createdAt: 1, + status: AccountRequestStatus.REJECTED, + }; + + jest.spyOn(accountService, 'rejectAccountRequest').mockReturnValue(of(rejectedRequest)); + + const rejectButton: any = fixture.debugElement.nativeElement.querySelector('#reject-request-0'); + rejectButton.click(); + + fixture.detectChanges(); + expect(component.accountRequests[0].status).toEqual(AccountRequestStatus.REJECTED); + }); +}); diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index 54a22cffeb9..2af6f4b9aad 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -8,7 +8,7 @@ import { import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { AccountRequest, AccountRequestStatus, MessageOutput } from '../../../types/api-output'; +import { AccountRequest, MessageOutput } from '../../../types/api-output'; import { ErrorMessageOutput } from '../../error-message-output'; import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { collapseAnim } from '../teammates-common/collapse-anim'; @@ -89,8 +89,8 @@ export class AccountRequestTableComponent { this.accountService.approveAccountRequest(accountRequest.id, accountRequest.name, accountRequest.email, accountRequest.instituteAndCountry) .subscribe({ - next: () => { - accountRequest.status = AccountRequestStatus.APPROVED; + next: (resp : AccountRequest) => { + accountRequest.status = resp.status; }, error: (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/__snapshots__/admin-edit-request-modal.component.spec.ts.snap b/src/web/app/components/account-requests-table/admin-edit-request-modal/__snapshots__/admin-edit-request-modal.component.spec.ts.snap new file mode 100644 index 00000000000..17770c36eb2 --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/__snapshots__/admin-edit-request-modal.component.spec.ts.snap @@ -0,0 +1,215 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`RejectWithReasonModal should show empty fields 1`] = ` + +
    +
    +
    + Edit Account Request for +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    +
    +

    diff --git a/src/web/app/pages-static/request-page/request-page.component.html b/src/web/app/pages-static/request-page/request-page.component.html index 877da7af395..50b63e7dea1 100644 --- a/src/web/app/pages-static/request-page/request-page.component.html +++ b/src/web/app/pages-static/request-page/request-page.component.html @@ -12,7 +12,7 @@

    Note: Students should not use this form to request for TEAMMATES accounts, as students do not need accounts to use TEAMMATES. Instead, TEAMMATES will email students (who have been added to TEAMMATES by a course instructor) an access link when there is a TEAMMATES session available for them to access.

    Back to home page - +

    From 735afbd2747465c9f2702c1e60f97dc32b5c6ebd Mon Sep 17 00:00:00 2001 From: Erald Prifti <116452622+eraldprifti03@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:13:13 +0300 Subject: [PATCH 64/95] [#12954] CreateAccountAction seems to have redundant code (#13039) * Removed redundant code * Removed reduntant code * Removed trailing whitespaces * Removed trailing whitespaces --- .../java/teammates/ui/webapi/CreateAccountAction.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/teammates/ui/webapi/CreateAccountAction.java b/src/main/java/teammates/ui/webapi/CreateAccountAction.java index c536a09cc9c..8f12a48d88c 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountAction.java @@ -92,7 +92,7 @@ public JsonResult execute() throws InvalidHttpRequestBodyException, InvalidOpera } try { - setAccountRequestAsRegistered(accountRequest, instructorEmail, instructorInstitution); + setAccountRequestAsRegistered(accountRequest); } catch (EntityDoesNotExistException | InvalidParametersException e) { // EntityDoesNotExistException should not be thrown as existence of account request has been validated before. // InvalidParametersException should not be thrown as there should not be any invalid parameters. @@ -108,13 +108,9 @@ public JsonResult execute() throws InvalidHttpRequestBodyException, InvalidOpera * * @return the updated account request */ - private AccountRequest setAccountRequestAsRegistered(AccountRequest accountRequest, - String instructorEmail, String instructorInstitution) + private AccountRequest setAccountRequestAsRegistered(AccountRequest accountRequest) throws InvalidParametersException, EntityDoesNotExistException { - accountRequest.setEmail(instructorEmail); - accountRequest.setInstitute(instructorInstitution); accountRequest.setRegisteredAt(Instant.now()); - sqlLogic.updateAccountRequest(accountRequest); return accountRequest; } From f8522866c39bc7d7208f1e3443061b408ef4af9e Mon Sep 17 00:00:00 2001 From: Ching Ming Yuan Date: Wed, 17 Apr 2024 14:47:59 +0800 Subject: [PATCH 65/95] [#12048] Fix getSessionResultAction bugs (#13023) * [#12048] Config prod settings and convenience scripts for non course migration (#12959) * Add fields * Change based on feedback * Add changes * Add reverse data migration script for account (#12962) * Add changes (#12965) * V9 non course migration fix to check extra SQL accounts (#12966) * Add changes * Add isMarked script * Add patch data migration script for usage stats (#12970) * Add patch data migration script for usage stats * Fix hibernate batch query * Revert log * Initial commit * Revert "[#12048] Config prod settings and convenience scripts for non course migration (#12959)" This reverts commit 6df39c19108de833624992c56e09f75960ff65c1. * Revert "Add reverse data migration script for account (#12962)" This reverts commit 05099825679c31ace2872860a358288ec0bdacc3. * Revert "V9 non course migration fix to check extra SQL accounts (#12966)" This reverts commit 611b2cc3682b11e75c3631a8843aa030e8a34b9d. * Revert "Add patch data migration script for usage stats (#12970)" This reverts commit 239ae85a5bd2d40ea4464b6e47a626f76913a6e1. * Revert "Add changes (#12965)" This reverts commit 1292dbe995e50b9c3fe1bf5ec377e92f6f751ec2. * Fix lint * Retry lint --------- Co-authored-by: FergusMok Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../ui/webapi/GetSessionResultsActionIT.java | 31 +++++++++++++++++-- .../ui/webapi/GetSessionResultsAction.java | 7 +++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/it/java/teammates/it/ui/webapi/GetSessionResultsActionIT.java b/src/it/java/teammates/it/ui/webapi/GetSessionResultsActionIT.java index 246ea81b5a4..a7abb835212 100644 --- a/src/it/java/teammates/it/ui/webapi/GetSessionResultsActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/GetSessionResultsActionIT.java @@ -12,6 +12,7 @@ import teammates.common.util.HibernateUtil; import teammates.common.util.JsonUtils; import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Section; @@ -153,6 +154,32 @@ protected void testExecute() { student); assertTrue(isSessionResultsDataEqual(expectedResults, output)); + + ______TS("Typical: Student accesses results of their course by questionId"); + + loginAsStudent(student.getGoogleId()); + + FeedbackQuestion question = typicalBundle.feedbackQuestions.get("qn1InSession1InCourse1"); + + submissionParams = new String[] { + Const.ParamsNames.FEEDBACK_SESSION_NAME, accessibleFeedbackSession.getName(), + Const.ParamsNames.COURSE_ID, accessibleFeedbackSession.getCourse().getId(), + Const.ParamsNames.FEEDBACK_QUESTION_ID, question.getId().toString(), + Const.ParamsNames.INTENT, Intent.STUDENT_RESULT.name(), + }; + + a = getAction(submissionParams); + r = getJsonResult(a); + + output = (SessionResultsData) r.getOutput(); + expectedResults = SessionResultsData.initForStudent( + logic.getSessionResultsForUser(accessibleFeedbackSession, + accessibleFeedbackSession.getCourse().getId(), + student.getEmail(), + false, question.getId(), false), + student); + + assertTrue(isSessionResultsDataEqual(expectedResults, output)); } @Override @@ -231,7 +258,7 @@ private boolean isSessionResultsDataEqual(SessionResultsData self, SessionResult } private boolean isQuestionOutputEqual(SessionResultsData.QuestionOutput self, - SessionResultsData.QuestionOutput other) { + SessionResultsData.QuestionOutput other) { if (!JsonUtils.toJson(self.getFeedbackQuestion()).equals(JsonUtils.toJson(other.getFeedbackQuestion())) || !self.getQuestionStatistics().equals(other.getQuestionStatistics()) || self.getHasResponseButNotVisibleForPreview() != other.getHasResponseButNotVisibleForPreview() @@ -254,7 +281,7 @@ private boolean isQuestionOutputEqual(SessionResultsData.QuestionOutput self, } private boolean isResponseOutputEqual(SessionResultsData.ResponseOutput self, - SessionResultsData.ResponseOutput other) { + SessionResultsData.ResponseOutput other) { return self.getGiver().equals(other.getGiver()) && self.getGiverTeam().equals(other.getGiverTeam()) && self.getGiverSection().equals(other.getGiverSection()) diff --git a/src/main/java/teammates/ui/webapi/GetSessionResultsAction.java b/src/main/java/teammates/ui/webapi/GetSessionResultsAction.java index 5de4fce08e3..d1aa7d9f09b 100644 --- a/src/main/java/teammates/ui/webapi/GetSessionResultsAction.java +++ b/src/main/java/teammates/ui/webapi/GetSessionResultsAction.java @@ -13,6 +13,7 @@ import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Student; +import teammates.storage.sqlentity.Team; import teammates.ui.output.SessionResultsData; import teammates.ui.request.Intent; @@ -126,7 +127,7 @@ public JsonResult execute() { if (isCourseMigrated(courseId)) { if (questionId != null) { UUID questionUuid = getUuidRequestParamValue(Const.ParamsNames.FEEDBACK_QUESTION_ID); - executeWithSql(courseId, feedbackSessionName, questionUuid, + return executeWithSql(courseId, feedbackSessionName, questionUuid, selectedSection, fetchType, intent, isPreviewResults); } return executeWithSql(courseId, feedbackSessionName, null, selectedSection, @@ -195,14 +196,14 @@ private JsonResult executeWithSql( return new JsonResult(SessionResultsData.initForInstructor(bundle)); case INSTRUCTOR_RESULT: // Section name filter is not applicable here - instructor = getPossiblyUnregisteredSqlInstructor(courseId); + instructor = getSqlInstructorOfCourseFromRequest(courseId); bundle = sqlLogic.getSessionResultsForUser(feedbackSession, courseId, instructor.getEmail(), true, questionUuid, isPreviewResults); // Build a fake student object, as the results will be displayed as if they are displayed to a student student = new Student(instructor.getCourse(), instructor.getName(), instructor.getEmail(), ""); - student.setTeam(instructor.getTeam()); + student.setTeam(new Team(null, Const.USER_TEAM_FOR_INSTRUCTOR)); return new JsonResult(SessionResultsData.initForStudent(bundle, student)); case STUDENT_RESULT: From 3915b8c5684bfb77087c9b334468b0960965d6e5 Mon Sep 17 00:00:00 2001 From: DS Date: Wed, 17 Apr 2024 18:37:28 +0800 Subject: [PATCH 66/95] Remove method from logic and db (#13044) --- src/main/java/teammates/sqllogic/api/Logic.java | 9 --------- .../sqllogic/core/AccountRequestsLogic.java | 8 -------- .../storage/sqlapi/AccountRequestsDb.java | 14 -------------- 3 files changed, 31 deletions(-) diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 53d90026646..a70ea6b255d 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -104,15 +104,6 @@ public AccountRequest getAccountRequest(UUID id) { return accountRequestLogic.getAccountRequest(id); } - /** - * Gets the account request with the given email and institute. - * - * @return account request with the given email and institute. - */ - public AccountRequest getAccountRequest(String email, String institute) { - return accountRequestLogic.getAccountRequest(email, institute); - } - /** * Gets the account request with the given {@code id}. * diff --git a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java index 2e5af513560..996e52abb0a 100644 --- a/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java +++ b/src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java @@ -74,14 +74,6 @@ public AccountRequest getAccountRequest(UUID id) { return accountRequestDb.getAccountRequest(id); } - /** - * Gets account request associated with the {@code email} and {@code institute}. - */ - public AccountRequest getAccountRequest(String email, String institute) { - - return accountRequestDb.getAccountRequest(email, institute); - } - /** * Gets the account request associated with the {@code id}. */ diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index 499781a314e..c0fc9c74b0b 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -63,20 +63,6 @@ public AccountRequest getAccountRequest(UUID id) { return HibernateUtil.get(AccountRequest.class, id); } - /** - * Get AccountRequest by {@code email} and {@code institute} from database. - */ - public AccountRequest getAccountRequest(String email, String institute) { - CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); - CriteriaQuery cr = cb.createQuery(AccountRequest.class); - Root root = cr.from(AccountRequest.class); - cr.select(root).where(cb.and(cb.equal( - root.get("email"), email), cb.equal(root.get("institute"), institute))); - - TypedQuery query = HibernateUtil.createQuery(cr); - return query.getResultStream().findFirst().orElse(null); - } - /** * Get all Account Requests with {@code status} of 'pending'. */ From ab22022dc4511f3f522931c2ab1324de5dbebea9 Mon Sep 17 00:00:00 2001 From: Xenos F Date: Wed, 17 Apr 2024 19:54:12 +0800 Subject: [PATCH 67/95] [#11878] Migrate AccountRequestsLogic unit tests (#13043) * Add get typical account request method * Migrate AccountRequestsLogicTest * Remove test for get by email address and institute --------- Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> --- .../core/AccountRequestsLogicTest.java | 133 +++++++++++++++++- .../java/teammates/test/BaseTestCase.java | 7 + 2 files changed, 139 insertions(+), 1 deletion(-) diff --git a/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java b/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java index 6886acc8007..a0a3064ae32 100644 --- a/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java +++ b/src/test/java/teammates/sqllogic/core/AccountRequestsLogicTest.java @@ -1,6 +1,9 @@ package teammates.sqllogic.core; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -10,6 +13,9 @@ import org.testng.annotations.Test; import teammates.common.datatransfer.AccountRequestStatus; +import teammates.common.exception.EntityDoesNotExistException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; import teammates.storage.sqlapi.AccountRequestsDb; import teammates.storage.sqlentity.AccountRequest; import teammates.test.BaseTestCase; @@ -20,7 +26,6 @@ public class AccountRequestsLogicTest extends BaseTestCase { private AccountRequestsLogic accountRequestsLogic = AccountRequestsLogic.inst(); - private AccountRequestsDb accountRequestsDb; @BeforeMethod @@ -29,6 +34,132 @@ public void setUpMethod() { accountRequestsLogic.initLogicDependencies(accountRequestsDb); } + @Test + public void testCreateAccountRequest_typicalRequest_success() throws Exception { + AccountRequest accountRequest = getTypicalAccountRequest(); + when(accountRequestsDb.createAccountRequest(accountRequest)).thenReturn(accountRequest); + AccountRequest createdAccountRequest = accountRequestsLogic.createAccountRequest(accountRequest); + + assertEquals(accountRequest, createdAccountRequest); + verify(accountRequestsDb, times(1)).createAccountRequest(accountRequest); + } + + @Test + public void testCreateAccountRequest_requestAlreadyExists_success() throws Exception { + AccountRequest accountRequest1 = getTypicalAccountRequest(); + AccountRequest accountRequest2 = getTypicalAccountRequest(); + when(accountRequestsDb.createAccountRequest(accountRequest1)) + .thenReturn(accountRequest1); + when(accountRequestsDb.createAccountRequest(accountRequest2)) + .thenReturn(accountRequest2); + + accountRequestsLogic.createAccountRequest(accountRequest1); + accountRequestsLogic.createAccountRequest(accountRequest2); + verify(accountRequestsDb, times(1)).createAccountRequest(accountRequest1); + verify(accountRequestsDb, times(1)).createAccountRequest(accountRequest2); + } + + @Test + public void testCreateAccountRequest_invalidParams_failure() throws Exception { + AccountRequest invalidEmailAccountRequest = getTypicalAccountRequest(); + invalidEmailAccountRequest.setEmail("invalid email"); + when(accountRequestsDb.createAccountRequest(invalidEmailAccountRequest)) + .thenThrow(new InvalidParametersException("test exception")); + + assertThrows(InvalidParametersException.class, () -> { + accountRequestsLogic.createAccountRequest(invalidEmailAccountRequest); + }); + verify(accountRequestsDb, times(1)).createAccountRequest(invalidEmailAccountRequest); + } + + @Test + public void testUpdateAccountRequest_typicalRequest_success() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest ar = getTypicalAccountRequest(); + when(accountRequestsDb.updateAccountRequest(ar)).thenReturn(ar); + AccountRequest updatedAr = accountRequestsLogic.updateAccountRequest(ar); + + assertEquals(ar, updatedAr); + verify(accountRequestsDb, times(1)).updateAccountRequest(ar); + } + + @Test + public void testUpdateAccountRequest_requestNotFound_failure() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest arNotFound = getTypicalAccountRequest(); + when(accountRequestsDb.updateAccountRequest(arNotFound)).thenThrow(new EntityDoesNotExistException("test message")); + + assertThrows(EntityDoesNotExistException.class, + () -> accountRequestsLogic.updateAccountRequest(arNotFound)); + verify(accountRequestsDb, times(1)).updateAccountRequest(any(AccountRequest.class)); + } + + @Test + public void testDeleteAccountRequest_typicalRequest_success() { + AccountRequest ar = getTypicalAccountRequest(); + when(accountRequestsDb.getAccountRequest(ar.getId())).thenReturn(ar); + accountRequestsLogic.deleteAccountRequest(ar.getId()); + + verify(accountRequestsDb, times(1)).deleteAccountRequest(any(AccountRequest.class)); + } + + @Test + public void testDeleteAccountRequest_nonexistentRequest_shouldSilentlyDelete() { + UUID nonexistentUuid = UUID.fromString("00000000-0000-4000-8000-000000000100"); + accountRequestsLogic.deleteAccountRequest(nonexistentUuid); + + verify(accountRequestsDb, times(1)).deleteAccountRequest(nullable(AccountRequest.class)); + } + + @Test + public void testGetAccountRequestByRegistrationKey_typicalRequest_success() { + AccountRequest ar = getTypicalAccountRequest(); + String regkey = "regkey"; + ar.setRegistrationKey(regkey); + when(accountRequestsDb.getAccountRequestByRegistrationKey(regkey)).thenReturn(ar); + AccountRequest actualAr = + accountRequestsLogic.getAccountRequestByRegistrationKey(ar.getRegistrationKey()); + + assertEquals(ar, actualAr); + verify(accountRequestsDb, times(1)).getAccountRequestByRegistrationKey(regkey); + } + + @Test + public void testGetAccountRequestByRegistrationKey_nonexistentRequest_shouldReturnNull() throws Exception { + String nonexistentRegkey = "not_exist"; + when(accountRequestsDb.getAccountRequestByRegistrationKey(nonexistentRegkey)).thenReturn(null); + + assertNull(accountRequestsLogic.getAccountRequestByRegistrationKey(nonexistentRegkey)); + verify(accountRequestsDb, times(1)).getAccountRequestByRegistrationKey(nonexistentRegkey); + } + + @Test + public void testResetAccountRequest_typicalRequest_success() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest accountRequest = getTypicalAccountRequest(); + accountRequest.setRegisteredAt(Const.TIME_REPRESENTS_NOW); + when(accountRequestsDb.getAccountRequest(accountRequest.getId())) + .thenReturn(accountRequest); + when(accountRequestsDb.updateAccountRequest(accountRequest)).thenReturn(accountRequest); + accountRequest = accountRequestsLogic.resetAccountRequest(accountRequest.getId()); + + assertNull(accountRequest.getRegisteredAt()); + verify(accountRequestsDb, times(1)).getAccountRequest(accountRequest.getId()); + } + + @Test + public void testResetAccountRequest_nonexistentRequest_failure() + throws InvalidParametersException, EntityDoesNotExistException { + AccountRequest accountRequest = getTypicalAccountRequest(); + accountRequest.setRegisteredAt(Const.TIME_REPRESENTS_NOW); + when(accountRequestsDb.getAccountRequest(accountRequest.getId())) + .thenReturn(null); + assertThrows(EntityDoesNotExistException.class, + () -> accountRequestsLogic.resetAccountRequest(accountRequest.getId())); + verify(accountRequestsDb, times(1)).getAccountRequest(accountRequest.getId()); + verify(accountRequestsDb, times(0)).updateAccountRequest(nullable(AccountRequest.class)); + } + @Test public void testGetAccountRequest_nonExistentAccountRequest_returnsNull() { UUID id = UUID.randomUUID(); diff --git a/src/test/java/teammates/test/BaseTestCase.java b/src/test/java/teammates/test/BaseTestCase.java index a7744061d55..c7df328d887 100644 --- a/src/test/java/teammates/test/BaseTestCase.java +++ b/src/test/java/teammates/test/BaseTestCase.java @@ -13,6 +13,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.DataBundle; import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.InstructorPermissionRole; @@ -29,6 +30,7 @@ import teammates.common.util.TimeHelperExtension; import teammates.sqllogic.core.DataBundleLogic; import teammates.storage.sqlentity.Account; +import teammates.storage.sqlentity.AccountRequest; import teammates.storage.sqlentity.Course; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; @@ -206,6 +208,11 @@ protected FeedbackResponseComment getTypicalResponseComment(Long id) { return comment; } + protected AccountRequest getTypicalAccountRequest() { + return new AccountRequest("valid@test.com", "Test Name", "TEAMMATES Test Institute 1, Test Country", + AccountRequestStatus.PENDING, ""); + } + /** * Populates the feedback question and response IDs within the data bundle. * From 68a4fbfe4052918b322acdbf89144477f677eb22 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Wed, 17 Apr 2024 20:05:29 +0800 Subject: [PATCH 68/95] [#11878] Add Admin E2E Tests (#13020) * add admin e2e tests * remove exception catching and update snaps * fix snaps * add comment verification * fix test --- .../e2e/cases/sql/AdminHomePageE2ETest.java | 55 +++++++++ .../e2e/cases/sql/AdminSearchPageE2ETest.java | 96 ++++++++++++++++ .../e2e/pageobjects/AdminHomePage.java | 30 +++++ .../e2e/pageobjects/AdminSearchPage.java | 105 ++++++++++++++++++ .../teammates/e2e/pageobjects/AppPage.java | 7 ++ .../data/AdminSearchPageE2ESqlTest.json | 31 +++++- src/e2e/resources/testng-e2e-sql.xml | 1 + ...t-with-reason-modal.component.spec.ts.snap | 1 + ...in-reject-with-reason-modal.component.html | 2 +- ...dmin-reject-with-reason-modal.component.ts | 4 +- 10 files changed, 328 insertions(+), 4 deletions(-) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/AdminHomePageE2ETest.java diff --git a/src/e2e/java/teammates/e2e/cases/sql/AdminHomePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/AdminHomePageE2ETest.java new file mode 100644 index 00000000000..e4e4d8c3560 --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/AdminHomePageE2ETest.java @@ -0,0 +1,55 @@ +package teammates.e2e.cases.sql; + +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.AdminHomePage; + +/** + * SUT: {@link Const.WebPageURIs#ADMIN_HOME_PAGE}. + */ +public class AdminHomePageE2ETest extends BaseE2ETestCase { + + @Override + protected void prepareTestData() { + // not needed + } + + @Test + @Override + public void testAll() { + AppUrl url = createFrontendUrl(Const.WebPageURIs.ADMIN_HOME_PAGE); + AdminHomePage homePage = loginAdminToPage(url, AdminHomePage.class); + + ______TS("Test adding instructors with both valid and invalid details"); + + String name = "AHPUiT Instrúctör WithPlusInEmail"; + String email = "AHPUiT+++_.instr1!@gmail.tmt"; + String institute = "TEAMMATES Test Institute 1"; + + homePage.queueInstructorForAdding(name, email, institute); + + String singleLineDetails = "Instructor With Invalid Email | invalidemail | TEAMMATES Test Institute 1"; + + homePage.queueInstructorForAdding(singleLineDetails); + + homePage.addAllInstructors(); + + String successMessage = homePage.getMessageForInstructor(0); + assertTrue(successMessage.contains( + "Instructor \"AHPUiT Instrúctör WithPlusInEmail\" has been successfully created")); + + String failureMessage = homePage.getMessageForInstructor(1); + assertTrue(failureMessage.contains( + "\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not in the correct format.")); + + homePage.reloadPage(); + + ______TS("Verify that newly added instructor appears in account request table"); + + homePage.verifyInstructorInAccountRequestTable(name, email, institute); + + } + +} diff --git a/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java index 848fee25302..eb209578a7d 100644 --- a/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/sql/AdminSearchPageE2ETest.java @@ -5,8 +5,11 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.Test; +import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.util.AppUrl; import teammates.common.util.Const; +import teammates.common.util.FieldValidator; +import teammates.common.util.StringHelperExtension; import teammates.e2e.pageobjects.AdminSearchPage; import teammates.e2e.util.TestProperties; import teammates.storage.sqlentity.AccountRequest; @@ -126,6 +129,99 @@ public void testAll() { searchPage.clickSearchButton(); searchPage.clickDeleteAccountRequestButton(accountRequest); assertNull(BACKDOOR.getAccountRequest(accountRequest.getId())); + + ______TS("Typical case: Edit account request successful"); + accountRequest = testData.accountRequests.get("unregisteredInstructor2"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickEditAccountRequestButton(accountRequest); + searchPage.fillInEditModalFields("Different name", accountRequest.getEmail(), + accountRequest.getInstitute(), "New comment"); + searchPage.clickSaveEditAccountRequestButton(); + accountRequest.setName("Different name"); + accountRequest.setComments("New comment"); + searchPage.verifyAccountRequestRowContent(accountRequest); + + ______TS("Typical case: View comment of account request"); + accountRequest = testData.accountRequests.get("unregisteredInstructor2"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickViewAccountRequestAndVerifyCommentsButton(accountRequest, "New comment"); + + ______TS("Edit account request with invalid details"); + accountRequest = testData.accountRequests.get("unregisteredInstructor2"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickEditAccountRequestButton(accountRequest); + searchPage.fillInEditModalFields(accountRequest.getName(), "invalid", + accountRequest.getInstitute(), "New comment"); + searchPage.clickSaveEditAccountRequestButton(); + String formattedErrorMessage = String.format("\"%s\" is not acceptable to TEAMMATES as a/an %s because it %s. " + + "An email address contains some text followed by one '@' sign followed by some more text, " + + "and should end with a top level domain address like .com. It cannot be longer than %d characters, " + + "cannot be empty and cannot contain spaces.", + "invalid", FieldValidator.EMAIL_FIELD_NAME, FieldValidator.REASON_INCORRECT_FORMAT, + FieldValidator.EMAIL_MAX_LENGTH); + searchPage.verifyStatusMessage(formattedErrorMessage); + + String name = StringHelperExtension.generateStringOfLength(FieldValidator.PERSON_NAME_MAX_LENGTH + 1); + + searchPage.clickEditAccountRequestButton(accountRequest); + searchPage.fillInEditModalFields(name, accountRequest.getEmail(), accountRequest.getInstitute(), "New comment"); + searchPage.clickSaveEditAccountRequestButton(); + formattedErrorMessage = String.format("\"%s\" is not acceptable to TEAMMATES as a/an %s because it %s. " + + "The value of a/an %s should be no longer than %d characters. It should not be empty.", + name, FieldValidator.PERSON_NAME_FIELD_NAME, FieldValidator.REASON_TOO_LONG, + FieldValidator.PERSON_NAME_FIELD_NAME, FieldValidator.PERSON_NAME_MAX_LENGTH); + searchPage.verifyStatusMessage(formattedErrorMessage); + + ______TS("Typical case: Approve account request successful"); + accountRequest = testData.accountRequests.get("unregisteredInstructor2"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickApproveAccountRequestButton(accountRequest); + accountRequest.setStatus(AccountRequestStatus.APPROVED); + searchPage.verifyAccountRequestRowContent(accountRequest); + + ______TS("Typical case: Reject account request successfully"); + accountRequest = testData.accountRequests.get("unregisteredInstructor3"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickRejectAccountRequestButton(accountRequest); + accountRequest.setStatus(AccountRequestStatus.REJECTED); + searchPage.verifyAccountRequestRowContent(accountRequest); + + ______TS("Reject account request with empty body"); + accountRequest = testData.accountRequests.get("unregisteredInstructor5"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickRejectAccountRequestWithReasonButton(accountRequest); + searchPage.fillInRejectionModalBody(""); + searchPage.clickConfirmRejectAccountRequest(); + searchPage.verifyStatusMessage("Please provide an email body for the rejection email."); + searchPage.closeRejectionModal(); + + ______TS("Typical case: Reject account request with reason successfully"); + accountRequest = testData.accountRequests.get("unregisteredInstructor4"); + searchContent = accountRequest.getEmail(); + searchPage.clearSearchBox(); + searchPage.inputSearchContent(searchContent); + searchPage.clickSearchButton(); + searchPage.clickRejectAccountRequestWithReasonButton(accountRequest); + accountRequest.setStatus(AccountRequestStatus.REJECTED); + searchPage.verifyAccountRequestRowContent(accountRequest); } private String getExpectedStudentDetails(Student student) { diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminHomePage.java index 7e40f8ebef4..9316f042077 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminHomePage.java @@ -1,5 +1,7 @@ package teammates.e2e.pageobjects; +import static org.junit.Assert.assertNotNull; + import java.util.List; import org.openqa.selenium.By; @@ -12,6 +14,9 @@ * Represents the admin home page of the website. */ public class AdminHomePage extends AppPage { + private static final int ACCOUNT_REQUEST_COL_NAME = 1; + private static final int ACCOUNT_REQUEST_COL_EMAIL = 2; + private static final int ACCOUNT_REQUEST_COL_INSTITUTE = 4; @FindBy(id = "instructor-details-single-line") private WebElement detailsSingleLineTextBox; @@ -95,4 +100,29 @@ public void clickResetAccountRequestLink() { List okButtons = browser.driver.findElements(By.className("modal-btn-ok")); clickDismissModalButtonAndWaitForModalHidden(okButtons.get(1)); // Second modal is confirmation modal } + + public String removeSpanFromText(String text) { + return text.replace("", "").replace("", ""); + } + + public WebElement getAccountRequestRow(String name, String email, String institute) { + List rows = browser.driver.findElements(By.cssSelector("tm-account-request-table tbody tr")); + for (WebElement row : rows) { + List columns = row.findElements(By.tagName("td")); + if (removeSpanFromText(columns.get(ACCOUNT_REQUEST_COL_NAME - 1) + .getAttribute("innerHTML")).contains(name) + && removeSpanFromText(columns.get(ACCOUNT_REQUEST_COL_EMAIL - 1) + .getAttribute("innerHTML")).contains(email) + && removeSpanFromText(columns.get(ACCOUNT_REQUEST_COL_INSTITUTE - 1) + .getAttribute("innerHTML")).contains(institute)) { + return row; + } + } + return null; + } + + public void verifyInstructorInAccountRequestTable(String name, String email, String institute) { + WebElement row = getAccountRequestRow(name, email, institute); + assertNotNull(row); + } } diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java index 15253ca5171..289cbb13148 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java @@ -439,6 +439,111 @@ public void clickDeleteAccountRequestButton(AccountRequest accountRequest) { waitForPageToLoad(); } + public void clickApproveAccountRequestButton(AccountRequest accountRequest) { + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + waitForElementPresence(By.cssSelector("[id^='approve-account-request-']")); + WebElement approveButton = accountRequestRow.findElement(By.cssSelector("[id^='approve-account-request-']")); + waitForElementToBeClickable(approveButton); + approveButton.click(); + waitForPageToLoad(); + } + + public void clickRejectAccountRequestButton(AccountRequest accountRequest) { + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + WebElement rejectButton = accountRequestRow.findElement(By.cssSelector("[id^='reject-account-request-']")); + rejectButton.click(); + waitForPageToLoad(); + WebElement rejectWithoutReasonButton = browser.driver.findElement(By.cssSelector("[id^='reject-request-']")); + rejectWithoutReasonButton.click(); + waitForPageToLoad(); + } + + public void clickRejectAccountRequestWithReasonButton(AccountRequest accountRequest) { + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + WebElement rejectButton = accountRequestRow.findElement(By.cssSelector("[id^='reject-account-request-']")); + rejectButton.click(); + waitForPageToLoad(); + WebElement rejectWithReasonButton = browser.driver.findElement(By.cssSelector("[id^='reject-request-with-reason']")); + waitForElementToBeClickable(rejectWithReasonButton); + rejectWithReasonButton.click(); + waitForPageToLoad(); + waitForElementPresence(By.cssSelector("tm-reject-with-reason-modal")); + } + + public void fillInRejectionModalTitle(String title) { + WebElement rejectionModal = browser.driver.findElement(By.cssSelector("tm-reject-with-reason-modal")); + WebElement titleInput = rejectionModal.findElement(By.cssSelector("[id^='rejection-reason-title']")); + titleInput.clear(); + titleInput.sendKeys(title); + } + + public void fillInRejectionModalBody(String body) { + WebElement rejectionModal = browser.driver.findElement(By.cssSelector("tm-reject-with-reason-modal")); + WebElement bodyInput = rejectionModal.findElement(By.cssSelector("tm-rich-text-editor")); + clearRichTextEditor(bodyInput); + writeToRichTextEditor(bodyInput, body); + } + + public void clickConfirmRejectAccountRequest() { + WebElement rejectionModal = browser.driver.findElement(By.cssSelector("tm-reject-with-reason-modal")); + WebElement clickReject = rejectionModal.findElement(By.cssSelector("[id^='btn-confirm-reject-request']")); + clickReject.click(); + waitForPageToLoad(); + } + + public void closeRejectionModal() { + WebElement rejectionModal = browser.driver.findElement(By.cssSelector("tm-reject-with-reason-modal")); + WebElement clickCancel = rejectionModal.findElement(By.cssSelector("[id^='btn-cancel-reject-request']")); + clickCancel.click(); + waitForPageToLoad(); + } + + public void clickEditAccountRequestButton(AccountRequest accountRequest) { + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + WebElement editButton = accountRequestRow.findElement(By.cssSelector("[id^='edit-account-request-']")); + editButton.click(); + waitForElementPresence(By.cssSelector("tm-edit-request-modal")); + } + + public void fillInEditModalFields(String name, String email, String institute, String comments) { + waitForElementPresence(By.cssSelector("tm-edit-request-modal")); + + WebElement editModal = browser.driver.findElement(By.cssSelector("tm-edit-request-modal")); + WebElement nameInput = editModal.findElement(By.cssSelector("[id^='request-name']")); + nameInput.clear(); + nameInput.sendKeys(name); + + WebElement emailInput = editModal.findElement(By.cssSelector("[id^='request-email']")); + emailInput.clear(); + emailInput.sendKeys(email); + + WebElement instituteInput = editModal.findElement(By.cssSelector("[id^='request-institution']")); + instituteInput.clear(); + instituteInput.sendKeys(institute); + + WebElement commentsInput = editModal.findElement(By.cssSelector("[id^='request-comments']")); + commentsInput.clear(); + commentsInput.sendKeys(comments); + } + + public void clickSaveEditAccountRequestButton() { + WebElement editModal = browser.driver.findElement(By.cssSelector("tm-edit-request-modal")); + WebElement saveButton = editModal.findElement(By.cssSelector("[id^='btn-confirm-edit-request']")); + saveButton.click(); + waitForPageToLoad(); + } + + public void clickViewAccountRequestAndVerifyCommentsButton(AccountRequest accountRequest, String comments) { + WebElement accountRequestRow = getAccountRequestRow(accountRequest); + WebElement viewCommentsButton = accountRequestRow.findElement(By.cssSelector("[id^='view-account-request-']")); + viewCommentsButton.click(); + waitForElementVisibility(By.className("modal-btn-ok")); + WebElement modal = browser.driver.findElement(By.className("modal-body")); + String actualComments = modal.findElement(By.tagName("div")).getText(); + assertEquals("Comment: " + comments, actualComments); + waitForConfirmationModalAndClickOk(); + } + public void clickResetAccountRequestButton(AccountRequestAttributes accountRequest) { WebElement accountRequestRow = getAccountRequestRow(accountRequest); WebElement deleteButton = accountRequestRow.findElement(By.cssSelector("[id^='reset-account-request-']")); diff --git a/src/e2e/java/teammates/e2e/pageobjects/AppPage.java b/src/e2e/java/teammates/e2e/pageobjects/AppPage.java index c8d5911e57f..c52330fd928 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AppPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AppPage.java @@ -395,6 +395,13 @@ protected void writeToRichTextEditor(WebElement editor, String text) { ((JavascriptExecutor) browser.driver).executeAsyncScript(WRITE_TO_TINYMCE_SCRIPT, id, text); } + /** + * Clear existing text in the editor. + */ + protected void clearRichTextEditor(WebElement editor) { + writeToRichTextEditor(editor, ""); + } + /** * Select the option, if it is not already selected. * No action taken if it is already selected. diff --git a/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json b/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json index 94b28ae6ad2..3a36ff511d8 100644 --- a/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json +++ b/src/e2e/resources/data/AdminSearchPageE2ESqlTest.json @@ -38,7 +38,36 @@ "name": "Typical Instructor Name", "email": "ASearch.unregisteredinstructor1@gmail.tmt", "institute": "TEAMMATES Test Institute 1", - "createdAt": "2011-01-01T00:00:00Z" + "createdAt": "2011-01-01T00:00:00Z", + "status": "PENDING" + }, + "unregisteredInstructor2": { + "name": "Typical Instructor Name", + "email": "ASearch.unregisteredinstructor2@gmail.tmt", + "institute": "TEAMMATES Test Institute 2", + "createdAt": "2011-01-01T00:00:00Z", + "status": "PENDING" + }, + "unregisteredInstructor3": { + "name": "Typical Instructor Name", + "email": "ASearch.unregisteredinstructor3@gmail.tmt", + "institute": "TEAMMATES Test Institute 3", + "createdAt": "2011-01-01T00:00:00Z", + "status": "PENDING" + }, + "unregisteredInstructor4": { + "name": "Typical Instructor Name", + "email": "ASearch.unregisteredinstructor4@gmail.tmt", + "institute": "TEAMMATES Test Institute 4", + "createdAt": "2011-01-01T00:00:00Z", + "status": "PENDING" + }, + "unregisteredInstructor5": { + "name": "Typical Instructor Name", + "email": "ASearch.unregisteredinstructor5@gmail.tmt", + "institute": "TEAMMATES Test Institute 5", + "createdAt": "2011-01-01T00:00:00Z", + "status": "PENDING" } }, "courses": { diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index 40c38e4bfbf..42881b3a3e7 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -13,6 +13,7 @@ + diff --git a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/__snapshots__/admin-reject-with-reason-modal.component.spec.ts.snap b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/__snapshots__/admin-reject-with-reason-modal.component.spec.ts.snap index a9fba7d8d6f..6d39aa0d076 100644 --- a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/__snapshots__/admin-reject-with-reason-modal.component.spec.ts.snap +++ b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/__snapshots__/admin-reject-with-reason-modal.component.spec.ts.snap @@ -66,6 +66,7 @@ exports[`RejectWithReasonModal should show empty title and body 1`] = ` >
    - + diff --git a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts index 8a3ad3ce55c..051d145d4d6 100644 --- a/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts +++ b/src/web/app/components/account-requests-table/admin-reject-with-reason-modal/admin-reject-with-reason-modal.component.ts @@ -56,12 +56,12 @@ export class RejectWithReasonModalComponent implements OnInit { */ reject(): void { - if (!this.rejectionReasonBody) { + if (!this.rejectionReasonBody || this.rejectionReasonBody.length === 0) { this.statusMessageService.showErrorToast('Please provide an email body for the rejection email.'); return; } - if (!this.rejectionReasonTitle) { + if (!this.rejectionReasonTitle || this.rejectionReasonTitle.length === 0) { this.statusMessageService.showErrorToast('Please provide a title for the rejection email.'); return; } From 2cc6ef82fc92e2bc742c39b6c5b337330faf5e62 Mon Sep 17 00:00:00 2001 From: Xenos F Date: Thu, 18 Apr 2024 00:53:33 +0800 Subject: [PATCH 69/95] [#11878] Add SQLI tests (#13047) --- .../storage/sqlapi/AccountRequestsDbIT.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java index a12dcfac4fd..6807e43a9b4 100644 --- a/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/AccountRequestsDbIT.java @@ -155,6 +155,21 @@ public void testSqlInjectionInCreateAccountRequestInstituteField() throws Except assertEquals(institute, actual.getInstitute()); } + @Test + public void testSqlInjectionInCreateAccountRequestCommentsField() throws Exception { + ______TS("SQL Injection test in comments field"); + + // Attempt to use SQL commands in comments field + String comments = "comment'; DROP TABLE account_requests; --"; + AccountRequest accountRequest = + new AccountRequest("test@gmail.com", "name", "institute", AccountRequestStatus.PENDING, comments); + + // The system should treat the input as a plain text string + accountRequestDb.createAccountRequest(accountRequest); + AccountRequest actual = accountRequestDb.getAccountRequest(accountRequest.getId()); + assertEquals(comments, actual.getComments()); + } + @Test public void testSqlInjectionInGetAccountRequestByRegistrationKey() throws Exception { ______TS("SQL Injection test in getAccountRequestByRegistrationKey"); @@ -171,6 +186,22 @@ public void testSqlInjectionInGetAccountRequestByRegistrationKey() throws Except assertEquals(accountRequest, actual); } + @Test + public void testSqlInjectionInGetApprovedAccountRequestsForEmail() throws Exception { + ______TS("SQL Injection test in getApprovedAccountRequestsForEmail"); + + String email = "test@gmail.com"; + AccountRequest accountRequest = + new AccountRequest(email, "name", "institute", AccountRequestStatus.APPROVED, "comments"); + accountRequestDb.createAccountRequest(accountRequest); + + // Attempt to use SQL commands in email field + String emailInjection = "email'/**/OR/**/1=1/**/@gmail.com"; + List actualInjection = accountRequestDb.getApprovedAccountRequestsForEmail(emailInjection); + // The system should treat the input as a plain text string + assertEquals(0, actualInjection.size()); + } + @Test public void testSqlInjectionInUpdateAccountRequest() throws Exception { ______TS("SQL Injection test in updateAccountRequest"); From 5378b6603ebd521faa14b6555da490c262567026 Mon Sep 17 00:00:00 2001 From: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> Date: Thu, 18 Apr 2024 00:59:04 +0800 Subject: [PATCH 70/95] Revert "Enable CI on account request form branch" (#13049) This reverts commit 186a97a2bc8efd5d5f350eacdb9288cad2dafc64. --- .github/workflows/axe.yml | 2 -- .github/workflows/component.yml | 2 -- .github/workflows/e2e-sql.yml | 2 -- .github/workflows/e2e.yml | 2 -- .github/workflows/jdk17.yml | 1 - .github/workflows/lnp.yml | 1 - .github/workflows/pr.yml | 1 - 7 files changed, 11 deletions(-) diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml index bee66fbcfc3..771dd8a3edc 100644 --- a/.github/workflows/axe.yml +++ b/.github/workflows/axe.yml @@ -5,12 +5,10 @@ on: branches: - master - release - - account-request-form pull_request: branches: - master - release - - account-request-form jobs: axe-testing: runs-on: ubuntu-latest diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml index bb814a02c0e..11ecfb7357f 100644 --- a/.github/workflows/component.yml +++ b/.github/workflows/component.yml @@ -5,12 +5,10 @@ on: branches: - master - release - - account-request-form pull_request: branches: - master - release - - account-request-form schedule: - cron: "0 0 * * *" #end of every day jobs: diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml index 267cd0d219f..0a67cbac52d 100644 --- a/.github/workflows/e2e-sql.yml +++ b/.github/workflows/e2e-sql.yml @@ -5,12 +5,10 @@ on: branches: - master - release - - account-request-form pull_request: branches: - master - release - - account-request-form schedule: - cron: "0 0 * * *" #end of every day jobs: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 71cfa72bd24..52ab76019ed 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -5,12 +5,10 @@ on: branches: - master - release - - account-request-form pull_request: branches: - master - release - - account-request-form schedule: - cron: "0 0 * * *" #end of every day jobs: diff --git a/.github/workflows/jdk17.yml b/.github/workflows/jdk17.yml index f0d68910de5..29ab59bb561 100644 --- a/.github/workflows/jdk17.yml +++ b/.github/workflows/jdk17.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - account-request-form jobs: lint: diff --git a/.github/workflows/lnp.yml b/.github/workflows/lnp.yml index 4389bac81ff..2ff33dda920 100644 --- a/.github/workflows/lnp.yml +++ b/.github/workflows/lnp.yml @@ -5,7 +5,6 @@ on: branches: - master - release - - account-request-form schedule: - cron: "0 0 * * *" # end of every day jobs: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f55fd672fe0..03f11d9b6d3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,6 @@ on: - reopened branches: - master - - account-request-form jobs: check-pr: From 9a51e2ae1348baac90d5e704a49ecb58d7ca9064 Mon Sep 17 00:00:00 2001 From: DS Date: Thu, 18 Apr 2024 10:31:00 +0800 Subject: [PATCH 71/95] [#11843] Fix front end bugs (#13037) * Fix notViewedSince * Update disclaimer * Change disclaimer message * Fix view result message * Fix not viewed since message --- ...udent-activity-logs.component.spec.ts.snap | 80 ++++++++++++++----- ...uctor-student-activity-logs.component.html | 3 +- ...tructor-student-activity-logs.component.ts | 26 +++--- 3 files changed, 76 insertions(+), 33 deletions(-) diff --git a/src/web/app/pages-instructor/instructor-student-activity-logs/__snapshots__/instructor-student-activity-logs.component.spec.ts.snap b/src/web/app/pages-instructor/instructor-student-activity-logs/__snapshots__/instructor-student-activity-logs.component.spec.ts.snap index d1db70c5fc0..7aaf565c918 100644 --- a/src/web/app/pages-instructor/instructor-student-activity-logs/__snapshots__/instructor-student-activity-logs.component.spec.ts.snap +++ b/src/web/app/pages-instructor/instructor-student-activity-logs/__snapshots__/instructor-student-activity-logs.component.spec.ts.snap @@ -16,6 +16,7 @@ exports[`InstructorStudentActivityLogsComponent should snap when page is still l formModel={[Function Object]} isLoading={[Function Boolean]} isSearching="false" + lastUpdated="" logsService={[Function LogService]} route={[Function ActivatedRoute]} searchResults={[Function Array]} @@ -32,15 +33,24 @@ exports[`InstructorStudentActivityLogsComponent should snap when page is still l owner or manager privileges - for the course. Please note that recent logs may be shown as the information is updated every - - 15 minutes - - . The earliest date you can search for is + for the course. The earliest date you can search for is 30 days before today. +

    + Please note that recent activity after + + + may + + NOT + + be shown as the information is updated in + + 15 minute + + intervals.

    owner or manager privileges - for the course. Please note that recent logs may be shown as the information is updated every - - 15 minutes - - . The earliest date you can search for is + for the course. The earliest date you can search for is 30 days before today. +

    + Please note that recent activity after + + + may + + NOT + + be shown as the information is updated in + + 15 minute + + intervals.

    @@ -654,6 +674,7 @@ exports[`InstructorStudentActivityLogsComponent should snap with default fields formModel={[Function Object]} isLoading={[Function Boolean]} isSearching="false" + lastUpdated="" logsService={[Function LogService]} route={[Function ActivatedRoute]} searchResults={[Function Array]} @@ -670,15 +691,24 @@ exports[`InstructorStudentActivityLogsComponent should snap with default fields owner or manager privileges - for the course. Please note that recent logs may be shown as the information is updated every - - 15 minutes - - . The earliest date you can search for is + for the course. The earliest date you can search for is 30 days before today. +

    + Please note that recent activity after + + + may + + NOT + + be shown as the information is updated in + + 15 minute + + intervals.

    owner or manager privileges - for the course. Please note that recent logs may be shown as the information is updated every - - 15 minutes - - . The earliest date you can search for is + for the course. The earliest date you can search for is 30 days before today. +

    + Please note that recent activity after + + + may + + NOT + + be shown as the information is updated in + + 15 minute + + intervals.

    diff --git a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.html b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.html index 7fd27b60330..726181927c9 100644 --- a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.html +++ b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.html @@ -1,5 +1,6 @@

    Student Activity Logs For {{course.courseName}}

    -

    This page allows you to find when your students have accessed or submitted a particular feedback session or view a session results. Note that you can only view student logs if you have owner or manager privileges for the course. Please note that recent logs may be shown as the information is updated every {{ this.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL }} minutes. The earliest date you can search for is {{this.LOGS_RETENTION_PERIOD}} days before today.

    +

    This page allows you to find when your students have accessed or submitted a particular feedback session or view a session results. Note that you can only view student logs if you have owner or manager privileges for the course. The earliest date you can search for is {{this.LOGS_RETENTION_PERIOD}} days before today.

    +

    Please note that recent activity after {{ this.lastUpdated }} may NOT be shown as the information is updated in {{ this.STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL }} minute intervals.

    diff --git a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts index e7301844772..f8906b65d1d 100644 --- a/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts +++ b/src/web/app/pages-instructor/instructor-student-activity-logs/instructor-student-activity-logs.component.ts @@ -118,6 +118,7 @@ export class InstructorStudentActivityLogsComponent implements OnInit { searchResults: FeedbackSessionLogModel[] = []; isLoading: boolean = true; isSearching: boolean = false; + lastUpdated: string = ''; constructor(private route: ActivatedRoute, private courseService: CourseService, @@ -249,6 +250,7 @@ export class InstructorStudentActivityLogsComponent implements OnInit { .subscribe({ next: (course: Course) => { this.course = course; + this.setLastUpdated(); }, error: (e: ErrorMessageOutput) => this.statusMessageService.showErrorToast(e.error.message), }); @@ -289,15 +291,6 @@ export class InstructorStudentActivityLogsComponent implements OnInit { private toFeedbackSessionLogModel(log: FeedbackSessionLog): FeedbackSessionLogModel { const fsName = log.feedbackSessionData.feedbackSessionName; - const fs = this.feedbackSessions.get(fsName); - let publishedTime = 0; - - if (fs && fs.resultVisibleFromTimestamp) { - publishedTime = fs.resultVisibleFromTimestamp; - } - - const publishedDate: Date = new Date(publishedTime); - const notViewedSince = publishedDate.getTime(); return { feedbackSessionName: fsName, @@ -360,9 +353,7 @@ export class InstructorStudentActivityLogsComponent implements OnInit { { value: student.teamName }]); }); } else { - const timestamp: string = this.timezoneService.formatToString( - notViewedSince, log.feedbackSessionData.timeZone, this.LOGS_DATE_TIME_FORMAT); - status = `Not ${this.logTypeToActivityDisplay(this.formModel.logType)} since ${timestamp}`; + status = `Not ${this.logTypeToActivityDisplay(this.formModel.logType)} within the query range`; dataStyle += 'color:red;'; rows.push([ { @@ -388,6 +379,7 @@ export class InstructorStudentActivityLogsComponent implements OnInit { return 'viewed the submission page'; case 'SUBMISSION': return 'submitted responses'; + case 'VIEW_RESULT': case 'VIEW RESULT': return 'viewed the session results'; case 'ACCESS,SUBMISSION': @@ -421,4 +413,14 @@ export class InstructorStudentActivityLogsComponent implements OnInit { }; } + private setLastUpdated(): void { + // 15 mins buffer to allow cron job to finish adding all logs to the database + const CRON_JOB_BUFFER = 15; + const now: Date = new Date(); + const minsPastQuarter = now.getMinutes() % 15; + + const lastUpdated = now.getTime() - ((CRON_JOB_BUFFER + minsPastQuarter) * Milliseconds.IN_ONE_MINUTE); + + this.lastUpdated = this.timezoneService.formatToString(lastUpdated, this.course.timeZone, 'DD MMM YYYY, hh:mm A'); + } } From 6fe8c8d2af0a26b01a6a17eb61b64807c49a2089 Mon Sep 17 00:00:00 2001 From: eraysozer20 <148395841+eraysozer20@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:15:54 +0200 Subject: [PATCH 72/95] Fixed moderate response bug (#12964) Added a propagation stop to the moderate response button Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../grq-rgq-view-responses.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html b/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html index 936b9a448cd..7642ce87324 100644 --- a/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html +++ b/src/web/app/components/question-responses/grq-rgq-view-responses/grq-rgq-view-responses.component.html @@ -50,7 +50,7 @@
    + [session]="session" [isGiverInstructor]="userIsInstructor[userInfo]" btnStyle="PRIMARY" (click)="$event.stopPropagation()">
    From 8ec6989cdaa63e679c0131c2829baff45cd6ac22 Mon Sep 17 00:00:00 2001 From: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:23:35 +0800 Subject: [PATCH 73/95] [#12048] Migrate committers (#13052) * Add committers * Remove contributors --- src/web/data/developers.json | 60 ++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/web/data/developers.json b/src/web/data/developers.json index 842e83e1356..0800a8c25cf 100644 --- a/src/web/data/developers.json +++ b/src/web/data/developers.json @@ -454,11 +454,6 @@ "name": "Chin Yong Wei", "username": "vertigogarden" }, - { - "multiple": true, - "name": "Ching Ming Yuan", - "username": "mingyuanc" - }, { "multiple": true, "name": "Chloe Stapleton", @@ -613,11 +608,6 @@ "name": "Divya Pandilla", "username": "pandilladivya" }, - { - "multiple": true, - "name": "Dominic Berzin", - "username": "domoberzin" - }, { "name": "Dominik Leszczenko", "username": "k4iz3n1994" @@ -2258,11 +2248,6 @@ "name": "Truong Hoang Phuoc", "username": "hoangphuoc25" }, - { - "multiple": true, - "name": "Tye Jia Jun, Marques", - "username": "marquestye" - }, { "username": "u6867511" }, @@ -2368,11 +2353,6 @@ "name": "Wu Xiao Xiao", "username": "a0129998" }, - { - "multiple": true, - "name": "Xenos Fiorenzo Anong", - "username": "xenosf" - }, { "multiple": true, "name": "Xia Lu" @@ -2426,11 +2406,6 @@ "multiple": true, "name": "Yen Zi Shyun" }, - { - "multiple": true, - "name": "Yeo Di Sheng", - "username": "dishenggg" - }, { "name": "Yi Chen", "username": "g3chenyigmailcom" @@ -2507,11 +2482,6 @@ "name": "Zhu Yilun", "username": "yilun-zhu" }, - { - "multiple": true, - "name": "Zhu Yuanxi", - "username": "yuanxi1" - }, { "multiple": true, "name": "Zong Xun", @@ -2519,6 +2489,36 @@ } ], "committers": [ + { + "name": "Ching Ming Yuan", + "username": "mingyuanc", + "startPeriod": "Jan 2024" + }, + { + "name": "Dominic Berzin", + "username": "domoberzin", + "startPeriod": "Jan 2024" + }, + { + "name": "Tye Jia Jun, Marques", + "username": "marquestye", + "startPeriod": "Jan 2024" + }, + { + "name": "Xenos Fiorenzo Anong", + "username": "xenosf", + "startPeriod": "Jan 2024" + }, + { + "name": "Yeo Di Sheng", + "username": "dishenggg", + "startPeriod": "Jan 2024" + }, + { + "name": "Zhu Yuanxi", + "username": "yuanxi1", + "startPeriod": "Jan 2024" + }, { "name": "Jason Qiu", "username": "jasonqiu212", From d241a7897fd611e7076fc346a1df431cbb07fde0 Mon Sep 17 00:00:00 2001 From: Cedric Ong Date: Thu, 18 Apr 2024 15:35:27 +0800 Subject: [PATCH 74/95] fix lint issues --- src/main/java/teammates/common/util/Const.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index 342d0d02a3a..dc9659f867b 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -44,7 +44,7 @@ public final class Const { public static final String ERROR_UPDATE_NON_EXISTENT = "Trying to update non-existent Entity: "; public static final String MISSING_RESPONSE_TEXT = "No Response"; - + public static final Duration STUDENT_ACTIVITY_LOGS_UPDATE_INTERVAL = Duration.ofMinutes(15); public static final Duration STUDENT_ACTIVITY_LOGS_FILTER_WINDOW = Duration.ofSeconds(2); @@ -128,13 +128,11 @@ public static class ParamsNames { public static final String IS_CREATING_ACCOUNT = "iscreatingaccount"; public static final String IS_INSTRUCTOR = "isinstructor"; - public static final String FEEDBACK_SESSION_ID = "fsid"; public static final String ACCOUNT_REQUEST_ID = "id"; public static final String ACCOUNT_REQUEST_STATUS = "status"; - public static final String FEEDBACK_SESSION_NAME = "fsname"; public static final String FEEDBACK_SESSION_STARTTIME = "starttime"; public static final String FEEDBACK_SESSION_ENDTIME = "endtime"; From 63b320969781943f6a495190c867f9c125cf37e5 Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:31:47 +0800 Subject: [PATCH 75/95] [#12048] Migrate InstructorStudentRecordsPageE2ETest (#13013) * migrate InstructorStudentRecordsPageE2ETest * Add InstructorStudentRecordsPageE2ETest to sql xml --------- Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../InstructorStudentRecordsPageE2ETest.java | 44 +++++++++ .../InstructorStudentRecordsPage.java | 5 + ...nstructorStudentRecordsPageE2ETestSql.json | 99 +++++++++++++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + 4 files changed, 149 insertions(+) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/InstructorStudentRecordsPageE2ETest.java create mode 100644 src/e2e/resources/data/InstructorStudentRecordsPageE2ETestSql.json diff --git a/src/e2e/java/teammates/e2e/cases/sql/InstructorStudentRecordsPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/InstructorStudentRecordsPageE2ETest.java new file mode 100644 index 00000000000..26fecac1b13 --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/InstructorStudentRecordsPageE2ETest.java @@ -0,0 +1,44 @@ +package teammates.e2e.cases.sql; + +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.InstructorStudentRecordsPage; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#INSTRUCTOR_STUDENT_RECORDS_PAGE}. + */ +public class InstructorStudentRecordsPageE2ETest extends BaseE2ETestCase { + + @Override + protected void prepareTestData() { + testData = removeAndRestoreDataBundle( + loadSqlDataBundle("/InstructorStudentRecordsPageE2ETestSql.json")); + } + + @Test + @Override + public void testAll() { + + ______TS("verify loaded data: student details"); + + Instructor instructor = testData.instructors.get("teammates.test.CS2104"); + Student student = testData.students.get("benny.c.tmms@ISR.CS2104"); + + String instructorId = instructor.getGoogleId(); + String courseId = instructor.getCourseId(); + String studentEmail = student.getEmail(); + + AppUrl recordsPageUrl = createFrontendUrl(Const.WebPageURIs.INSTRUCTOR_STUDENT_RECORDS_PAGE) + .withCourseId(courseId) + .withStudentEmail(studentEmail); + + InstructorStudentRecordsPage recordsPage = + loginToPage(recordsPageUrl, InstructorStudentRecordsPage.class, instructorId); + + recordsPage.verifyStudentDetails(student); + } +} diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java index d0c8a5e9920..b3fe750ff3b 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java @@ -6,6 +6,7 @@ import org.openqa.selenium.support.FindBy; import teammates.common.datatransfer.attributes.StudentAttributes; +import teammates.storage.sqlentity.Student; /** * Page Object Model for instructor student records page. @@ -33,4 +34,8 @@ public void verifyStudentDetails(StudentAttributes student) { verifyIsCorrectPage(student.getCourse(), student.getName()); } + public void verifyStudentDetails(Student student) { + verifyIsCorrectPage(student.getCourse().getId(), student.getName()); + } + } diff --git a/src/e2e/resources/data/InstructorStudentRecordsPageE2ETestSql.json b/src/e2e/resources/data/InstructorStudentRecordsPageE2ETestSql.json new file mode 100644 index 00000000000..0c5783361fe --- /dev/null +++ b/src/e2e/resources/data/InstructorStudentRecordsPageE2ETestSql.json @@ -0,0 +1,99 @@ +{ + "accounts": { + "teammates.test": { + "googleId": "tm.e2e.ISRecords.teammates.test", + "name": "Teammates Test", + "email": "teammates.test@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000001" + }, + "benny.c.tmms@ISR.CS2104": { + "googleId": "tm.e2e.ISRecords.benny.c.tmms", + "name": "Benny Charlés", + "email": "benny.c.tmms@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000002" + } + }, + "accountRequests": {}, + "courses": { + "CS2104": { + "id": "tm.e2e.ISRecords.CS2104", + "name": "Programming Language Concepts", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 1" + } + }, + "sections": { + "tm.e2e.ISRecords.CS2104-None": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "tm.e2e.ISRecords.CS2104" + }, + "name": "None" + } + }, + "teams": { + "tm.e2e.ISRecords.CS2104-None-Team1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + } + }, + "deadlineExtensions": {}, + "instructors": { + "teammates.test.CS2104": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "courseId": "tm.e2e.ISRecords.CS2104", + "course": { + "id": "tm.e2e.ISRecords.CS2104" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "teammates.test@gmail.tmt" + } + }, + "students": { + "benny.c.tmms@ISR.CS2104": { + "comments": "This student's name is Benny Charlés", + "id": "00000000-0000-4000-8000-000000000601", + "courseId": "tm.e2e.ISRecords.CS2104", + "course": { + "id": "tm.e2e.ISRecords.CS2104" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000002" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Benny Charlés", + "email": "benny.c.tmms@gmail.tmt" + } + }, + "feedbackSessions": {}, + "feedbackQuestions": {}, + "feedbackResponses": {}, + "feedbackResponseComments": {}, + "notifications": {}, + "readNotifications": {} +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index 42881b3a3e7..fb3f2597ed6 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -10,6 +10,7 @@ + From acc16f21711e3fe852fa5f9cb42e53cdb429b350 Mon Sep 17 00:00:00 2001 From: Wilson Kurniawan Date: Thu, 18 Apr 2024 19:53:50 +0800 Subject: [PATCH 76/95] [#12725] Update backend libraries versions, support Java 21 (#12885) * Update gradle version * Update libraries * Update code * Update actions versions * Add workflow for JDK 21 --- .github/workflows/axe.yml | 12 +-- .github/workflows/comment-goodfirstissue.yml | 2 +- .github/workflows/component.yml | 28 ++--- .github/workflows/dev-docs.yml | 10 +- .github/workflows/e2e-sql.yml | 14 +-- .github/workflows/e2e.yml | 13 ++- .github/workflows/jdk17.yml | 8 +- .github/workflows/jdk21.yml | 34 ++++++ .github/workflows/lnp.yml | 10 +- .github/workflows/pr.yml | 2 +- build.gradle | 95 +++++++++-------- docs/setting-up.md | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 35 ++++--- gradlew.bat | 21 ++-- .../client/connector/DatastoreClient.java | 4 +- .../teammates/client/scripts/sql/SeedDb.java | 5 +- .../scripts/sql/VerifyAccountAttributes.java | 2 +- .../client/scripts/statistics/FileStore.java | 2 +- .../DataStoreToSqlConverter.java | 98 ++++++++++-------- .../InstructorFeedbackEditPageAxeTest.java | 4 +- .../e2e/pageobjects/AdminAccountsPage.java | 4 +- .../pageobjects/AdminNotificationsPage.java | 2 +- .../e2e/pageobjects/AdminSearchPage.java | 6 +- .../e2e/pageobjects/AdminSessionsPage.java | 2 +- .../teammates/e2e/pageobjects/AppPage.java | 10 +- .../teammates/e2e/pageobjects/Browser.java | 3 +- .../CourseJoinConfirmationPage.java | 2 +- .../e2e/pageobjects/ErrorReportingModal.java | 2 +- .../e2e/pageobjects/FeedbackResultsPage.java | 10 +- .../e2e/pageobjects/FeedbackSubmitPage.java | 8 +- .../InstructorCourseDetailsPage.java | 2 +- .../pageobjects/InstructorCourseEditPage.java | 14 +-- .../InstructorCourseEnrollPage.java | 2 +- ...nstructorCourseStudentDetailsEditPage.java | 2 +- ...nstructorCourseStudentDetailsViewPage.java | 2 +- .../InstructorFeedbackEditPage.java | 6 +- .../InstructorFeedbackResultsPage.java | 4 +- .../InstructorFeedbackSessionsPage.java | 2 +- .../e2e/pageobjects/InstructorHomePage.java | 2 +- .../e2e/pageobjects/InstructorSearchPage.java | 6 +- ...tructorSessionIndividualExtensionPage.java | 2 +- .../InstructorStudentListPage.java | 7 +- .../InstructorStudentRecordsPage.java | 2 +- .../pageobjects/StudentCourseDetailsPage.java | 2 +- .../e2e/pageobjects/StudentHomePage.java | 2 +- .../pageobjects/UserNotificationsPage.java | 6 +- .../e2e/util/TestDataValidityTest.java | 2 +- .../teammates/e2e/util/TestProperties.java | 1 + .../it/sqllogic/core/DataBundleLogicIT.java | 2 +- .../sqlapi/FeedbackResponseCommentsDbIT.java | 2 +- .../teammates/it/test/TestProperties.java | 1 + .../teammates/it/ui/webapi/BaseActionIT.java | 2 +- .../it/ui/webapi/CreateAccountActionIT.java | 4 +- .../teammates/lnp/cases/BaseLNPTestCase.java | 3 +- .../cases/FeedbackQuestionUpdateLNPTest.java | 4 +- .../cases/FeedbackSessionSubmitLNPTest.java | 4 +- .../lnp/cases/FeedbackSessionViewLNPTest.java | 4 +- .../cases/InstructorCourseUpdateLNPTest.java | 4 +- .../cases/InstructorSessionResultLNPTest.java | 4 +- ...structorStudentCascadingUpdateLNPTest.java | 4 +- .../InstructorStudentEnrollmentLNPTest.java | 4 +- .../lnp/cases/InstructorUpdateLNPTest.java | 4 +- .../lnp/cases/StudentEmailUpdateLNPTest.java | 4 +- .../cases/StudentSectionUpdateLNPTest.java | 4 +- .../lnp/cases/StudentTeamUpdateLNPTest.java | 4 +- .../teammates/lnp/util/LNPSpecification.java | 2 +- .../teammates/lnp/util/TestProperties.java | 1 + src/main/appengine/app.template.yaml | 8 +- src/main/appengine/cron.yaml | 2 +- src/main/appengine/queue.yaml | 1 - src/main/docker/Dockerfile | 2 +- .../datatransfer/AttributesDeletionQuery.java | 2 +- .../common/datatransfer/CourseRoster.java | 2 +- .../common/datatransfer/SqlCourseRoster.java | 2 +- .../common/datatransfer/TeamEvalResult.java | 2 +- .../attributes/AccountAttributes.java | 6 +- .../attributes/AccountRequestAttributes.java | 6 +- .../attributes/CourseAttributes.java | 6 +- .../DeadlineExtensionAttributes.java | 6 +- .../attributes/EntityAttributes.java | 2 +- .../FeedbackQuestionAttributes.java | 6 +- .../FeedbackResponseAttributes.java | 6 +- .../FeedbackResponseCommentAttributes.java | 6 +- .../attributes/FeedbackSessionAttributes.java | 6 +- .../attributes/InstructorAttributes.java | 10 +- .../attributes/NotificationAttributes.java | 6 +- .../attributes/StudentAttributes.java | 6 +- .../attributes/UsageStatisticsAttributes.java | 2 +- .../logs/EmailSentLogDetails.java | 2 +- .../logs/ExceptionLogDetails.java | 2 +- .../logs/FeedbackSessionAuditLogDetails.java | 2 +- .../datatransfer/logs/GeneralLogEntry.java | 2 +- .../common/datatransfer/logs/LogDetails.java | 2 +- .../datatransfer/logs/QueryLogsParams.java | 2 +- .../datatransfer/logs/RequestLogDetails.java | 2 +- .../FeedbackConstantSumQuestionDetails.java | 4 +- .../FeedbackTextQuestionDetails.java | 2 +- .../teammates/common/util/HibernateUtil.java | 38 +++---- .../common/util/HttpRequestHelper.java | 4 +- .../java/teammates/common/util/JsonUtils.java | 24 ++--- .../java/teammates/common/util/Logger.java | 2 +- .../teammates/common/util/RequestTracer.java | 2 +- src/main/java/teammates/logic/api/Logic.java | 2 +- .../java/teammates/logic/api/TaskQueuer.java | 4 +- .../logic/core/FeedbackQuestionsLogic.java | 2 +- .../core/FeedbackResponseCommentsLogic.java | 2 +- .../logic/core/FeedbackResponsesLogic.java | 4 +- .../teammates/logic/core/LogicStarter.java | 4 +- .../external/GoogleCloudLoggingService.java | 2 +- .../logic/external/MailgunService.java | 2 +- .../logic/external/MailjetService.java | 2 +- .../logic/external/SendgridService.java | 2 +- .../java/teammates/sqllogic/api/Logic.java | 2 +- .../sqllogic/core/FeedbackQuestionsLogic.java | 2 +- .../core/FeedbackResponseCommentsLogic.java | 2 +- .../sqllogic/core/FeedbackResponsesLogic.java | 2 +- .../teammates/sqllogic/core/LogicStarter.java | 4 +- .../storage/api/FeedbackQuestionsDb.java | 4 +- .../java/teammates/storage/api/OfyHelper.java | 6 +- .../storage/entity/FeedbackSession.java | 3 + .../storage/search/SearchManagerStarter.java | 4 +- .../storage/sqlapi/AccountRequestsDb.java | 10 +- .../teammates/storage/sqlapi/AccountsDb.java | 8 +- .../teammates/storage/sqlapi/CoursesDb.java | 14 +-- .../storage/sqlapi/DeadlineExtensionsDb.java | 12 +-- .../storage/sqlapi/FeedbackQuestionsDb.java | 10 +- .../sqlapi/FeedbackResponseCommentsDb.java | 10 +- .../storage/sqlapi/FeedbackResponsesDb.java | 16 +-- .../storage/sqlapi/FeedbackSessionLogsDb.java | 10 +- .../storage/sqlapi/FeedbackSessionsDb.java | 10 +- .../storage/sqlapi/NotificationsDb.java | 10 +- .../storage/sqlapi/UsageStatisticsDb.java | 6 +- .../teammates/storage/sqlapi/UsersDb.java | 12 +-- .../teammates/storage/sqlentity/Account.java | 14 +-- .../storage/sqlentity/AccountRequest.java | 16 +-- .../storage/sqlentity/BaseEntity.java | 10 +- .../teammates/storage/sqlentity/Course.java | 14 +-- .../storage/sqlentity/DeadlineExtension.java | 12 +-- .../storage/sqlentity/FeedbackQuestion.java | 28 ++--- .../storage/sqlentity/FeedbackResponse.java | 24 ++--- .../sqlentity/FeedbackResponseComment.java | 16 +-- .../storage/sqlentity/FeedbackSession.java | 18 ++-- .../storage/sqlentity/FeedbackSessionLog.java | 14 +-- .../storage/sqlentity/Instructor.java | 14 +-- .../storage/sqlentity/Notification.java | 18 ++-- .../teammates/storage/sqlentity/Section.java | 14 +-- .../teammates/storage/sqlentity/Student.java | 8 +- .../teammates/storage/sqlentity/Team.java | 8 +- .../teammates/storage/sqlentity/User.java | 10 +- .../FeedbackConstantSumQuestion.java | 10 +- .../FeedbackContributionQuestion.java | 10 +- .../questions/FeedbackMcqQuestion.java | 10 +- .../questions/FeedbackMsqQuestion.java | 10 +- .../FeedbackNumericalScaleQuestion.java | 10 +- .../FeedbackRankOptionsQuestion.java | 10 +- .../FeedbackRankRecipientsQuestion.java | 10 +- .../questions/FeedbackRubricQuestion.java | 10 +- .../questions/FeedbackTextQuestion.java | 10 +- .../FeedbackConstantSumResponse.java | 10 +- .../FeedbackContributionResponse.java | 10 +- .../responses/FeedbackMcqResponse.java | 10 +- .../responses/FeedbackMsqResponse.java | 10 +- .../FeedbackNumericalScaleResponse.java | 10 +- .../FeedbackRankOptionsResponse.java | 10 +- .../FeedbackRankRecipientsResponse.java | 10 +- .../responses/FeedbackRubricResponse.java | 10 +- .../responses/FeedbackTextResponse.java | 10 +- .../sqlsearch/SearchManagerStarter.java | 4 +- .../ui/output/AccountRequestData.java | 2 +- .../java/teammates/ui/output/ApiOutput.java | 2 +- .../java/teammates/ui/output/AuthInfo.java | 2 +- .../java/teammates/ui/output/CourseData.java | 2 +- .../output/FeedbackQuestionRecipientData.java | 2 +- .../ui/output/FeedbackResponseData.java | 2 +- .../ui/output/FeedbackSessionData.java | 2 +- .../teammates/ui/output/HasResponsesData.java | 2 +- .../teammates/ui/output/InstructorData.java | 2 +- .../ui/output/SessionResultsData.java | 8 +- .../java/teammates/ui/output/StudentData.java | 2 +- .../ui/request/AccountCreateRequest.java | 2 +- .../AccountRequestRejectionRequest.java | 2 +- .../request/AccountRequestUpdateRequest.java | 2 +- .../request/FeedbackSessionBasicRequest.java | 2 +- .../request/FeedbackSessionCreateRequest.java | 2 +- .../ui/request/InstructorCreateRequest.java | 2 +- .../teammates/ui/servlets/AuthServlet.java | 6 +- .../ui/servlets/DevServerLoginServlet.java | 6 +- .../ui/servlets/HealthCheckServlet.java | 6 +- .../ui/servlets/HibernateContextListener.java | 4 +- .../ui/servlets/LegacyUrlMapper.java | 6 +- .../teammates/ui/servlets/LoginServlet.java | 4 +- .../teammates/ui/servlets/LogoutServlet.java | 8 +- .../ui/servlets/OAuth2CallbackServlet.java | 8 +- .../ui/servlets/ObjectifyFilter.java | 30 ++++++ .../ui/servlets/OriginCheckFilter.java | 27 ++--- .../ui/servlets/RequestTraceFilter.java | 27 ++--- .../teammates/ui/servlets/WebApiServlet.java | 6 +- .../teammates/ui/servlets/WebPageServlet.java | 8 +- .../ui/servlets/WebSecurityHeaderFilter.java | 23 ++-- src/main/java/teammates/ui/webapi/Action.java | 2 +- .../teammates/ui/webapi/ActionFactory.java | 4 +- .../teammates/ui/webapi/ActionResult.java | 2 +- .../webapi/BasicFeedbackSubmissionAction.java | 2 + .../java/teammates/ui/webapi/GateKeeper.java | 6 +- .../ui/webapi/GetAuthInfoAction.java | 2 +- .../teammates/ui/webapi/GetCoursesAction.java | 4 +- .../ui/webapi/GetFeedbackSessionsAction.java | 22 ++-- .../ui/webapi/GetHasResponsesAction.java | 6 +- .../ui/webapi/GetStudentsAction.java | 4 +- .../java/teammates/ui/webapi/JsonResult.java | 4 +- .../ui/webapi/SearchStudentsAction.java | 12 +-- .../ui/webapi/UpdateAccountRequestAction.java | 4 +- src/main/resources/logsForLocalDev.json | 44 ++++---- src/main/webapp/WEB-INF/web.xml | 2 +- .../architecture/ArchitectureTest.java | 5 +- .../datatransfer/ErrorLogEntryTest.java | 12 +-- .../teammates/common/util/JsonUtilsTest.java | 3 +- .../logic/core/NotificationsLogicTest.java | 1 + .../external/GoogleRecaptchaServiceTest.java | 2 +- .../core/FeedbackQuestionsLogicTest.java | 10 +- .../sqlui/webapi/BaseActionTest.java | 2 +- .../UpdateFeedbackSessionLogsActionTest.java | 2 +- .../storage/api/NotificationsDbTest.java | 1 + .../java/teammates/test/AssertHelper.java | 4 +- .../java/teammates/test/BaseTestCase.java | 92 +++++----------- .../java/teammates/test/EmailChecker.java | 2 +- .../java/teammates/test/MockFilterChain.java | 6 +- .../test/MockHttpServletRequest.java | 28 ++--- .../test/MockHttpServletResponse.java | 6 +- .../java/teammates/test/TestProperties.java | 1 + .../teammates/ui/webapi/BaseActionTest.java | 2 +- .../ui/webapi/GetAuthInfoActionTest.java | 2 +- .../teammates/ui/webapi/JsonResultTest.java | 2 +- static-analysis/teammates-checkstyle.xml | 4 +- static-analysis/teammates-pmd.xml | 19 ++-- 237 files changed, 978 insertions(+), 928 deletions(-) create mode 100644 .github/workflows/jdk21.yml create mode 100644 src/main/java/teammates/ui/servlets/ObjectifyFilter.java diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml index 771dd8a3edc..8507df2a98a 100644 --- a/.github/workflows/axe.yml +++ b/.github/workflows/axe.yml @@ -16,17 +16,17 @@ jobs: matrix: browser: [firefox] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: temurin + java-version: 11 - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/comment-goodfirstissue.yml b/.github/workflows/comment-goodfirstissue.yml index 97c001be75f..b5c78894413 100644 --- a/.github/workflows/comment-goodfirstissue.yml +++ b/.github/workflows/comment-goodfirstissue.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Add comment - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml index 11ecfb7357f..77a246454d5 100644 --- a/.github/workflows/component.yml +++ b/.github/workflows/component.yml @@ -19,19 +19,19 @@ jobs: os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: '0' - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: temurin + java-version: 11 - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -40,7 +40,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Cache eslint - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./.eslintcache @@ -48,7 +48,7 @@ jobs: restore-keys: | ${{ runner.os }}-eslint- - name: Cache stylelint - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./.stylelintcache @@ -68,17 +68,17 @@ jobs: os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: temurin + java-version: 11 - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/dev-docs.yml b/.github/workflows/dev-docs.yml index 07d2416241a..61e9954ea54 100644 --- a/.github/workflows/dev-docs.yml +++ b/.github/workflows/dev-docs.yml @@ -17,14 +17,14 @@ jobs: shell: bash working-directory: docs steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'temurin' + java-version: 11 + distribution: temurin - name: Install Graphviz run: sudo apt install graphviz - run: npm ci diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml index 0a67cbac52d..c1d70b8b1f5 100644 --- a/.github/workflows/e2e-sql.yml +++ b/.github/workflows/e2e-sql.yml @@ -20,17 +20,17 @@ jobs: browser: [firefox] tests: [stable, unstable] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: temurin + java-version: 11 - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -53,4 +53,4 @@ jobs: ./gradlew serverRun & ./wait-for-server.sh - name: Start Tests - run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql \ No newline at end of file + run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 52ab76019ed..565253ba2f4 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -20,17 +20,17 @@ jobs: browser: [firefox] tests: [stable, unstable] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: temurin + java-version: 11 - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -54,4 +54,3 @@ jobs: ./wait-for-server.sh - name: Start Tests run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTests - \ No newline at end of file diff --git a/.github/workflows/jdk17.yml b/.github/workflows/jdk17.yml index 29ab59bb561..7b50447b7aa 100644 --- a/.github/workflows/jdk17.yml +++ b/.github/workflows/jdk17.yml @@ -9,9 +9,9 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -20,9 +20,9 @@ jobs: component-testing: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 diff --git a/.github/workflows/jdk21.yml b/.github/workflows/jdk21.yml new file mode 100644 index 00000000000..cb551fc44fa --- /dev/null +++ b/.github/workflows/jdk21.yml @@ -0,0 +1,34 @@ +name: Component Tests (JDK 21) + +on: + push: + branches: + - master + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 + - name: Run Backend Linting + run: ./gradlew lint --continue + component-testing: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 + - name: Update Property File + run: mv src/test/resources/test.ci-ubuntu-latest.properties src/test/resources/test.properties + - name: Run Solr search service + run: docker-compose run -d -p 8983:8983 solr + - name: Run Backend Tests + run: ./gradlew createConfigs componentTests diff --git a/.github/workflows/lnp.yml b/.github/workflows/lnp.yml index 2ff33dda920..595ad697efc 100644 --- a/.github/workflows/lnp.yml +++ b/.github/workflows/lnp.yml @@ -11,14 +11,14 @@ jobs: LnP-testing: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: '11' + distribution: temurin + java-version: 11 - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 03f11d9b6d3..7885aa57cd8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -13,7 +13,7 @@ jobs: permissions: pull-requests: write steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: script: | const pr = await github.rest.pulls.get({ diff --git a/build.gradle b/build.gradle index f448d003a8f..c31de8ad72d 100644 --- a/build.gradle +++ b/build.gradle @@ -8,10 +8,10 @@ apply plugin: "jacoco" apply plugin: "cz.habarta.typescript-generator" apply plugin: "org.liquibase.gradle" -def checkstyleVersion = "10.3.2" -def pmdVersion = "6.48.0" -def spotbugsVersion = "4.7.1" -def jacocoVersion = "0.8.8" +def checkstyleVersion = "10.15.0" +def pmdVersion = "7.0.0" +def spotbugsVersion = "4.8.4" +def jacocoVersion = "0.8.12" buildscript { repositories { @@ -21,13 +21,13 @@ buildscript { } } dependencies { - classpath "com.google.cloud.tools:appengine-gradle-plugin:2.4.4" - classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.9" - classpath("cz.habarta.typescript-generator:typescript-generator-gradle-plugin:2.36.1070") { + classpath "com.google.cloud.tools:appengine-gradle-plugin:2.8.0" + classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.12" + classpath("cz.habarta.typescript-generator:typescript-generator-gradle-plugin:3.2.1263") { exclude group: "org.gradle" } - classpath "com.google.guava:guava:31.1-jre" - classpath "org.liquibase:liquibase-gradle-plugin:2.1.1" + classpath "com.google.guava:guava:33.1.0-jre" + classpath "org.liquibase:liquibase-gradle-plugin:2.2.1" } } @@ -37,12 +37,19 @@ configurations { liquibaseRuntime.extendsFrom testImplementation } +// See https://github.com/checkstyle/checkstyle/issues/14211#issuecomment-1884129948 +configurations.all { + resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") { + select("com.google.guava:guava:0") + } +} + repositories { mavenCentral() } def objectify = "com.googlecode.objectify:objectify:6.0.7" -def testng = "org.testng:testng:7.6.1" +def testng = "org.testng:testng:7.10.1" dependencies { staticAnalysis("com.puppycrawl.tools:checkstyle:${checkstyleVersion}") @@ -52,58 +59,56 @@ dependencies { annotationProcessor(objectify) - implementation("com.google.auth:google-auth-library-oauth2-http:1.8.1") - implementation(platform("com.google.cloud:google-cloud-bom:0.176.0")) + implementation("com.google.auth:google-auth-library-oauth2-http:1.23.0") + implementation(platform("com.google.cloud:google-cloud-bom:0.218.0")) implementation("com.google.cloud:google-cloud-datastore") implementation("com.google.cloud:google-cloud-tasks") implementation("com.google.cloud:google-cloud-logging") - implementation("com.google.code.gson:gson:2.9.0") - implementation("com.google.firebase:firebase-admin:9.1.1") - implementation("com.google.guava:guava:31.1-jre") + implementation("com.google.code.gson:gson:2.10.1") + implementation("com.google.firebase:firebase-admin:9.2.0") + implementation("com.google.guava:guava:33.1.0-jre") implementation(objectify) - implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1") + implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1") implementation("com.helger:ph-commons:9.5.5") // necessary to add SpotBugs suppression - implementation("com.mailjet:mailjet-client:5.2.0") - implementation("com.sendgrid:sendgrid-java:4.9.3") + implementation("com.mailjet:mailjet-client:5.2.5") + implementation("com.sendgrid:sendgrid-java:4.10.2") implementation("com.sun.jersey:jersey-client:1.19.4") implementation("com.sun.jersey:jersey-core:1.19.4") implementation("com.sun.jersey.contribs:jersey-multipart:1.19.4") - implementation("org.apache.solr:solr-solrj:8.11.1") - implementation(platform("org.eclipse.jetty:jetty-bom:10.0.13")) + implementation("org.apache.solr:solr-solrj:8.11.3") + implementation(platform("org.eclipse.jetty:jetty-bom:11.0.20")) implementation("org.eclipse.jetty:jetty-slf4j-impl") implementation("org.eclipse.jetty:jetty-server") implementation("org.eclipse.jetty:jetty-webapp") implementation("org.eclipse.jetty:jetty-annotations") - implementation("org.jsoup:jsoup:1.15.2") - implementation("org.hibernate.orm:hibernate-core:6.1.6.Final") - implementation("org.postgresql:postgresql:42.7.2") - implementation("org.hibernate:hibernate-hikaricp:6.1.6.Final") + implementation("org.jsoup:jsoup:1.17.2") + implementation("org.hibernate.orm:hibernate-core:6.4.4.Final") + implementation("org.postgresql:postgresql:42.7.3") + implementation("org.hibernate:hibernate-hikaricp:6.4.4.Final") testAnnotationProcessor(testng) testImplementation("com.tngtech.archunit:archunit:0.11.0") - testImplementation("junit:junit:4.13.2") - testImplementation("org.seleniumhq.selenium:selenium-java:4.3.0") - testImplementation("com.deque.html.axe-core:selenium:4.6.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") + testImplementation("org.seleniumhq.selenium:selenium-java:4.19.1") + testImplementation("com.deque.html.axe-core:selenium:4.9.0") testImplementation(testng) - testImplementation("org.testcontainers:postgresql:1.17.6") - testImplementation("org.liquibase:liquibase-core:4.19.0") - testImplementation("org.mockito:mockito-core:5.1.1") + testImplementation("org.testcontainers:postgresql:1.19.7") + testImplementation("org.liquibase:liquibase-core:4.27.0") + testImplementation("org.mockito:mockito-core:5.11.0") // For supporting authorization code flow locally - testImplementation("com.google.oauth-client:google-oauth-client-jetty:1.34.1") + testImplementation("com.google.oauth-client:google-oauth-client-jetty:1.35.0") // For using Gmail API - testImplementation("com.google.apis:google-api-services-gmail:v1-rev20220404-1.32.1") + testImplementation("com.google.apis:google-api-services-gmail:v1-rev20231218-2.0.0") // For using JMeter APIs - testImplementation("org.apache.jmeter:ApacheJMeter_core:5.5") { + testImplementation("org.apache.jmeter:ApacheJMeter_core:5.6.2") { exclude group: "org.apache.jmeter", module: "bom" } - testImplementation("org.apache.jmeter:ApacheJMeter_http:5.5") { + testImplementation("org.apache.jmeter:ApacheJMeter_http:5.6.2") { exclude group: "org.apache.jmeter", module: "bom" } - liquibaseRuntime("org.liquibase:liquibase-core:4.19.0") - liquibaseRuntime("info.picocli:picocli:4.7.1") - liquibaseRuntime("org.postgresql:postgresql:42.7.2") + liquibaseRuntime("info.picocli:picocli:4.7.5") liquibaseRuntime(sourceSets.main.output) } @@ -173,7 +178,7 @@ liquibase { tasks.withType(cz.habarta.typescript.generator.gradle.GenerateTask) { jsonLibrary = "jackson2" optionalAnnotations = [ - "javax.annotation.Nullable" + "jakarta.annotation.Nullable" ] outputFileType = "implementationFile" outputKind = "module" @@ -414,16 +419,16 @@ pmd { } spotbugs { - reportLevel = "low" + reportLevel = com.github.spotbugs.snom.Confidence.valueOf("LOW") toolVersion = spotbugsVersion includeFilter = file("$rootProject.projectDir/static-analysis/teammates-spotbugs.xml") } tasks.withType(com.github.spotbugs.snom.SpotBugsTask) { reports { - xml.enabled = false - html.enabled = false - text.enabled = true + xml.required = false + html.required = false + text.required = true } } @@ -634,6 +639,8 @@ task e2eTests { afterTest afterTestClosure if (isFirstTry) { afterSuite checkTestNgFailureClosure + } else { + mustRunAfter "e2eTestTry${id - 1}" } onlyIf { isFirstTry || file("${buildDir}/reports/${outputFileName}${id - 1}/testng-failed.xml").exists() @@ -671,6 +678,8 @@ task e2eTestsSql { afterTest afterTestClosure if (isFirstTry) { afterSuite checkTestNgFailureClosure + } else { + mustRunAfter "e2eSqlTestTry${id - 1}" } onlyIf { isFirstTry || file("${buildDir}/reports/${outputFileName}${id - 1}/testng-failed.xml").exists() @@ -703,6 +712,8 @@ task axeTests { afterTest afterTestClosure if (isFirstTry) { afterSuite checkTestNgFailureClosure + } else { + mustRunAfter "axeTestTry${id - 1}" } onlyIf { isFirstTry || file("${buildDir}/reports/axe-test-try-${id - 1}/testng-failed.xml").exists() diff --git a/docs/setting-up.md b/docs/setting-up.md index 8c196b53220..789fd77db02 100644 --- a/docs/setting-up.md +++ b/docs/setting-up.md @@ -45,7 +45,7 @@ More information can be found at [this documentation](https://help.github.com/ar These tools are necessary regardless of whether you are developing front-end or back-end: 1. Install Java JDK 11. - * Alternatively, it is possible to use JDK 17, as long as newer language features are not used. + * Alternatively, it is possible to use JDK 17 or JDK 21, as long as newer language features are not used. If you want to develop front-end, you need to install the following: diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
    NnX)EH+Nua)3Y(c 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 /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index f127cfd49d4..25da30dbdee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/client/java/teammates/client/connector/DatastoreClient.java b/src/client/java/teammates/client/connector/DatastoreClient.java index 991674b83a7..479458aab34 100644 --- a/src/client/java/teammates/client/connector/DatastoreClient.java +++ b/src/client/java/teammates/client/connector/DatastoreClient.java @@ -1,5 +1,6 @@ package teammates.client.connector; +import com.google.cloud.NoCredentials; import com.google.cloud.datastore.DatastoreOptions; import com.googlecode.objectify.Objectify; import com.googlecode.objectify.ObjectifyFactory; @@ -39,11 +40,12 @@ protected void doOperationRemotely() { DatastoreOptions.Builder builder = DatastoreOptions.newBuilder().setProjectId(Config.APP_ID); if (ClientProperties.isTargetUrlDevServer()) { builder.setHost(ClientProperties.TARGET_URL); + builder.setCredentials(NoCredentials.getInstance()); } ObjectifyService.init(new ObjectifyFactory(builder.build().getService())); OfyHelper.registerEntityClasses(); - try (Closeable objectifySession = ObjectifyService.begin()) { + try (Closeable ignored = ObjectifyService.begin()) { LogicStarter.initializeDependencies(); doOperation(); } diff --git a/src/client/java/teammates/client/scripts/sql/SeedDb.java b/src/client/java/teammates/client/scripts/sql/SeedDb.java index 40185c120de..acfc4ad185c 100644 --- a/src/client/java/teammates/client/scripts/sql/SeedDb.java +++ b/src/client/java/teammates/client/scripts/sql/SeedDb.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; @@ -109,8 +110,8 @@ protected void persistAdditionalData() { String[] args = {}; - Set notificationsUuidSeen = new HashSet(); - ArrayList notificationUuids = new ArrayList<>(); + Set notificationsUuidSeen = new HashSet<>(); + List notificationUuids = new ArrayList<>(); Map notificationEndTimes = new HashMap<>(); Random rand = new Random(); diff --git a/src/client/java/teammates/client/scripts/sql/VerifyAccountAttributes.java b/src/client/java/teammates/client/scripts/sql/VerifyAccountAttributes.java index b53f684640c..c978d56be6a 100644 --- a/src/client/java/teammates/client/scripts/sql/VerifyAccountAttributes.java +++ b/src/client/java/teammates/client/scripts/sql/VerifyAccountAttributes.java @@ -92,7 +92,7 @@ public boolean equals(teammates.storage.sqlentity.Account sqlEntity, Account dat // Map datastoreReadNotifications = datastoreEntity.getReadNotifications(); // List sqlReadNotifications = sqlEntity.getReadNotifications(); - // List datastoreEndTimes = new ArrayList(datastoreReadNotifications.values()); + // List datastoreEndTimes = new ArrayList<>(datastoreReadNotifications.values()); // Collections.sort(datastoreEndTimes); // List sqlEndTimes = new ArrayList<>(); diff --git a/src/client/java/teammates/client/scripts/statistics/FileStore.java b/src/client/java/teammates/client/scripts/statistics/FileStore.java index 66dd6018123..7a45056f8b0 100644 --- a/src/client/java/teammates/client/scripts/statistics/FileStore.java +++ b/src/client/java/teammates/client/scripts/statistics/FileStore.java @@ -135,7 +135,7 @@ private static Gson getSerializer() { /** * An adapter for Gson to serialize {@link Instant} type. */ - private static class InstantAdapter implements JsonSerializer, JsonDeserializer { + private static final class InstantAdapter implements JsonSerializer, JsonDeserializer { @Override public JsonElement serialize(Instant instant, Type type, JsonSerializationContext context) { diff --git a/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java b/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java index 8b899504833..b814918478f 100644 --- a/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java +++ b/src/client/java/teammates/client/scripts/testdataconversion/DataStoreToSqlConverter.java @@ -39,32 +39,44 @@ * Helper class to convert entities from its noSQL to SQL format. */ public class DataStoreToSqlConverter { - private String uuidPrefix = "00000000-0000-4000-8000-"; - private int initialAccountNumber = 1; - private int initialAccountRequestNumber = 101; - private int initialSectionNumber = 201; - private int initialTeamNumber = 301; - private int initialDeadlineExtensionNumber = 401; - private int initialInstructorNumber = 501; - private int initialStudentNumber = 601; - private int intitialFeedbackSessionNumber = 701; - private int initialFeedbackQuestionNumber = 801; - private int intialFeedbackResponseNumber = 901; - private int initialNotificationNumber = 1101; - private int initialReadNotificationNumber = 1201; - - private UuidGenerator accountUuidGenerator = new UuidGenerator(initialAccountNumber, uuidPrefix); - private UuidGenerator accounRequestUuidGenerator = new UuidGenerator(initialAccountRequestNumber, uuidPrefix); - private UuidGenerator sectionUuidGenerator = new UuidGenerator(initialSectionNumber, uuidPrefix); - private UuidGenerator teamUuidGenerator = new UuidGenerator(initialTeamNumber, uuidPrefix); - private UuidGenerator deadlineExtensionUuidGenerator = new UuidGenerator(initialDeadlineExtensionNumber, uuidPrefix); - private UuidGenerator instructorUuidGenerator = new UuidGenerator(initialInstructorNumber, uuidPrefix); - private UuidGenerator studentUuidGenerator = new UuidGenerator(initialStudentNumber, uuidPrefix); - private UuidGenerator feedbackSessionUuidGenerator = new UuidGenerator(intitialFeedbackSessionNumber, uuidPrefix); - private UuidGenerator feedbackQuestionUuidGenerator = new UuidGenerator(initialFeedbackQuestionNumber, uuidPrefix); - private UuidGenerator feedbackResponseUuidGenerator = new UuidGenerator(intialFeedbackResponseNumber, uuidPrefix); - private UuidGenerator notificationUuidGenerator = new UuidGenerator(initialNotificationNumber, uuidPrefix); - private UuidGenerator readNotificationUuidGenerator = new UuidGenerator(initialReadNotificationNumber, uuidPrefix); + private static final String UUID_PREFIX = "00000000-0000-4000-8000-"; + private static final int INITIAL_ACCOUNT_NUMBER = 1; + private static final int INITIAL_ACCOUNT_REQUEST_NUMBER = 101; + private static final int INITIAL_SECTION_NUMBER = 201; + private static final int INITIAL_TEAM_NUMBER = 301; + private static final int INITIAL_DEADLINE_EXTENSION_NUMBER = 401; + private static final int INITIAL_INSTRUCTOR_NUMBER = 501; + private static final int INITIAL_STUDENT_NUMBER = 601; + private static final int INITIAL_FEEDBACK_SESSION_NUMBER = 701; + private static final int INITIAL_FEEDBACK_QUESTION_NUMBER = 801; + private static final int INITIAL_FEEDBACK_RESPONSE_NUMBER = 901; + private static final int INITIAL_NOTIFICATION_NUMBER = 1101; + private static final int INITIAL_READ_NOTIFICATION_NUMBER = 1201; + + private static final UuidGenerator ACCOUNT_UUID_GENERATOR = + new UuidGenerator(INITIAL_ACCOUNT_NUMBER, UUID_PREFIX); + private static final UuidGenerator ACCOUN_REQUEST_UUID_GENERATOR = + new UuidGenerator(INITIAL_ACCOUNT_REQUEST_NUMBER, UUID_PREFIX); + private static final UuidGenerator SECTION_UUID_GENERATOR = + new UuidGenerator(INITIAL_SECTION_NUMBER, UUID_PREFIX); + private static final UuidGenerator TEAM_UUID_GENERATOR = + new UuidGenerator(INITIAL_TEAM_NUMBER, UUID_PREFIX); + private static final UuidGenerator DEADLINE_EXTENSION_UUID_GENERATOR = + new UuidGenerator(INITIAL_DEADLINE_EXTENSION_NUMBER, UUID_PREFIX); + private static final UuidGenerator INSTRUCTOR_UUID_GENERATOR = + new UuidGenerator(INITIAL_INSTRUCTOR_NUMBER, UUID_PREFIX); + private static final UuidGenerator STUDENT_UUID_GENERATOR = + new UuidGenerator(INITIAL_STUDENT_NUMBER, UUID_PREFIX); + private static final UuidGenerator FEEDBACK_SESSION_UUID_GENERATOR = + new UuidGenerator(INITIAL_FEEDBACK_SESSION_NUMBER, UUID_PREFIX); + private static final UuidGenerator FEEDBACK_QUESTION_UUID_GENERATOR = + new UuidGenerator(INITIAL_FEEDBACK_QUESTION_NUMBER, UUID_PREFIX); + private static final UuidGenerator FEEDBACK_RESPONSE_UUID_GENERATOR = + new UuidGenerator(INITIAL_FEEDBACK_RESPONSE_NUMBER, UUID_PREFIX); + private static final UuidGenerator NOTIFICATION_UUID_GENERATOR = + new UuidGenerator(INITIAL_NOTIFICATION_NUMBER, UUID_PREFIX); + private static final UuidGenerator READ_NOTIFICATION_UUID_GENERATOR = + new UuidGenerator(INITIAL_READ_NOTIFICATION_NUMBER, UUID_PREFIX); private long initialFeedbackResponseCommentId; @@ -99,11 +111,11 @@ private String generateSectionKey(String courseId, String sectionName) { return String.format("%s-%s", courseId, sectionName); } - private String generatefeedbackSessionKey(FeedbackSessionAttributes feedbackSession) { + private String generateFeedbackSessionKey(FeedbackSessionAttributes feedbackSession) { return String.format("%s-%s", feedbackSession.getCourseId(), feedbackSession.getFeedbackSessionName()); } - private String generatefeedbackSessionKey(String courseId, String feedbackSessionName) { + private String generateFeedbackSessionKey(String courseId, String feedbackSessionName) { return String.format("%s-%s", courseId, feedbackSessionName); } @@ -115,7 +127,7 @@ protected Account convert(AccountAttributes accAttr) { accAttr.getName(), accAttr.getEmail()); - UUID uuid = accountUuidGenerator.generateUuid(); + UUID uuid = ACCOUNT_UUID_GENERATOR.generateUuid(); sqlAccount.setId(uuid); accounts.put(accAttr.getGoogleId(), sqlAccount); @@ -139,7 +151,7 @@ protected AccountRequest convert(AccountRequestAttributes accReqAttr) { sqlAccountRequest.setRegisteredAt(accReqAttr.getRegisteredAt()); sqlAccountRequest.setRegistrationKey(accReqAttr.getRegistrationKey()); - UUID uuid = accounRequestUuidGenerator.generateUuid(); + UUID uuid = ACCOUN_REQUEST_UUID_GENERATOR.generateUuid(); sqlAccountRequest.setId(uuid); return sqlAccountRequest; @@ -179,7 +191,7 @@ protected Notification convert(NotificationAttributes notifAttr) { sqlNotification.setShown(); } - UUID uuid = notificationUuidGenerator.generateUuid(); + UUID uuid = NOTIFICATION_UUID_GENERATOR.generateUuid(); sqlNotification.setId(uuid); notifications.put(notifAttr.getNotificationId(), sqlNotification); @@ -209,9 +221,9 @@ protected FeedbackSession convert(FeedbackSessionAttributes fsAttr) { sqlFs.setCreatedAt(fsAttr.getCreatedTime()); sqlFs.setDeletedAt(fsAttr.getDeletedTime()); - sqlFs.setId(feedbackSessionUuidGenerator.generateUuid()); + sqlFs.setId(FEEDBACK_SESSION_UUID_GENERATOR.generateUuid()); - feedbackSessions.put(generatefeedbackSessionKey(fsAttr), sqlFs); + feedbackSessions.put(generateFeedbackSessionKey(fsAttr), sqlFs); return sqlFs; } @@ -232,7 +244,7 @@ protected Instructor convert(InstructorAttributes instructor) { instructor.getDisplayedName(), role, instructor.getPrivileges()); - sqlInstructor.setId(instructorUuidGenerator.generateUuid()); + sqlInstructor.setId(INSTRUCTOR_UUID_GENERATOR.generateUuid()); sqlInstructor.setAccount(sqlAccount); return sqlInstructor; @@ -250,7 +262,7 @@ protected Student convert(StudentAttributes student) { student.getEmail(), student.getComments()); - sqlStudent.setId(studentUuidGenerator.generateUuid()); + sqlStudent.setId(STUDENT_UUID_GENERATOR.generateUuid()); sqlStudent.setAccount(sqlAccount); return sqlStudent; @@ -261,7 +273,7 @@ protected Student convert(StudentAttributes student) { */ protected DeadlineExtension convert(DeadlineExtensionAttributes deadlineExtension) { FeedbackSession sqlFeedbackSession = feedbackSessions.get( - generatefeedbackSessionKey(deadlineExtension.getCourseId(), deadlineExtension.getFeedbackSessionName())); + generateFeedbackSessionKey(deadlineExtension.getCourseId(), deadlineExtension.getFeedbackSessionName())); // User is not included since DataBundleLogic.java does not read users from this attribute DeadlineExtension sqlDE = new DeadlineExtension(null, @@ -270,7 +282,7 @@ protected DeadlineExtension convert(DeadlineExtensionAttributes deadlineExtensio sqlDE.setClosingSoonEmailSent(deadlineExtension.getSentClosingEmail()); sqlDE.setCreatedAt(deadlineExtension.getCreatedAt()); - sqlDE.setId(deadlineExtensionUuidGenerator.generateUuid()); + sqlDE.setId(DEADLINE_EXTENSION_UUID_GENERATOR.generateUuid()); return sqlDE; } @@ -280,7 +292,7 @@ protected DeadlineExtension convert(DeadlineExtensionAttributes deadlineExtensio */ protected FeedbackQuestion convert(FeedbackQuestionAttributes feedbackQuestion) { FeedbackSession sqlFeedbackSession = feedbackSessions.get( - generatefeedbackSessionKey(feedbackQuestion.getCourseId(), feedbackQuestion.getFeedbackSessionName())); + generateFeedbackSessionKey(feedbackQuestion.getCourseId(), feedbackQuestion.getFeedbackSessionName())); FeedbackQuestion sqlFq = FeedbackQuestion.makeQuestion(sqlFeedbackSession, feedbackQuestion.getQuestionNumber(), @@ -294,7 +306,7 @@ protected FeedbackQuestion convert(FeedbackQuestionAttributes feedbackQuestion) feedbackQuestion.getQuestionDetails()); sqlFq.setCreatedAt(feedbackQuestion.getCreatedAt()); - sqlFq.setId(feedbackQuestionUuidGenerator.generateUuid()); + sqlFq.setId(FEEDBACK_QUESTION_UUID_GENERATOR.generateUuid()); return sqlFq; } @@ -319,7 +331,7 @@ protected FeedbackResponse convert(FeedbackResponseAttributes feedbackResponse) sqlReceiverSection, feedbackResponse.getResponseDetails()); - sqlFeedbackResponse.setId(feedbackResponseUuidGenerator.generateUuid()); + sqlFeedbackResponse.setId(FEEDBACK_RESPONSE_UUID_GENERATOR.generateUuid()); sqlFeedbackResponse.setCreatedAt(feedbackResponse.getCreatedAt()); return sqlFeedbackResponse; @@ -360,7 +372,7 @@ protected Section createSection(StudentAttributes student) { Course sqlCourse = courses.get(student.getCourse()); Section sqlSection = new Section(sqlCourse, student.getSection()); - sqlSection.setId(sectionUuidGenerator.generateUuid()); + sqlSection.setId(SECTION_UUID_GENERATOR.generateUuid()); sections.put(generateSectionKey(student), sqlSection); @@ -373,7 +385,7 @@ protected Section createSection(StudentAttributes student) { protected Team createTeam(StudentAttributes student) { Section sqlSection = sections.get(generateSectionKey(student)); Team sqlTeam = new Team(sqlSection, student.getTeam()); - sqlTeam.setId(teamUuidGenerator.generateUuid()); + sqlTeam.setId(TEAM_UUID_GENERATOR.generateUuid()); return sqlTeam; } @@ -388,7 +400,7 @@ protected List createReadNotifications(AccountAttributes accou account.getReadNotifications().forEach((notifId, endTime) -> { Notification sqlNotification = notifications.get(notifId); ReadNotification sqlReadNotification = new ReadNotification(sqlAccount, sqlNotification); - sqlReadNotification.setId(readNotificationUuidGenerator.generateUuid()); + sqlReadNotification.setId(READ_NOTIFICATION_UUID_GENERATOR.generateUuid()); sqlReadNotifications.add(sqlReadNotification); }); diff --git a/src/e2e/java/teammates/e2e/cases/axe/InstructorFeedbackEditPageAxeTest.java b/src/e2e/java/teammates/e2e/cases/axe/InstructorFeedbackEditPageAxeTest.java index da7e7ca4cb1..79c96f478f6 100644 --- a/src/e2e/java/teammates/e2e/cases/axe/InstructorFeedbackEditPageAxeTest.java +++ b/src/e2e/java/teammates/e2e/cases/axe/InstructorFeedbackEditPageAxeTest.java @@ -33,8 +33,8 @@ public void testAll() { testData.instructors.get("instructor").getGoogleId()); // landmark-unique might be caused by tinymce - // aria-allowed-attr is caused by https://github.com/tinymce/tinymce/issues/7346 - Results results = getAxeBuilder("aria-allowed-attr", "landmark-unique") + // aria-prohibited-attr is caused by https://github.com/tinymce/tinymce/issues/7346 + Results results = getAxeBuilder("aria-prohibited-attr", "landmark-unique") .analyze(feedbackEditPage.getBrowser().getDriver()); assertTrue(formatViolations(results), results.violationFree()); } diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminAccountsPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminAccountsPage.java index aec053d21b2..3848cb33417 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminAccountsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminAccountsPage.java @@ -1,7 +1,7 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminNotificationsPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminNotificationsPage.java index ef01c2b70fa..b483a53753a 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminNotificationsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminNotificationsPage.java @@ -119,7 +119,7 @@ public String getFirstRowNotificationId() { public void sortNotificationsTableByDescendingCreateTime() { WebElement creationTimeHeader = notificationsTable.findElements(By.tagName("th")).get(5); - if (creationTimeHeader.findElements(By.className("fa-sort-down")).size() == 0) { + if (creationTimeHeader.findElements(By.className("fa-sort-down")).isEmpty()) { click(creationTimeHeader); } } diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java index 289cbb13148..441b3e1512e 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminSearchPage.java @@ -1,8 +1,8 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/AdminSessionsPage.java b/src/e2e/java/teammates/e2e/pageobjects/AdminSessionsPage.java index 97f1d08b131..82bb8b5f09c 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AdminSessionsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AdminSessionsPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.Instant; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/AppPage.java b/src/e2e/java/teammates/e2e/pageobjects/AppPage.java index c52330fd928..52ae7cfdf60 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/AppPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/AppPage.java @@ -1,10 +1,10 @@ package teammates.e2e.pageobjects; import static com.google.common.base.Preconditions.checkNotNull; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; @@ -549,7 +549,7 @@ public AppPage clickAndConfirm(WebElement elementToClick) { * Returns True if there is a corresponding element for the given locator. */ public boolean isElementPresent(By by) { - return browser.driver.findElements(by).size() != 0; + return !browser.driver.findElements(by).isEmpty(); } /** diff --git a/src/e2e/java/teammates/e2e/pageobjects/Browser.java b/src/e2e/java/teammates/e2e/pageobjects/Browser.java index b23a39213de..762f93070b4 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/Browser.java +++ b/src/e2e/java/teammates/e2e/pageobjects/Browser.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.time.Duration; import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashMap; import java.util.Map; @@ -47,7 +48,7 @@ public class Browser { /** * Keeps track of multiple windows opened by the {@link WebDriver}. */ - private final ArrayDeque windowHandles = new ArrayDeque<>(); + private final Deque windowHandles = new ArrayDeque<>(); public Browser() { this.driver = createWebDriver(); diff --git a/src/e2e/java/teammates/e2e/pageobjects/CourseJoinConfirmationPage.java b/src/e2e/java/teammates/e2e/pageobjects/CourseJoinConfirmationPage.java index 5f5ef6785ab..98defd18e56 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/CourseJoinConfirmationPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/CourseJoinConfirmationPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; diff --git a/src/e2e/java/teammates/e2e/pageobjects/ErrorReportingModal.java b/src/e2e/java/teammates/e2e/pageobjects/ErrorReportingModal.java index 0dbd67eba73..87bfcee3b8d 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/ErrorReportingModal.java +++ b/src/e2e/java/teammates/e2e/pageobjects/ErrorReportingModal.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openqa.selenium.By; diff --git a/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java b/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java index 07c75951cb5..088e044c34c 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java @@ -1,8 +1,8 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.time.Instant; import java.util.ArrayList; @@ -296,7 +296,7 @@ private boolean isRubricResponseEqual(WebElement responseField, FeedbackResponse WebElement rubricTableBody = responseField.findElement(By.className("rubric-answers")); WebElement rubricRow = rubricTableBody.findElements(By.cssSelector("tr")).get(i); WebElement rubricCell = rubricRow.findElements(By.tagName("td")).get(answers.get(i) + 1); - if (rubricCell.findElements(By.className("fa-check")).size() == 0) { + if (rubricCell.findElements(By.className("fa-check")).isEmpty()) { return false; } } @@ -574,7 +574,7 @@ private WebElement getRubricStatistics(int questionNum) { } private boolean isCommentByResponseGiver(WebElement commentField) { - return commentField.findElements(By.className("by-response-giver")).size() > 0; + return !commentField.findElements(By.className("by-response-giver")).isEmpty(); } private String getCommentGiver(WebElement commentField) { diff --git a/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java b/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java index 11911490a04..f7262e63ffb 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java @@ -1,9 +1,9 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.time.Instant; import java.util.Collections; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseDetailsPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseDetailsPage.java index 14f34f842f9..ee6f48c5e2c 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseDetailsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseDetailsPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java index e1f0da0b593..f0e1c416849 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEditPage.java @@ -1,8 +1,8 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.HashMap; @@ -106,7 +106,7 @@ public void verifyInstructorDetails(InstructorAttributes instructor) { assertEquals("(This instructor will NOT be displayed to students)", getInstructorDisplayName(instrNum)); } assertEquals(instructor.getRole(), getInstructorRole(instrNum)); - if (instructor.getRole().equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM) + if (Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM.equals(instructor.getRole()) && getEditInstructorButton(instrNum).isEnabled()) { verifyCustomPrivileges(instrNum, instructor.getPrivileges()); } @@ -305,7 +305,7 @@ public void editInstructor(int instrNum, InstructorAttributes instructor) { } public void toggleCustomCourseLevelPrivilege(int instrNum, String privilege) { - if (!getInstructorRole(instrNum).equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM)) { + if (!Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM.equals(getInstructorRole(instrNum))) { return; } @@ -316,7 +316,7 @@ public void toggleCustomCourseLevelPrivilege(int instrNum, String privilege) { public void toggleCustomSectionLevelPrivilege(int instrNum, int panelNum, String section, String privilege) { - if (!getInstructorRole(instrNum).equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM)) { + if (!Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM.equals(getInstructorRole(instrNum))) { return; } @@ -330,7 +330,7 @@ public void toggleCustomSectionLevelPrivilege(int instrNum, int panelNum, String public void toggleCustomSessionLevelPrivilege(int instrNum, int panelNum, String section, String session, String privilege) { - if (!getInstructorRole(instrNum).equals(Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM)) { + if (!Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_CUSTOM.equals(getInstructorRole(instrNum))) { return; } diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEnrollPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEnrollPage.java index d213d544859..536791dc127 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEnrollPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseEnrollPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsEditPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsEditPage.java index 0aa807a0e2b..200ceb38b35 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsEditPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsEditPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsViewPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsViewPage.java index ebeb0a0ce3a..b9b6eafa6fd 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsViewPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorCourseStudentDetailsViewPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java index 8c824ccc1d7..b00bf8fabfe 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java @@ -1,8 +1,8 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Instant; import java.time.ZoneId; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackResultsPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackResultsPage.java index e7210e7ae0b..b38f17539df 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackResultsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackResultsPage.java @@ -1,7 +1,7 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Instant; import java.util.ArrayList; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackSessionsPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackSessionsPage.java index 8dbff103bac..ced3a680904 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackSessionsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackSessionsPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.Instant; import java.time.ZoneId; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 10dff2a76cf..21dbce2247a 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.Instant; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorSearchPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorSearchPage.java index f84b663a2d5..50a6663446d 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorSearchPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorSearchPage.java @@ -1,7 +1,7 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; import java.util.Map; @@ -75,6 +75,7 @@ public void verifyStudentDetails(CourseAttributes course, StudentAttributes[] st WebElement targetCourse = getStudentTableForHeader(course); if (targetCourse == null) { fail("Course with ID " + course.getId() + " is not found"); + return; } WebElement studentList = targetCourse.findElement(By.tagName("table")); @@ -118,6 +119,7 @@ private WebElement getStudentRow(CourseAttributes course, String studentEmail) { WebElement targetCourse = getStudentTableForHeader(course); if (targetCourse == null) { fail("Course with ID " + course.getId() + " is not found"); + return null; } List studentRows = targetCourse.findElements(By.cssSelector("tbody tr")); diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorSessionIndividualExtensionPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorSessionIndividualExtensionPage.java index 3ecac1a7364..3e6f1f5be64 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorSessionIndividualExtensionPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorSessionIndividualExtensionPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.Duration; import java.time.Instant; diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPage.java index d33252527b7..8ac65b5d123 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPage.java @@ -1,7 +1,7 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Arrays; import java.util.Collection; @@ -67,6 +67,7 @@ public void verifyStudentDetails(CourseAttributes course, StudentAttributes[] st WebElement targetCourse = getCourseTab(course); if (targetCourse == null) { fail("Course with ID " + course.getId() + " is not found"); + return; } if (students.length == 0) { @@ -86,6 +87,7 @@ public void verifyStudentDetailsNotViewable(CourseAttributes course) { WebElement targetCourse = getCourseTab(course); if (targetCourse == null) { fail("Course with ID " + course.getId() + " is not found"); + return; } String noViewStudentsPermissionText = targetCourse.findElement(By.className("card-body")).getText(); String expectedText = "You do not have permission to view the details of the students in this course."; @@ -149,6 +151,7 @@ private WebElement getStudentRow(CourseAttributes course, String studentEmail) { WebElement targetCourse = getCourseTab(course); if (targetCourse == null) { fail("Course with ID " + course.getId() + " is not found"); + return null; } List studentRows = targetCourse.findElements(By.cssSelector("tbody tr")); diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java index b3fe750ff3b..5f593bd4bee 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentRecordsPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java b/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java index 40d487a7424..e1f33b35dc0 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/StudentHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/StudentHomePage.java index b1474312004..62d183e1231 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/StudentHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/StudentHomePage.java @@ -1,6 +1,6 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/pageobjects/UserNotificationsPage.java b/src/e2e/java/teammates/e2e/pageobjects/UserNotificationsPage.java index 1460a699c52..d1bc47381eb 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/UserNotificationsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/UserNotificationsPage.java @@ -1,8 +1,8 @@ package teammates.e2e.pageobjects; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Instant; import java.util.List; diff --git a/src/e2e/java/teammates/e2e/util/TestDataValidityTest.java b/src/e2e/java/teammates/e2e/util/TestDataValidityTest.java index d63cd4d60f3..99af4d002c3 100644 --- a/src/e2e/java/teammates/e2e/util/TestDataValidityTest.java +++ b/src/e2e/java/teammates/e2e/util/TestDataValidityTest.java @@ -181,7 +181,7 @@ private boolean isValidTestCourseId(String courseId, String testPage) { } private boolean isValidTestGoogleId(String googleId, String testPage) { - if (googleId == null || googleId.equals("")) { + if (googleId == null || "".equals(googleId)) { // Empty google ID is always acceptable return true; } diff --git a/src/e2e/java/teammates/e2e/util/TestProperties.java b/src/e2e/java/teammates/e2e/util/TestProperties.java index ecdd4d3f648..9279aaf437c 100644 --- a/src/e2e/java/teammates/e2e/util/TestProperties.java +++ b/src/e2e/java/teammates/e2e/util/TestProperties.java @@ -9,6 +9,7 @@ /** * Represents properties in test.properties file. */ +@SuppressWarnings("PMD.TestClassWithoutTestCases") public final class TestProperties { /** The directory where JSON files used to create data bundles are stored. */ diff --git a/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java b/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java index 079f95b13e7..0e94674fc56 100644 --- a/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java @@ -203,7 +203,7 @@ public void testCreateDataBundle_typicalValues_createdCorrectly() throws Excepti FeedbackResponseComment expectedComment1 = new FeedbackResponseComment(expectedResponse1, "instr1@teammates.tmt", FeedbackParticipantType.INSTRUCTORS, expectedSection, expectedSection, "Instructor 1 comment to student 1 self feedback", false, false, - new ArrayList(), new ArrayList(), "instr1@teammates.tmt"); + new ArrayList<>(), new ArrayList<>(), "instr1@teammates.tmt"); expectedComment1.setId(actualComment1.getId()); verifyEquals(expectedComment1, actualComment1); } diff --git a/src/it/java/teammates/it/storage/sqlapi/FeedbackResponseCommentsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/FeedbackResponseCommentsDbIT.java index f4a6bcc7c87..040e30419c2 100644 --- a/src/it/java/teammates/it/storage/sqlapi/FeedbackResponseCommentsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/FeedbackResponseCommentsDbIT.java @@ -101,7 +101,7 @@ public void testSqlInjectionInCreateFeedbackResponseComment() throws Exception { FeedbackResponseComment newFrc = new FeedbackResponseComment( fr, "", FeedbackParticipantType.INSTRUCTORS, s, s, "", false, false, - new ArrayList(), new ArrayList(), sqli); + new ArrayList<>(), new ArrayList<>(), sqli); frcDb.createFeedbackResponseComment(newFrc); diff --git a/src/it/java/teammates/it/test/TestProperties.java b/src/it/java/teammates/it/test/TestProperties.java index 55e9f4c77e9..8ab06ea2a5b 100644 --- a/src/it/java/teammates/it/test/TestProperties.java +++ b/src/it/java/teammates/it/test/TestProperties.java @@ -9,6 +9,7 @@ /** * Settings for integration tests. */ +@SuppressWarnings("PMD.TestClassWithoutTestCases") public final class TestProperties { /** The directory where JSON files used to create data bundles are stored. */ diff --git a/src/it/java/teammates/it/ui/webapi/BaseActionIT.java b/src/it/java/teammates/it/ui/webapi/BaseActionIT.java index e489db0faf1..b46189f7a84 100644 --- a/src/it/java/teammates/it/ui/webapi/BaseActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/BaseActionIT.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpDelete; diff --git a/src/it/java/teammates/it/ui/webapi/CreateAccountActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateAccountActionIT.java index 54df60a0234..1b24bc094a2 100644 --- a/src/it/java/teammates/it/ui/webapi/CreateAccountActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/CreateAccountActionIT.java @@ -4,6 +4,8 @@ import java.time.ZoneId; import java.util.List; +import jakarta.transaction.Transactional; + import org.testng.annotations.BeforeMethod; import org.testng.annotations.Ignore; import org.testng.annotations.Test; @@ -23,8 +25,6 @@ import teammates.ui.webapi.CreateAccountAction; import teammates.ui.webapi.InvalidHttpParameterException; -import jakarta.transaction.Transactional; - /** * SUT: {@link CreateAccountAction}. */ diff --git a/src/lnp/java/teammates/lnp/cases/BaseLNPTestCase.java b/src/lnp/java/teammates/lnp/cases/BaseLNPTestCase.java index 10caef0599a..369b0daa9a0 100644 --- a/src/lnp/java/teammates/lnp/cases/BaseLNPTestCase.java +++ b/src/lnp/java/teammates/lnp/cases/BaseLNPTestCase.java @@ -24,7 +24,6 @@ import org.apache.jmeter.save.SaveService; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.collections.HashTree; -import org.apache.jorphan.collections.ListedHashTree; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -69,7 +68,7 @@ public abstract class BaseLNPTestCase extends BaseTestCase { * Returns the JMeter test plan for the L&P test case. * @return A nested tree structure that consists of the various elements that are used in the JMeter test. */ - protected abstract ListedHashTree getLnpTestPlan(); + protected abstract HashTree getLnpTestPlan(); /** * Sets up the specification for this L&P test case. diff --git a/src/lnp/java/teammates/lnp/cases/FeedbackQuestionUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/FeedbackQuestionUpdateLNPTest.java index 9c700be7b98..149351241a8 100644 --- a/src/lnp/java/teammates/lnp/cases/FeedbackQuestionUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/FeedbackQuestionUpdateLNPTest.java @@ -289,8 +289,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/FeedbackSessionSubmitLNPTest.java b/src/lnp/java/teammates/lnp/cases/FeedbackSessionSubmitLNPTest.java index 7745a6050bb..8e56ed7748f 100644 --- a/src/lnp/java/teammates/lnp/cases/FeedbackSessionSubmitLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/FeedbackSessionSubmitLNPTest.java @@ -228,8 +228,8 @@ private Map getRequestHeaders() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUMBER_OF_USER_ACCOUNTS, RAMP_UP_PERIOD, 1)); threadGroup.add(JMeterElements.csvDataSet(getPathToTestDataFile(getCsvConfigPath()))); diff --git a/src/lnp/java/teammates/lnp/cases/FeedbackSessionViewLNPTest.java b/src/lnp/java/teammates/lnp/cases/FeedbackSessionViewLNPTest.java index 4462cfef553..fd81114c618 100644 --- a/src/lnp/java/teammates/lnp/cases/FeedbackSessionViewLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/FeedbackSessionViewLNPTest.java @@ -203,8 +203,8 @@ public List> generateCsvData() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUMBER_OF_USER_ACCOUNTS, RAMP_UP_PERIOD, 1)); threadGroup.add(JMeterElements.csvDataSet(getPathToTestDataFile(getCsvConfigPath()))); diff --git a/src/lnp/java/teammates/lnp/cases/InstructorCourseUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/InstructorCourseUpdateLNPTest.java index 141107c5563..7d3ccba4039 100644 --- a/src/lnp/java/teammates/lnp/cases/InstructorCourseUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/InstructorCourseUpdateLNPTest.java @@ -160,8 +160,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/InstructorSessionResultLNPTest.java b/src/lnp/java/teammates/lnp/cases/InstructorSessionResultLNPTest.java index abf846a6d8a..91b57f3f263 100644 --- a/src/lnp/java/teammates/lnp/cases/InstructorSessionResultLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/InstructorSessionResultLNPTest.java @@ -250,8 +250,8 @@ public List> generateCsvData() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(1, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/InstructorStudentCascadingUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/InstructorStudentCascadingUpdateLNPTest.java index 93525221226..d644934aa33 100644 --- a/src/lnp/java/teammates/lnp/cases/InstructorStudentCascadingUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/InstructorStudentCascadingUpdateLNPTest.java @@ -266,8 +266,8 @@ protected void createCsvConfigDataFile() throws IOException { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/InstructorStudentEnrollmentLNPTest.java b/src/lnp/java/teammates/lnp/cases/InstructorStudentEnrollmentLNPTest.java index 1801a7929b1..2d53db4a9be 100644 --- a/src/lnp/java/teammates/lnp/cases/InstructorStudentEnrollmentLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/InstructorStudentEnrollmentLNPTest.java @@ -144,8 +144,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/InstructorUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/InstructorUpdateLNPTest.java index 66cb189dc47..ce7d6f770a2 100644 --- a/src/lnp/java/teammates/lnp/cases/InstructorUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/InstructorUpdateLNPTest.java @@ -287,8 +287,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/StudentEmailUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/StudentEmailUpdateLNPTest.java index dcd2efa4aa9..d714c9eef6f 100644 --- a/src/lnp/java/teammates/lnp/cases/StudentEmailUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/StudentEmailUpdateLNPTest.java @@ -260,8 +260,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/StudentSectionUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/StudentSectionUpdateLNPTest.java index 27cf4767e0f..672c57cc826 100644 --- a/src/lnp/java/teammates/lnp/cases/StudentSectionUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/StudentSectionUpdateLNPTest.java @@ -260,8 +260,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/cases/StudentTeamUpdateLNPTest.java b/src/lnp/java/teammates/lnp/cases/StudentTeamUpdateLNPTest.java index 1545aa24ac7..8c1b86ed8f9 100644 --- a/src/lnp/java/teammates/lnp/cases/StudentTeamUpdateLNPTest.java +++ b/src/lnp/java/teammates/lnp/cases/StudentTeamUpdateLNPTest.java @@ -260,8 +260,8 @@ private String getTestEndpoint() { } @Override - protected ListedHashTree getLnpTestPlan() { - ListedHashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); + protected HashTree getLnpTestPlan() { + HashTree testPlan = new ListedHashTree(JMeterElements.testPlan()); HashTree threadGroup = testPlan.add( JMeterElements.threadGroup(NUM_INSTRUCTORS, RAMP_UP_PERIOD, 1)); diff --git a/src/lnp/java/teammates/lnp/util/LNPSpecification.java b/src/lnp/java/teammates/lnp/util/LNPSpecification.java index 2a0dd778e0b..f0cb47c7b0b 100644 --- a/src/lnp/java/teammates/lnp/util/LNPSpecification.java +++ b/src/lnp/java/teammates/lnp/util/LNPSpecification.java @@ -69,7 +69,7 @@ public static Builder builder() { /** * A builder class for {@link LNPSpecification}. */ - public static class Builder { + public static final class Builder { private LNPSpecification specification; diff --git a/src/lnp/java/teammates/lnp/util/TestProperties.java b/src/lnp/java/teammates/lnp/util/TestProperties.java index 91f7ef7f831..932cad931db 100644 --- a/src/lnp/java/teammates/lnp/util/TestProperties.java +++ b/src/lnp/java/teammates/lnp/util/TestProperties.java @@ -9,6 +9,7 @@ /** * Represents properties in test.properties file. */ +@SuppressWarnings("PMD.TestClassWithoutTestCases") public final class TestProperties { /** The directory where the L&P test data files are stored. */ diff --git a/src/main/appengine/app.template.yaml b/src/main/appengine/app.template.yaml index 212a7fc4b9f..ad47c59733e 100644 --- a/src/main/appengine/app.template.yaml +++ b/src/main/appengine/app.template.yaml @@ -3,7 +3,7 @@ ########################################################################### # App Engine Standard (Java 11) configuration -# Reference: https://cloud.google.com/appengine/docs/standard/java11/config/appref +# Reference: https://cloud.google.com/appengine/docs/standard/reference/app-yaml?tab=java ########################################################################### # Run/deploy with Java 11 runtime. @@ -30,7 +30,7 @@ instance_class: F1 handlers: # These are the handlers for static files. By specifying them as static files, requests pointing to these URLs will not add up to instance load. - # Reference: https://cloud.google.com/appengine/docs/standard/java11/config/appref#handlers_element + # Reference: https://cloud.google.com/appengine/docs/standard/reference/app-yaml?tab=java#handlers_element # Assets and front-end files - url: /assets @@ -79,7 +79,7 @@ handlers: # Defines policy for automatic scaling (instance class F*). # If the application uses instance class B*, this part is not relevant. -# Reference: https://cloud.google.com/appengine/docs/standard/java11/config/appref#scaling_elements +# Reference: https://cloud.google.com/appengine/docs/standard/reference/app-yaml?tab=java#scaling_elements automatic_scaling: # max_instances: 0 # min_instances: 0 @@ -92,7 +92,7 @@ automatic_scaling: target_throughput_utilization: 0.6 # Enable warmup request to reduce latency when new instances are created. -# Reference: https://cloud.google.com/appengine/docs/standard/java11/configuring-warmup-requests +# Reference: https://cloud.google.com/appengine/docs/standard/configuring-warmup-requests?tab=java inbound_services: - warmup diff --git a/src/main/appengine/cron.yaml b/src/main/appengine/cron.yaml index f6426a84e1e..f544189852c 100644 --- a/src/main/appengine/cron.yaml +++ b/src/main/appengine/cron.yaml @@ -1,4 +1,4 @@ -# Reference: https://cloud.google.com/appengine/docs/standard/java11/scheduling-jobs-with-cron-yaml +# Reference: https://cloud.google.com/appengine/docs/standard/scheduling-jobs-with-cron-yaml cron: - url: '/auto/feedbackSessionOpeningReminders' diff --git a/src/main/appengine/queue.yaml b/src/main/appengine/queue.yaml index 09d9b215e6a..1521525a542 100644 --- a/src/main/appengine/queue.yaml +++ b/src/main/appengine/queue.yaml @@ -1,4 +1,3 @@ -# Reference: https://cloud.google.com/appengine/docs/standard/java/config/queueref-yaml # Reference: https://cloud.google.com/tasks/docs/queue-yaml # Although the usage of queue.yaml is somewhat deprecated, we continue to use it for now # as it is more practical for us compared to managing task queue within code. diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index a4a5c7cd4f2..2cd5d782470 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jre +FROM amazoncorretto:11-alpine-jdk COPY dist . COPY WEB-INF WEB-INF diff --git a/src/main/java/teammates/common/datatransfer/AttributesDeletionQuery.java b/src/main/java/teammates/common/datatransfer/AttributesDeletionQuery.java index b665397e875..0b6afe1ffab 100644 --- a/src/main/java/teammates/common/datatransfer/AttributesDeletionQuery.java +++ b/src/main/java/teammates/common/datatransfer/AttributesDeletionQuery.java @@ -74,7 +74,7 @@ public static Builder builder() { /** * Builder for {@link AttributesDeletionQuery}. */ - public static class Builder { + public static final class Builder { private static final String INVALID_COMBINATION = "Invalid combination"; diff --git a/src/main/java/teammates/common/datatransfer/CourseRoster.java b/src/main/java/teammates/common/datatransfer/CourseRoster.java index b47fd255b47..793dfa7fd07 100644 --- a/src/main/java/teammates/common/datatransfer/CourseRoster.java +++ b/src/main/java/teammates/common/datatransfer/CourseRoster.java @@ -158,7 +158,7 @@ public ParticipantInfo getInfoForIdentifier(String identifier) { /** * Simple data transfer object containing the information of a participant. */ - public static class ParticipantInfo { + public static final class ParticipantInfo { private final String name; private final String teamName; diff --git a/src/main/java/teammates/common/datatransfer/SqlCourseRoster.java b/src/main/java/teammates/common/datatransfer/SqlCourseRoster.java index 922b9d6c8c6..6cc462be0ca 100644 --- a/src/main/java/teammates/common/datatransfer/SqlCourseRoster.java +++ b/src/main/java/teammates/common/datatransfer/SqlCourseRoster.java @@ -158,7 +158,7 @@ public ParticipantInfo getInfoForIdentifier(String identifier) { /** * Simple data transfer object containing the information of a participant. */ - public static class ParticipantInfo { + public static final class ParticipantInfo { private final String name; private final String teamName; diff --git a/src/main/java/teammates/common/datatransfer/TeamEvalResult.java b/src/main/java/teammates/common/datatransfer/TeamEvalResult.java index 428857aff18..8d3358f7690 100644 --- a/src/main/java/teammates/common/datatransfer/TeamEvalResult.java +++ b/src/main/java/teammates/common/datatransfer/TeamEvalResult.java @@ -330,7 +330,7 @@ private static double averageColumn(double[][] arrayOfArrays, int columnIndex) { count++; } // omit calculation if no data points - double average = count == 0 ? NA : (double) (sum / count); + double average = count == 0 ? NA : (sum / count); String logMessage = "Average(" + values.toString().trim() + ") = " + average; log.fine(replaceMagicNumbers(logMessage)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/AccountAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/AccountAttributes.java index 00598d9dc71..5d9509a985f 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/AccountAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/AccountAttributes.java @@ -185,7 +185,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(String googleId) { /** * A builder class for {@link AccountAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private AccountAttributes accountAttributes; @@ -221,7 +221,7 @@ public AccountAttributes build() { /** * Helper class to specify the fields to update in {@link AccountAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String googleId; private UpdateOption> readNotificationsOption = UpdateOption.empty(); @@ -249,7 +249,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(String googleId) { super(new UpdateOptions(googleId)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java index 95550962ed5..aa80974c49a 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/AccountRequestAttributes.java @@ -167,7 +167,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(String email, String in /** * A builder for {@link AccountRequestAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final AccountRequestAttributes accountRequestAttributes; private Builder(String email, String institute, String name) { @@ -188,7 +188,7 @@ public AccountRequestAttributes build() { /** * Helper class to specify the fields to update in {@link AccountRequestAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String email; private String institute; @@ -222,7 +222,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(String email, String institute) { super(new UpdateOptions(email, institute)); thisBuilder = this; diff --git a/src/main/java/teammates/common/datatransfer/attributes/CourseAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/CourseAttributes.java index f28decd00a9..13c13b52cf2 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/CourseAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/CourseAttributes.java @@ -213,7 +213,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(String courseId) { /** * A builder for {@link CourseAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final CourseAttributes courseAttributes; @@ -235,7 +235,7 @@ public CourseAttributes build() { /** * Helper class to specific the fields to update in {@link AccountAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String courseId; private UpdateOption nameOption = UpdateOption.empty(); @@ -267,7 +267,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(String courseId) { super(new UpdateOptions(courseId)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/DeadlineExtensionAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/DeadlineExtensionAttributes.java index 3a96cea689b..9d10a5046ab 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/DeadlineExtensionAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/DeadlineExtensionAttributes.java @@ -192,7 +192,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(UpdateOptions updateOpt /** * A builder for {@link DeadlineExtensionAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final DeadlineExtensionAttributes deadlineExtensionAttributes; private Builder(String courseId, String feedbackSessionName, String userEmail, boolean isInstructor) { @@ -214,7 +214,7 @@ public DeadlineExtensionAttributes build() { /** * Helper class to specify the fields to update in {@link DeadlineExtensionAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private final String courseId; private final String feedbackSessionName; private final String userEmail; @@ -272,7 +272,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(UpdateOptions updateOptions) { super(updateOptions); thisBuilder = this; diff --git a/src/main/java/teammates/common/datatransfer/attributes/EntityAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/EntityAttributes.java index 463b692d0f8..26395418b25 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/EntityAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/EntityAttributes.java @@ -62,7 +62,7 @@ void addNonEmptyError(String error, List errors) { * * @param type of object being updated */ - protected static class UpdateOption { + protected static final class UpdateOption { private static final UpdateOption EMPTY = new UpdateOption<>(); diff --git a/src/main/java/teammates/common/datatransfer/attributes/FeedbackQuestionAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/FeedbackQuestionAttributes.java index 0872ef36b0d..ab5ec386988 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/FeedbackQuestionAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/FeedbackQuestionAttributes.java @@ -512,7 +512,7 @@ public static FeedbackQuestionAttributes.UpdateOptions.Builder updateOptionsBuil /** * A Builder class for {@link FeedbackQuestionAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final FeedbackQuestionAttributes feedbackQuestionAttributes; private Builder() { @@ -548,7 +548,7 @@ public FeedbackQuestionAttributes build() { /** * Helper class to specific the fields to update in {@link FeedbackQuestionAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String feedbackQuestionId; private UpdateOption questionDetailsOption = UpdateOption.empty(); @@ -590,7 +590,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(String feedbackQuestionId) { super(new UpdateOptions(feedbackQuestionId)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseAttributes.java index cf3bf135cf1..915bf21378c 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseAttributes.java @@ -268,7 +268,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(String feedbackResponse /** * A builder for {@link FeedbackResponseCommentAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private FeedbackResponseAttributes fra; @@ -307,7 +307,7 @@ public FeedbackResponseAttributes build() { /** * Helper class to specific the fields to update in {@link FeedbackResponseAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String feedbackResponseId; private UpdateOption giverOption = UpdateOption.empty(); @@ -341,7 +341,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(String feedbackResponseId) { super(new UpdateOptions(feedbackResponseId)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseCommentAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseCommentAttributes.java index 9369a10117f..ead8eb168a4 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseCommentAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/FeedbackResponseCommentAttributes.java @@ -350,7 +350,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(long feedbackResponseCo /** * A builder for {@link FeedbackResponseCommentAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final FeedbackResponseCommentAttributes frca; private Builder() { @@ -416,7 +416,7 @@ public FeedbackResponseCommentAttributes build() { /** * Helper class to specific the fields to update in {@link FeedbackResponseCommentAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private long feedbackResponseCommentId; private UpdateOption feedbackResponseIdOption = UpdateOption.empty(); @@ -452,7 +452,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(Long feedbackResponseCommentId) { super(new UpdateOptions(feedbackResponseCommentId)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/FeedbackSessionAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/FeedbackSessionAttributes.java index 7abefdd69bd..8b8fdd25dd0 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/FeedbackSessionAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/FeedbackSessionAttributes.java @@ -659,7 +659,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(UpdateOptions updateOpt /** * A builder for {@link FeedbackSessionAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final FeedbackSessionAttributes feedbackSessionAttributes; private Builder(String feedbackSessionName, String courseId) { @@ -688,7 +688,7 @@ public FeedbackSessionAttributes build() { /** * Helper class to specific the fields to update in {@link FeedbackSessionAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String courseId; private String feedbackSessionName; @@ -752,7 +752,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(UpdateOptions updateOptions) { super(updateOptions); diff --git a/src/main/java/teammates/common/datatransfer/attributes/InstructorAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/InstructorAttributes.java index 88d561229f8..5bd9707fd98 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/InstructorAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/InstructorAttributes.java @@ -411,7 +411,7 @@ public static UpdateOptionsWithGoogleId.Builder updateOptionsWithGoogleIdBuilder /** * A builder class for {@link InstructorAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final InstructorAttributes instructorAttributes; private Builder(String courseId, String email) { @@ -444,7 +444,7 @@ public InstructorAttributes build() { * *

    {@code courseId} and {@code email} is used to identify the instructor. */ - public static class UpdateOptionsWithEmail extends UpdateOptions { + public static final class UpdateOptionsWithEmail extends UpdateOptions { private String courseId; private String email; @@ -476,7 +476,7 @@ public String toString() { /** * Builder class for {@link UpdateOptionsWithEmail}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private UpdateOptionsWithEmail updateOptionsWithEmail; @@ -505,7 +505,7 @@ public UpdateOptionsWithEmail build() { * *

    {@code courseId} and {@code googleId} is used to identify the instructor. */ - public static class UpdateOptionsWithGoogleId extends UpdateOptions { + public static final class UpdateOptionsWithGoogleId extends UpdateOptions { private String courseId; private String googleId; @@ -538,7 +538,7 @@ public String toString() { /** * Builder class for {@link UpdateOptionsWithGoogleId}. */ - public static class Builder + public static final class Builder extends BasicBuilder { private UpdateOptionsWithGoogleId updateOptionsWithGoogleId; diff --git a/src/main/java/teammates/common/datatransfer/attributes/NotificationAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/NotificationAttributes.java index 31f353d9255..aeff2647790 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/NotificationAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/NotificationAttributes.java @@ -260,7 +260,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(UpdateOptions updateOpt /** * A builder for {@link NotificationAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final NotificationAttributes notificationAttributes; private Builder(String notificationId) { @@ -281,7 +281,7 @@ public NotificationAttributes build() { /** * Helper class to specific the fields to update in {@link NotificationAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String notificationId; private UpdateOption startTimeOption = UpdateOption.empty(); @@ -318,7 +318,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(UpdateOptions updateOptions) { super(updateOptions); diff --git a/src/main/java/teammates/common/datatransfer/attributes/StudentAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/StudentAttributes.java index b021983ad3f..59b3b8939a8 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/StudentAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/StudentAttributes.java @@ -323,7 +323,7 @@ public static UpdateOptions.Builder updateOptionsBuilder(String courseId, String /** * A builder class for {@link StudentAttributes}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private final StudentAttributes studentAttributes; @@ -345,7 +345,7 @@ public StudentAttributes build() { /** * Helper class to specify the fields to update in {@link StudentAttributes}. */ - public static class UpdateOptions { + public static final class UpdateOptions { private String courseId; private String email; @@ -389,7 +389,7 @@ public String toString() { /** * Builder class to build {@link UpdateOptions}. */ - public static class Builder extends BasicBuilder { + public static final class Builder extends BasicBuilder { private Builder(String courseId, String email) { super(new UpdateOptions(courseId, email)); diff --git a/src/main/java/teammates/common/datatransfer/attributes/UsageStatisticsAttributes.java b/src/main/java/teammates/common/datatransfer/attributes/UsageStatisticsAttributes.java index 47315a9748b..e53ecdccd87 100644 --- a/src/main/java/teammates/common/datatransfer/attributes/UsageStatisticsAttributes.java +++ b/src/main/java/teammates/common/datatransfer/attributes/UsageStatisticsAttributes.java @@ -156,7 +156,7 @@ public static Builder builder(Instant startTime, int timePeriod) { *

    Note that we are using a simplified builder pattern here, as opposed to builders of other attributes, * as this entity is designed to be immutable. */ - public static class Builder { + public static final class Builder { private final UsageStatisticsAttributes usa; diff --git a/src/main/java/teammates/common/datatransfer/logs/EmailSentLogDetails.java b/src/main/java/teammates/common/datatransfer/logs/EmailSentLogDetails.java index bebcf3d0514..3a249898d17 100644 --- a/src/main/java/teammates/common/datatransfer/logs/EmailSentLogDetails.java +++ b/src/main/java/teammates/common/datatransfer/logs/EmailSentLogDetails.java @@ -1,6 +1,6 @@ package teammates.common.datatransfer.logs; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.util.EmailType; diff --git a/src/main/java/teammates/common/datatransfer/logs/ExceptionLogDetails.java b/src/main/java/teammates/common/datatransfer/logs/ExceptionLogDetails.java index 2d6da70fc3d..6c3baea6391 100644 --- a/src/main/java/teammates/common/datatransfer/logs/ExceptionLogDetails.java +++ b/src/main/java/teammates/common/datatransfer/logs/ExceptionLogDetails.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Contains specific structure and processing logic for exception log. diff --git a/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java b/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java index f3e765eb03e..4b5c6c96b7c 100644 --- a/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java +++ b/src/main/java/teammates/common/datatransfer/logs/FeedbackSessionAuditLogDetails.java @@ -1,6 +1,6 @@ package teammates.common.datatransfer.logs; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Contains specific structure and processing logic for feedback session audit log. diff --git a/src/main/java/teammates/common/datatransfer/logs/GeneralLogEntry.java b/src/main/java/teammates/common/datatransfer/logs/GeneralLogEntry.java index c729551f5c7..2a1adde4c10 100644 --- a/src/main/java/teammates/common/datatransfer/logs/GeneralLogEntry.java +++ b/src/main/java/teammates/common/datatransfer/logs/GeneralLogEntry.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Represents a log entry and contains the fields that are more important diff --git a/src/main/java/teammates/common/datatransfer/logs/LogDetails.java b/src/main/java/teammates/common/datatransfer/logs/LogDetails.java index 0c8582a0f4f..5ad15b43ce3 100644 --- a/src/main/java/teammates/common/datatransfer/logs/LogDetails.java +++ b/src/main/java/teammates/common/datatransfer/logs/LogDetails.java @@ -1,6 +1,6 @@ package teammates.common.datatransfer.logs; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Holds the details for a specific log event. diff --git a/src/main/java/teammates/common/datatransfer/logs/QueryLogsParams.java b/src/main/java/teammates/common/datatransfer/logs/QueryLogsParams.java index 01f93a78c29..c1a5f1e30f9 100644 --- a/src/main/java/teammates/common/datatransfer/logs/QueryLogsParams.java +++ b/src/main/java/teammates/common/datatransfer/logs/QueryLogsParams.java @@ -100,7 +100,7 @@ public Integer getPageSize() { /** * Builder for {@link QueryLogsParams}. */ - public static class Builder { + public static final class Builder { private QueryLogsParams queryLogsParams; private Builder(long startTime, long endTime) { diff --git a/src/main/java/teammates/common/datatransfer/logs/RequestLogDetails.java b/src/main/java/teammates/common/datatransfer/logs/RequestLogDetails.java index 6aa1e51131a..c4eb4f79f43 100644 --- a/src/main/java/teammates/common/datatransfer/logs/RequestLogDetails.java +++ b/src/main/java/teammates/common/datatransfer/logs/RequestLogDetails.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Contains specific structure and processing logic for HTTP request log. diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java index ac1000fc9a3..b0989284905 100644 --- a/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java +++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackConstantSumQuestionDetails.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Set; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.attributes.FeedbackQuestionAttributes; import teammates.common.util.FieldValidator; @@ -136,7 +136,7 @@ public List validateQuestionDetails() { // the validations below are only for constSumOptions int totalPoints = pointsPerOption ? points * constSumOptions.size() : points; - double evenPointDistribution = ((double) totalPoints) / ((double) constSumOptions.size()); + double evenPointDistribution = 1.0d * totalPoints / constSumOptions.size(); if (minPoint != null) { commonBoundaryValidation(errors, minPoint, totalPoints, MIN_POINT_STRING); diff --git a/src/main/java/teammates/common/datatransfer/questions/FeedbackTextQuestionDetails.java b/src/main/java/teammates/common/datatransfer/questions/FeedbackTextQuestionDetails.java index 23e9bbf4449..aad5118988f 100644 --- a/src/main/java/teammates/common/datatransfer/questions/FeedbackTextQuestionDetails.java +++ b/src/main/java/teammates/common/datatransfer/questions/FeedbackTextQuestionDetails.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.attributes.FeedbackQuestionAttributes; import teammates.storage.sqlentity.FeedbackQuestion; diff --git a/src/main/java/teammates/common/util/HibernateUtil.java b/src/main/java/teammates/common/util/HibernateUtil.java index 0a1e4311e16..7c91330bcc1 100644 --- a/src/main/java/teammates/common/util/HibernateUtil.java +++ b/src/main/java/teammates/common/util/HibernateUtil.java @@ -2,6 +2,11 @@ import java.util.List; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; + import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -47,11 +52,6 @@ import teammates.storage.sqlentity.responses.FeedbackRubricResponse; import teammates.storage.sqlentity.responses.FeedbackTextResponse; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaDelete; -import jakarta.persistence.criteria.CriteriaQuery; - /** * Utility class for Hibernate related methods. */ @@ -158,7 +158,7 @@ private static SessionFactory getSessionFactory() { * @see SessionFactory#getCurrentSession() */ private static Session getCurrentSession() { - return HibernateUtil.getSessionFactory().getCurrentSession(); + return getSessionFactory().getCurrentSession(); } /** @@ -194,7 +194,7 @@ public static void setSessionFactory(SessionFactory sessionFactory) { * @see Transaction#begin() */ public static void beginTransaction() { - Transaction transaction = HibernateUtil.getCurrentSession().getTransaction(); + Transaction transaction = getCurrentSession().getTransaction(); transaction.begin(); } @@ -203,7 +203,7 @@ public static void beginTransaction() { * @see Transaction#rollback() */ public static void rollbackTransaction() { - Session session = HibernateUtil.getCurrentSession(); + Session session = getCurrentSession(); if (session.getTransaction().getStatus() == TransactionStatus.ACTIVE || session.getTransaction().getStatus() == TransactionStatus.MARKED_ROLLBACK) { session.getTransaction().rollback(); @@ -212,10 +212,10 @@ public static void rollbackTransaction() { /** * Commit the current resource transaction, writing any unflushed changes to the database. - * @see Session#commit() + * @see Transaction#commit() */ public static void commitTransaction() { - Transaction transaction = HibernateUtil.getCurrentSession().getTransaction(); + Transaction transaction = getCurrentSession().getTransaction(); transaction.commit(); } @@ -224,7 +224,7 @@ public static void commitTransaction() { * @see Session#flush() */ public static void flushSession() { - HibernateUtil.getCurrentSession().flush(); + getCurrentSession().flush(); } /** @@ -232,7 +232,7 @@ public static void flushSession() { * @see Session#clear() */ public static void clearSession() { - HibernateUtil.getCurrentSession().clear(); + getCurrentSession().clear(); } /** @@ -241,7 +241,7 @@ public static void clearSession() { * @see Session#get(Class, Object) */ public static T get(Class entityType, Object id) { - return HibernateUtil.getCurrentSession().get(entityType, id); + return getCurrentSession().get(entityType, id); } /** @@ -250,7 +250,7 @@ public static T get(Class entityType, Object id) { * @see Session#get(Class, Object) */ public static T getBySimpleNaturalId(Class entityType, Object id) { - return HibernateUtil.getCurrentSession().bySimpleNaturalId(entityType).load(id); + return getCurrentSession().bySimpleNaturalId(entityType).load(id); } /** @@ -258,7 +258,7 @@ public static T getBySimpleNaturalId(Class entityType, * @see Session#merge(E) */ public static E merge(E object) { - return HibernateUtil.getCurrentSession().merge(object); + return getCurrentSession().merge(object); } /** @@ -266,7 +266,7 @@ public static E merge(E object) { * @see Session#persist(Object) */ public static void persist(BaseEntity entity) { - HibernateUtil.getCurrentSession().persist(entity); + getCurrentSession().persist(entity); } /** @@ -274,14 +274,14 @@ public static void persist(BaseEntity entity) { * @see Session#remove(Object) */ public static void remove(BaseEntity entity) { - HibernateUtil.getCurrentSession().remove(entity); + getCurrentSession().remove(entity); } /** * Create and execute a {@code MutationQuery} for the given delete criteria tree. */ public static void executeDelete(CriteriaDelete cd) { - HibernateUtil.getCurrentSession().createMutationQuery(cd).executeUpdate(); + getCurrentSession().createMutationQuery(cd).executeUpdate(); } /** @@ -291,7 +291,7 @@ public static void executeDelete(CriteriaDelete cd) { * @see Session#getReference(Class, Object) */ public static T getReference(Class entityType, Object id) { - return HibernateUtil.getCurrentSession().getReference(entityType, id); + return getCurrentSession().getReference(entityType, id); } } diff --git a/src/main/java/teammates/common/util/HttpRequestHelper.java b/src/main/java/teammates/common/util/HttpRequestHelper.java index a51686539c0..a8b4a018756 100644 --- a/src/main/java/teammates/common/util/HttpRequestHelper.java +++ b/src/main/java/teammates/common/util/HttpRequestHelper.java @@ -9,8 +9,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; /** * Holds {@link HttpServletRequest}-related helper functions. diff --git a/src/main/java/teammates/common/util/JsonUtils.java b/src/main/java/teammates/common/util/JsonUtils.java index 7f121801e05..03505a59307 100644 --- a/src/main/java/teammates/common/util/JsonUtils.java +++ b/src/main/java/teammates/common/util/JsonUtils.java @@ -6,6 +6,8 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; +import jakarta.persistence.OneToMany; + import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; @@ -48,8 +50,6 @@ import teammates.storage.sqlentity.responses.FeedbackRubricResponse; import teammates.storage.sqlentity.responses.FeedbackTextResponse; -import jakarta.persistence.OneToMany; - /** * Provides means to handle, manipulate, and convert JSON objects to/from strings. */ @@ -153,7 +153,7 @@ public static JsonElement parse(String json) { return JsonParser.parseString(json); } - private static class HibernateExclusionStrategy implements ExclusionStrategy { + private static final class HibernateExclusionStrategy implements ExclusionStrategy { @Override public boolean shouldSkipField(FieldAttributes f) { @@ -167,7 +167,7 @@ public boolean shouldSkipClass(Class clazz) { } } - private static class UserAdapter implements JsonSerializer, JsonDeserializer { + private static final class UserAdapter implements JsonSerializer, JsonDeserializer { @Override public JsonElement serialize(User user, Type type, JsonSerializationContext context) { @@ -196,7 +196,7 @@ public User deserialize(JsonElement element, Type type, JsonDeserializationConte } } - private static class InstantAdapter implements JsonSerializer, JsonDeserializer { + private static final class InstantAdapter implements JsonSerializer, JsonDeserializer { @Override public JsonElement serialize(Instant instant, Type type, JsonSerializationContext context) { @@ -213,7 +213,7 @@ public Instant deserialize(JsonElement element, Type type, JsonDeserializationCo } } - private static class ZoneIdAdapter implements JsonSerializer, JsonDeserializer { + private static final class ZoneIdAdapter implements JsonSerializer, JsonDeserializer { @Override public JsonElement serialize(ZoneId zoneId, Type type, JsonSerializationContext context) { @@ -230,7 +230,7 @@ public ZoneId deserialize(JsonElement element, Type type, JsonDeserializationCon } } - private static class DurationMinutesAdapter implements JsonSerializer, JsonDeserializer { + private static final class DurationMinutesAdapter implements JsonSerializer, JsonDeserializer { @Override public JsonElement serialize(Duration duration, Type type, JsonSerializationContext context) { @@ -247,7 +247,7 @@ public Duration deserialize(JsonElement element, Type type, JsonDeserializationC } } - private static class FeedbackResponseAdapter implements JsonSerializer, + private static final class FeedbackResponseAdapter implements JsonSerializer, JsonDeserializer { @Override @@ -306,7 +306,7 @@ public FeedbackResponse deserialize(JsonElement json, Type typeOfT, JsonDeserial } } - private static class FeedbackResponseDetailsAdapter implements JsonSerializer, + private static final class FeedbackResponseDetailsAdapter implements JsonSerializer, JsonDeserializer { @Override @@ -323,7 +323,7 @@ public FeedbackResponseDetails deserialize(JsonElement json, Type typeOfT, JsonD } - private static class FeedbackQuestionAdapter implements JsonSerializer, + private static final class FeedbackQuestionAdapter implements JsonSerializer, JsonDeserializer { @Override @@ -382,7 +382,7 @@ public FeedbackQuestion deserialize(JsonElement json, Type typeOfT, JsonDeserial } } - private static class FeedbackQuestionDetailsAdapter implements JsonSerializer, + private static final class FeedbackQuestionDetailsAdapter implements JsonSerializer, JsonDeserializer { @Override @@ -398,7 +398,7 @@ public FeedbackQuestionDetails deserialize(JsonElement json, Type typeOfT, JsonD } } - private static class LogDetailsAdapter implements JsonSerializer, JsonDeserializer { + private static final class LogDetailsAdapter implements JsonSerializer, JsonDeserializer { @Override public JsonElement serialize(LogDetails src, Type typeOfSrc, JsonSerializationContext context) { diff --git a/src/main/java/teammates/common/util/Logger.java b/src/main/java/teammates/common/util/Logger.java index bf3bb487da3..c48061cd670 100644 --- a/src/main/java/teammates/common/util/Logger.java +++ b/src/main/java/teammates/common/util/Logger.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import com.google.common.reflect.TypeToken; diff --git a/src/main/java/teammates/common/util/RequestTracer.java b/src/main/java/teammates/common/util/RequestTracer.java index d908f5c378e..2ad63f37f78 100644 --- a/src/main/java/teammates/common/util/RequestTracer.java +++ b/src/main/java/teammates/common/util/RequestTracer.java @@ -78,7 +78,7 @@ public static void init(String traceId, String spanId, int timeoutInSeconds) { THREAD_LOCAL.set(new RequestTrace(traceId, spanId, timeoutInSeconds)); } - private static class RequestTrace { + private static final class RequestTrace { private final String traceId; private final String spanId; private final long initTimestamp; diff --git a/src/main/java/teammates/logic/api/Logic.java b/src/main/java/teammates/logic/api/Logic.java index 12bf9b5e8dd..4c0835e626c 100644 --- a/src/main/java/teammates/logic/api/Logic.java +++ b/src/main/java/teammates/logic/api/Logic.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.DataBundle; import teammates.common.datatransfer.FeedbackQuestionRecipient; diff --git a/src/main/java/teammates/logic/api/TaskQueuer.java b/src/main/java/teammates/logic/api/TaskQueuer.java index 2ea43cf850b..6d7e9acdbeb 100644 --- a/src/main/java/teammates/logic/api/TaskQueuer.java +++ b/src/main/java/teammates/logic/api/TaskQueuer.java @@ -194,9 +194,9 @@ public void scheduleEmailsForSending(List emails) { int oneHourInMillis = 60 * 60 * 1000; int emailIntervalMillis = Math.min(5000, oneHourInMillis / emails.size()); - int numberOfEmailsSent = 0; + long numberOfEmailsSent = 0L; for (EmailWrapper email : emails) { - long emailDelayTimer = (long) numberOfEmailsSent * (long) emailIntervalMillis; + long emailDelayTimer = numberOfEmailsSent * emailIntervalMillis; scheduleEmailForSending(email, emailDelayTimer); numberOfEmailsSent++; } diff --git a/src/main/java/teammates/logic/core/FeedbackQuestionsLogic.java b/src/main/java/teammates/logic/core/FeedbackQuestionsLogic.java index 59633bbfff3..4e751fd5f25 100644 --- a/src/main/java/teammates/logic/core/FeedbackQuestionsLogic.java +++ b/src/main/java/teammates/logic/core/FeedbackQuestionsLogic.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.AttributesDeletionQuery; import teammates.common.datatransfer.CourseRoster; diff --git a/src/main/java/teammates/logic/core/FeedbackResponseCommentsLogic.java b/src/main/java/teammates/logic/core/FeedbackResponseCommentsLogic.java index 92c76ec58cb..857d92daf59 100644 --- a/src/main/java/teammates/logic/core/FeedbackResponseCommentsLogic.java +++ b/src/main/java/teammates/logic/core/FeedbackResponseCommentsLogic.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.AttributesDeletionQuery; import teammates.common.datatransfer.CourseRoster; diff --git a/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java b/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java index c16af38d37b..74a5a99dcdf 100644 --- a/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java +++ b/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.AttributesDeletionQuery; import teammates.common.datatransfer.CourseRoster; @@ -1158,7 +1158,7 @@ boolean canInstructorsSeeComment(FeedbackResponseCommentAttributes feedbackRespo /** * Set contains only unique response. */ - private static class UniqueResponsesSet { + private static final class UniqueResponsesSet { private final Set responseIds; private final List responses; diff --git a/src/main/java/teammates/logic/core/LogicStarter.java b/src/main/java/teammates/logic/core/LogicStarter.java index e82ba1d8c4d..a3db4ad2ff3 100644 --- a/src/main/java/teammates/logic/core/LogicStarter.java +++ b/src/main/java/teammates/logic/core/LogicStarter.java @@ -1,7 +1,7 @@ package teammates.logic.core; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import teammates.common.util.Logger; diff --git a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java index be758f8809c..3da2dc68ef8 100644 --- a/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java +++ b/src/main/java/teammates/logic/external/GoogleCloudLoggingService.java @@ -298,7 +298,7 @@ private List convertLogSearchParams(LogSearchParams s, int page /** * Contains params to be used for the searching of logs. */ - private static class LogSearchParams { + private static final class LogSearchParams { private final List logName = new ArrayList<>(); private String resourceType; private QueryLogsParams queryLogsParams; diff --git a/src/main/java/teammates/logic/external/MailgunService.java b/src/main/java/teammates/logic/external/MailgunService.java index 1fd74de88a7..4256b64975d 100644 --- a/src/main/java/teammates/logic/external/MailgunService.java +++ b/src/main/java/teammates/logic/external/MailgunService.java @@ -20,7 +20,7 @@ /** * Email sender service provided by Mailgun. * - * @see https://cloud.google.com/appengine/docs/standard/java11/sending-messages#mailgun + * @see https://cloud.google.com/appengine/docs/standard/sending-messages#mailgun * @see FormDataMultiPart */ public class MailgunService implements EmailSenderService { diff --git a/src/main/java/teammates/logic/external/MailjetService.java b/src/main/java/teammates/logic/external/MailjetService.java index e319690d26a..d54e5871e55 100644 --- a/src/main/java/teammates/logic/external/MailjetService.java +++ b/src/main/java/teammates/logic/external/MailjetService.java @@ -20,7 +20,7 @@ /** * Email sender service provided by Mailjet. * - * @see https://cloud.google.com/appengine/docs/standard/java11/sending-messages#mailjet + * @see https://cloud.google.com/appengine/docs/standard/sending-messages#mailjet * @see MailjetClient * @see MailjetRequest * @see MailjetResponse diff --git a/src/main/java/teammates/logic/external/SendgridService.java b/src/main/java/teammates/logic/external/SendgridService.java index df5ce52860e..7526ca946e1 100644 --- a/src/main/java/teammates/logic/external/SendgridService.java +++ b/src/main/java/teammates/logic/external/SendgridService.java @@ -22,7 +22,7 @@ /** * Email sender service provided by SendGrid. * - * @see https://cloud.google.com/appengine/docs/standard/java11/sending-messages#sendgrid + * @see https://cloud.google.com/appengine/docs/standard/sending-messages#sendgrid * @see SendGrid */ public class SendgridService implements EmailSenderService { diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 86f749b5610..42cbd8a6eb2 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -6,7 +6,7 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.FeedbackQuestionRecipient; diff --git a/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java index 02dd878541c..7ccf253a0e0 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java @@ -10,7 +10,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.FeedbackQuestionRecipient; diff --git a/src/main/java/teammates/sqllogic/core/FeedbackResponseCommentsLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackResponseCommentsLogic.java index 7883c7e5432..e94c0ea4538 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackResponseCommentsLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackResponseCommentsLogic.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.SqlCourseRoster; diff --git a/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java index d83d3991381..bd2b6b43072 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.FeedbackResultFetchType; diff --git a/src/main/java/teammates/sqllogic/core/LogicStarter.java b/src/main/java/teammates/sqllogic/core/LogicStarter.java index ba67aff710a..a5ca2ccd520 100644 --- a/src/main/java/teammates/sqllogic/core/LogicStarter.java +++ b/src/main/java/teammates/sqllogic/core/LogicStarter.java @@ -1,7 +1,7 @@ package teammates.sqllogic.core; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import teammates.common.util.Logger; import teammates.storage.sqlapi.AccountRequestsDb; diff --git a/src/main/java/teammates/storage/api/FeedbackQuestionsDb.java b/src/main/java/teammates/storage/api/FeedbackQuestionsDb.java index 1a71a6270f1..dd632fd7209 100644 --- a/src/main/java/teammates/storage/api/FeedbackQuestionsDb.java +++ b/src/main/java/teammates/storage/api/FeedbackQuestionsDb.java @@ -216,13 +216,13 @@ private List getFeedbackQuestionEntitiesForGiverType( private boolean hasFeedbackQuestionEntitiesForGiverType( String feedbackSessionName, String courseId, FeedbackParticipantType giverType) { - return load() + return !load() .filter("feedbackSessionName =", feedbackSessionName) .filter("courseId =", courseId) .filter("giverType =", giverType) .keys() .list() - .size() != 0; + .isEmpty(); } @Override diff --git a/src/main/java/teammates/storage/api/OfyHelper.java b/src/main/java/teammates/storage/api/OfyHelper.java index 7f89b75ed02..d25af1c0c65 100644 --- a/src/main/java/teammates/storage/api/OfyHelper.java +++ b/src/main/java/teammates/storage/api/OfyHelper.java @@ -1,8 +1,9 @@ package teammates.storage.api; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import com.google.cloud.NoCredentials; import com.google.cloud.datastore.DatastoreOptions; import com.googlecode.objectify.ObjectifyFactory; import com.googlecode.objectify.ObjectifyService; @@ -31,6 +32,7 @@ private static void initializeDatastore() { DatastoreOptions.Builder builder = DatastoreOptions.newBuilder().setProjectId(Config.APP_ID); if (Config.IS_DEV_SERVER) { builder.setHost("http://localhost:" + Config.APP_LOCALDATASTORE_PORT); + builder.setCredentials(NoCredentials.getInstance()); } ObjectifyService.init(new ObjectifyFactory(builder.build().getService())); } diff --git a/src/main/java/teammates/storage/entity/FeedbackSession.java b/src/main/java/teammates/storage/entity/FeedbackSession.java index 06c987af83a..a2d9674b293 100644 --- a/src/main/java/teammates/storage/entity/FeedbackSession.java +++ b/src/main/java/teammates/storage/entity/FeedbackSession.java @@ -10,6 +10,8 @@ import com.googlecode.objectify.annotation.Translate; import com.googlecode.objectify.annotation.Unindex; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Represents an instructor-created Feedback Session. */ @@ -25,6 +27,7 @@ public class FeedbackSession extends BaseEntity { * @see #generateId(String, String) */ @SuppressWarnings({"PMD.UnusedPrivateField", "PMD.SingularField"}) + @SuppressFBWarnings("URF_UNREAD_FIELD") @Id private transient String feedbackSessionId; diff --git a/src/main/java/teammates/storage/search/SearchManagerStarter.java b/src/main/java/teammates/storage/search/SearchManagerStarter.java index f6b41329947..04fc79aa31f 100644 --- a/src/main/java/teammates/storage/search/SearchManagerStarter.java +++ b/src/main/java/teammates/storage/search/SearchManagerStarter.java @@ -1,7 +1,7 @@ package teammates.storage.search; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import teammates.common.util.Config; diff --git a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java index c0fc9c74b0b..ed335ae8e93 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java @@ -8,6 +8,11 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -17,11 +22,6 @@ import teammates.storage.sqlsearch.AccountRequestSearchManager; import teammates.storage.sqlsearch.SearchManagerFactory; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - /** * Generates CRUD operations for AccountRequest. * diff --git a/src/main/java/teammates/storage/sqlapi/AccountsDb.java b/src/main/java/teammates/storage/sqlapi/AccountsDb.java index 7930d1c28c7..24a53b53d29 100644 --- a/src/main/java/teammates/storage/sqlapi/AccountsDb.java +++ b/src/main/java/teammates/storage/sqlapi/AccountsDb.java @@ -6,16 +6,16 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; import teammates.common.util.HibernateUtil; import teammates.storage.sqlentity.Account; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for accounts. * diff --git a/src/main/java/teammates/storage/sqlapi/CoursesDb.java b/src/main/java/teammates/storage/sqlapi/CoursesDb.java index 710eeb04bd9..f316c06f424 100644 --- a/src/main/java/teammates/storage/sqlapi/CoursesDb.java +++ b/src/main/java/teammates/storage/sqlapi/CoursesDb.java @@ -6,6 +6,13 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; + import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -14,13 +21,6 @@ import teammates.storage.sqlentity.Section; import teammates.storage.sqlentity.Team; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaDelete; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Root; -import jakarta.persistence.criteria.Subquery; - /** * Handles CRUD operations for courses. * diff --git a/src/main/java/teammates/storage/sqlapi/DeadlineExtensionsDb.java b/src/main/java/teammates/storage/sqlapi/DeadlineExtensionsDb.java index c1042ea2abf..7526033dd53 100644 --- a/src/main/java/teammates/storage/sqlapi/DeadlineExtensionsDb.java +++ b/src/main/java/teammates/storage/sqlapi/DeadlineExtensionsDb.java @@ -7,6 +7,12 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; + import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -16,12 +22,6 @@ import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.User; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for deadline extensions. * diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java index 5a765210251..ba4ac18b394 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java @@ -5,6 +5,11 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.InvalidParametersException; @@ -13,11 +18,6 @@ import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for feedback questions. * diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackResponseCommentsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackResponseCommentsDb.java index cd0f59c58c8..09b56bacab8 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackResponseCommentsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackResponseCommentsDb.java @@ -6,6 +6,11 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; + import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -17,11 +22,6 @@ import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.Section; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for feedbackResponseComments. * diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java index 7c79986719f..5dcf7ab375e 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java @@ -6,6 +6,14 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; + import teammates.common.datatransfer.FeedbackResultFetchType; import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; @@ -17,14 +25,6 @@ import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.Section; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaDelete; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; -import jakarta.persistence.criteria.Subquery; - /** * Handles CRUD operations for feedbackResponses. * diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java index c9f6af098ff..48c9e23f7be 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackSessionLogsDb.java @@ -5,17 +5,17 @@ import java.util.List; import java.util.UUID; -import teammates.common.util.HibernateUtil; -import teammates.storage.sqlentity.FeedbackSession; -import teammates.storage.sqlentity.FeedbackSessionLog; -import teammates.storage.sqlentity.Student; - import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; +import teammates.common.util.HibernateUtil; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.FeedbackSessionLog; +import teammates.storage.sqlentity.Student; + /** * Handles CRUD operations for feedback session logs. * diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java index 078d453da2c..1a666124c84 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java @@ -8,6 +8,11 @@ import java.util.UUID; import java.util.stream.Collectors; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; + import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -16,11 +21,6 @@ import teammates.storage.sqlentity.Course; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for feedback sessions. * diff --git a/src/main/java/teammates/storage/sqlapi/NotificationsDb.java b/src/main/java/teammates/storage/sqlapi/NotificationsDb.java index 85e00e48b47..3a3c114e42f 100644 --- a/src/main/java/teammates/storage/sqlapi/NotificationsDb.java +++ b/src/main/java/teammates/storage/sqlapi/NotificationsDb.java @@ -4,17 +4,17 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import teammates.common.datatransfer.NotificationTargetUser; import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.InvalidParametersException; import teammates.common.util.HibernateUtil; import teammates.storage.sqlentity.Notification; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for notifications. * diff --git a/src/main/java/teammates/storage/sqlapi/UsageStatisticsDb.java b/src/main/java/teammates/storage/sqlapi/UsageStatisticsDb.java index e989975ea0c..88c9be32bc3 100644 --- a/src/main/java/teammates/storage/sqlapi/UsageStatisticsDb.java +++ b/src/main/java/teammates/storage/sqlapi/UsageStatisticsDb.java @@ -3,13 +3,13 @@ import java.time.Instant; import java.util.List; -import teammates.common.util.HibernateUtil; -import teammates.storage.sqlentity.UsageStatistics; - import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; +import teammates.common.util.HibernateUtil; +import teammates.storage.sqlentity.UsageStatistics; + /** * Handles CRUD operations for usage statistics. * diff --git a/src/main/java/teammates/storage/sqlapi/UsersDb.java b/src/main/java/teammates/storage/sqlapi/UsersDb.java index 3621f5c6224..56a370cf05a 100644 --- a/src/main/java/teammates/storage/sqlapi/UsersDb.java +++ b/src/main/java/teammates/storage/sqlapi/UsersDb.java @@ -7,6 +7,12 @@ import java.util.List; import java.util.UUID; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + import teammates.common.exception.EntityAlreadyExistsException; import teammates.common.exception.EntityDoesNotExistException; import teammates.common.exception.InvalidParametersException; @@ -23,12 +29,6 @@ import teammates.storage.sqlsearch.SearchManagerFactory; import teammates.storage.sqlsearch.StudentSearchManager; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; - /** * Handles CRUD operations for users. * diff --git a/src/main/java/teammates/storage/sqlentity/Account.java b/src/main/java/teammates/storage/sqlentity/Account.java index 3a5ea49d7f1..a02aa77ecc9 100644 --- a/src/main/java/teammates/storage/sqlentity/Account.java +++ b/src/main/java/teammates/storage/sqlentity/Account.java @@ -6,6 +6,13 @@ import java.util.Objects; import java.util.UUID; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -14,13 +21,6 @@ import teammates.common.util.FieldValidator; import teammates.common.util.SanitizationHelper; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; - /** * Represents a unique account in the system. */ diff --git a/src/main/java/teammates/storage/sqlentity/AccountRequest.java b/src/main/java/teammates/storage/sqlentity/AccountRequest.java index 97a65e6b468..70937c8243c 100644 --- a/src/main/java/teammates/storage/sqlentity/AccountRequest.java +++ b/src/main/java/teammates/storage/sqlentity/AccountRequest.java @@ -7,6 +7,14 @@ import java.util.Objects; import java.util.UUID; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; + import org.hibernate.annotations.UpdateTimestamp; import teammates.common.datatransfer.AccountRequestStatus; @@ -16,14 +24,6 @@ import teammates.common.util.SanitizationHelper; import teammates.common.util.StringHelper; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.UniqueConstraint; - /** * Entity for AccountRequests. */ diff --git a/src/main/java/teammates/storage/sqlentity/BaseEntity.java b/src/main/java/teammates/storage/sqlentity/BaseEntity.java index 3e5aa8373ca..2fce3df052c 100644 --- a/src/main/java/teammates/storage/sqlentity/BaseEntity.java +++ b/src/main/java/teammates/storage/sqlentity/BaseEntity.java @@ -4,6 +4,11 @@ import java.time.Instant; import java.util.List; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Converter; +import jakarta.persistence.MappedSuperclass; + import org.hibernate.annotations.CreationTimestamp; import com.google.common.reflect.TypeToken; @@ -15,11 +20,6 @@ import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.common.util.JsonUtils; -import jakarta.persistence.AttributeConverter; -import jakarta.persistence.Column; -import jakarta.persistence.Converter; -import jakarta.persistence.MappedSuperclass; - /** * Base class for all entities. */ diff --git a/src/main/java/teammates/storage/sqlentity/Course.java b/src/main/java/teammates/storage/sqlentity/Course.java index 2b0fac83767..137b2df27f3 100644 --- a/src/main/java/teammates/storage/sqlentity/Course.java +++ b/src/main/java/teammates/storage/sqlentity/Course.java @@ -5,13 +5,6 @@ import java.util.List; import java.util.Objects; -import org.apache.commons.lang.StringUtils; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.util.Const; -import teammates.common.util.FieldValidator; -import teammates.common.util.SanitizationHelper; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -19,6 +12,13 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import org.apache.commons.lang.StringUtils; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.util.Const; +import teammates.common.util.FieldValidator; +import teammates.common.util.SanitizationHelper; + /** * Represents a course. */ diff --git a/src/main/java/teammates/storage/sqlentity/DeadlineExtension.java b/src/main/java/teammates/storage/sqlentity/DeadlineExtension.java index 635b161afd3..7dae78a6ba4 100644 --- a/src/main/java/teammates/storage/sqlentity/DeadlineExtension.java +++ b/src/main/java/teammates/storage/sqlentity/DeadlineExtension.java @@ -6,12 +6,6 @@ import java.util.Objects; import java.util.UUID; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.util.FieldValidator; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -19,6 +13,12 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.util.FieldValidator; + /** * Represents a deadline extension entity. */ diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackQuestion.java b/src/main/java/teammates/storage/sqlentity/FeedbackQuestion.java index f15885dcaf9..7cfdeeee977 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackQuestion.java @@ -6,6 +6,20 @@ import java.util.Objects; import java.util.UUID; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + import org.hibernate.annotations.UpdateTimestamp; import teammates.common.datatransfer.FeedbackParticipantType; @@ -21,20 +35,6 @@ import teammates.storage.sqlentity.questions.FeedbackRubricQuestion; import teammates.storage.sqlentity.questions.FeedbackTextQuestion; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Id; -import jakarta.persistence.Inheritance; -import jakarta.persistence.InheritanceType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; - /** * Represents a feedback question. */ diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackResponse.java b/src/main/java/teammates/storage/sqlentity/FeedbackResponse.java index eb895e3d9be..1d727a957de 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackResponse.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackResponse.java @@ -6,6 +6,17 @@ import java.util.Objects; import java.util.UUID; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + import org.hibernate.annotations.UpdateTimestamp; import teammates.common.datatransfer.questions.FeedbackResponseDetails; @@ -19,17 +30,6 @@ import teammates.storage.sqlentity.responses.FeedbackRubricResponse; import teammates.storage.sqlentity.responses.FeedbackTextResponse; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Inheritance; -import jakarta.persistence.InheritanceType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; - /** * Represents a Feedback Response. */ @@ -150,7 +150,7 @@ public static FeedbackResponse updateResponse( Section giverSection, String receiver, Section receiverSection, FeedbackResponseDetails responseDetails ) { - FeedbackResponse updatedFeedbackResponse = FeedbackResponse.makeResponse( + FeedbackResponse updatedFeedbackResponse = makeResponse( feedbackQuestion, giver, giverSection, diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackResponseComment.java b/src/main/java/teammates/storage/sqlentity/FeedbackResponseComment.java index 29f3824dbba..b668996f6bb 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackResponseComment.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackResponseComment.java @@ -5,14 +5,6 @@ import java.util.List; import java.util.Objects; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.datatransfer.FeedbackParticipantType; -import teammates.common.util.FieldValidator; -import teammates.common.util.SanitizationHelper; - import jakarta.persistence.Column; import jakarta.persistence.Convert; import jakarta.persistence.Entity; @@ -22,6 +14,14 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.datatransfer.FeedbackParticipantType; +import teammates.common.util.FieldValidator; +import teammates.common.util.SanitizationHelper; + /** * Represents a feedback response comment. */ diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java index 9f91c1b552f..b82c45e01e5 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java @@ -7,15 +7,6 @@ import java.util.Objects; import java.util.UUID; -import org.apache.commons.lang.StringUtils; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.util.Const; -import teammates.common.util.FieldValidator; -import teammates.common.util.SanitizationHelper; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -27,6 +18,15 @@ import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; +import org.apache.commons.lang.StringUtils; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.util.Const; +import teammates.common.util.FieldValidator; +import teammates.common.util.SanitizationHelper; + /** * Represents a course entity. */ diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java index 15daeb607b5..7027f418288 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSessionLog.java @@ -6,13 +6,6 @@ import java.util.Objects; import java.util.UUID; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; - -import teammates.common.datatransfer.logs.FeedbackSessionLogType; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -22,6 +15,13 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; + +import teammates.common.datatransfer.logs.FeedbackSessionLogType; + /** * Represents a feedback session log. */ diff --git a/src/main/java/teammates/storage/sqlentity/Instructor.java b/src/main/java/teammates/storage/sqlentity/Instructor.java index 6848d80ac4b..418d946a603 100644 --- a/src/main/java/teammates/storage/sqlentity/Instructor.java +++ b/src/main/java/teammates/storage/sqlentity/Instructor.java @@ -4,6 +4,13 @@ import java.util.List; import java.util.Map; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Table; + import teammates.common.datatransfer.InstructorPermissionRole; import teammates.common.datatransfer.InstructorPermissionSet; import teammates.common.datatransfer.InstructorPrivileges; @@ -12,13 +19,6 @@ import teammates.common.util.FieldValidator; import teammates.common.util.SanitizationHelper; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Table; - /** * Represents an Instructor. */ diff --git a/src/main/java/teammates/storage/sqlentity/Notification.java b/src/main/java/teammates/storage/sqlentity/Notification.java index 3707089bb60..f167af929fc 100644 --- a/src/main/java/teammates/storage/sqlentity/Notification.java +++ b/src/main/java/teammates/storage/sqlentity/Notification.java @@ -6,15 +6,6 @@ import java.util.Objects; import java.util.UUID; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.datatransfer.NotificationStyle; -import teammates.common.datatransfer.NotificationTargetUser; -import teammates.common.util.FieldValidator; -import teammates.common.util.SanitizationHelper; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -24,6 +15,15 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.datatransfer.NotificationStyle; +import teammates.common.datatransfer.NotificationTargetUser; +import teammates.common.util.FieldValidator; +import teammates.common.util.SanitizationHelper; + /** * Represents a unique notification in the system. */ diff --git a/src/main/java/teammates/storage/sqlentity/Section.java b/src/main/java/teammates/storage/sqlentity/Section.java index 7dba45edd8e..b1a5f076540 100644 --- a/src/main/java/teammates/storage/sqlentity/Section.java +++ b/src/main/java/teammates/storage/sqlentity/Section.java @@ -6,13 +6,6 @@ import java.util.Objects; import java.util.UUID; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.util.FieldValidator; -import teammates.common.util.SanitizationHelper; - import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -22,6 +15,13 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.util.FieldValidator; +import teammates.common.util.SanitizationHelper; + /** * Represents a Section. */ diff --git a/src/main/java/teammates/storage/sqlentity/Student.java b/src/main/java/teammates/storage/sqlentity/Student.java index 3c4601dbe07..0a2cf3273ce 100644 --- a/src/main/java/teammates/storage/sqlentity/Student.java +++ b/src/main/java/teammates/storage/sqlentity/Student.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + import teammates.common.util.Config; import teammates.common.util.Const; import teammates.common.util.FieldValidator; import teammates.common.util.SanitizationHelper; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; - /** * Represents a Student. */ diff --git a/src/main/java/teammates/storage/sqlentity/Team.java b/src/main/java/teammates/storage/sqlentity/Team.java index 587d5ceefe6..bff9d7dfb16 100644 --- a/src/main/java/teammates/storage/sqlentity/Team.java +++ b/src/main/java/teammates/storage/sqlentity/Team.java @@ -6,10 +6,6 @@ import java.util.Objects; import java.util.UUID; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.util.FieldValidator; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -18,6 +14,10 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.util.FieldValidator; + /** * Represents a Team. */ diff --git a/src/main/java/teammates/storage/sqlentity/User.java b/src/main/java/teammates/storage/sqlentity/User.java index 8e4a44bf059..cdee862bc96 100644 --- a/src/main/java/teammates/storage/sqlentity/User.java +++ b/src/main/java/teammates/storage/sqlentity/User.java @@ -5,11 +5,6 @@ import java.util.Objects; import java.util.UUID; -import org.hibernate.annotations.UpdateTimestamp; - -import teammates.common.util.SanitizationHelper; -import teammates.common.util.StringHelper; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -20,6 +15,11 @@ import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; +import org.hibernate.annotations.UpdateTimestamp; + +import teammates.common.util.SanitizationHelper; +import teammates.common.util.StringHelper; + /** * Represents a User. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackConstantSumQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackConstantSumQuestion.java index 8b5b559c1d3..add060fd134 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackConstantSumQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackConstantSumQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackConstantSumQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a constant sum question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackContributionQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackContributionQuestion.java index dbd6474c3c0..fea203cc443 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackContributionQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackContributionQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackContributionQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a contribution question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackMcqQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackMcqQuestion.java index 3cf3821776b..593d7c521c0 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackMcqQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackMcqQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackMcqQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents an mcq question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackMsqQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackMsqQuestion.java index 329e194474e..18d83168a89 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackMsqQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackMsqQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackMsqQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents an msq question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackNumericalScaleQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackNumericalScaleQuestion.java index 7da16e3eee0..5f5c629d8f6 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackNumericalScaleQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackNumericalScaleQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackNumericalScaleQuestionDetails; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a numerical scale question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java index ba135c7cae8..1c40fe12cb7 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.common.datatransfer.questions.FeedbackRankOptionsQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a rank options question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankRecipientsQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankRecipientsQuestion.java index 4f33ed813c7..7ade04fd048 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankRecipientsQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRankRecipientsQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.common.datatransfer.questions.FeedbackRankRecipientsQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a rank recipients question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRubricQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRubricQuestion.java index cbd3b1d4813..4bf2911a7af 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackRubricQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackRubricQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.common.datatransfer.questions.FeedbackRubricQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a rubric question. */ diff --git a/src/main/java/teammates/storage/sqlentity/questions/FeedbackTextQuestion.java b/src/main/java/teammates/storage/sqlentity/questions/FeedbackTextQuestion.java index 10ee7ca42eb..6e71281a1ab 100644 --- a/src/main/java/teammates/storage/sqlentity/questions/FeedbackTextQuestion.java +++ b/src/main/java/teammates/storage/sqlentity/questions/FeedbackTextQuestion.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.questions.FeedbackQuestionDetails; import teammates.common.datatransfer.questions.FeedbackTextQuestionDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackSession; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a text question. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackConstantSumResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackConstantSumResponse.java index 83a54c4c195..72f5736fa4d 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackConstantSumResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackConstantSumResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackConstantSumResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback constant sum response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackContributionResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackContributionResponse.java index 52b0dcef2f0..0c92a764940 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackContributionResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackContributionResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackContributionResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback contribution response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackMcqResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackMcqResponse.java index 151dfe0e733..a30a4fde99e 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackMcqResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackMcqResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackMcqResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback mcq response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackMsqResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackMsqResponse.java index 4f2aa905f5c..a88f7fcd89e 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackMsqResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackMsqResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackMsqResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback msq response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackNumericalScaleResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackNumericalScaleResponse.java index a951d285356..a536dcc6195 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackNumericalScaleResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackNumericalScaleResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackNumericalScaleResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback numerical scale response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankOptionsResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankOptionsResponse.java index 00c542bee26..c02fa900a6f 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankOptionsResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankOptionsResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackRankOptionsResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback rank options response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankRecipientsResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankRecipientsResponse.java index 9961fb7de11..908b3a5734c 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankRecipientsResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackRankRecipientsResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackRankRecipientsResponseDetails; import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback rank recipients response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackRubricResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackRubricResponse.java index 46997775a9b..e8a984aa5b8 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackRubricResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackRubricResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.common.datatransfer.questions.FeedbackRubricResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a feedback rubric response. */ diff --git a/src/main/java/teammates/storage/sqlentity/responses/FeedbackTextResponse.java b/src/main/java/teammates/storage/sqlentity/responses/FeedbackTextResponse.java index a56f6a58ab1..bc7f583a33f 100644 --- a/src/main/java/teammates/storage/sqlentity/responses/FeedbackTextResponse.java +++ b/src/main/java/teammates/storage/sqlentity/responses/FeedbackTextResponse.java @@ -1,16 +1,16 @@ package teammates.storage.sqlentity.responses; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; + import teammates.common.datatransfer.questions.FeedbackResponseDetails; import teammates.common.datatransfer.questions.FeedbackTextResponseDetails; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; import teammates.storage.sqlentity.Section; -import jakarta.persistence.Column; -import jakarta.persistence.Convert; -import jakarta.persistence.Converter; -import jakarta.persistence.Entity; - /** * Represents a text response. */ diff --git a/src/main/java/teammates/storage/sqlsearch/SearchManagerStarter.java b/src/main/java/teammates/storage/sqlsearch/SearchManagerStarter.java index 3775955a2b5..ce195639299 100644 --- a/src/main/java/teammates/storage/sqlsearch/SearchManagerStarter.java +++ b/src/main/java/teammates/storage/sqlsearch/SearchManagerStarter.java @@ -1,7 +1,7 @@ package teammates.storage.sqlsearch; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import teammates.common.util.Config; diff --git a/src/main/java/teammates/ui/output/AccountRequestData.java b/src/main/java/teammates/ui/output/AccountRequestData.java index 92dc77ed50a..ee006ac2035 100644 --- a/src/main/java/teammates/ui/output/AccountRequestData.java +++ b/src/main/java/teammates/ui/output/AccountRequestData.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.datatransfer.attributes.AccountRequestAttributes; diff --git a/src/main/java/teammates/ui/output/ApiOutput.java b/src/main/java/teammates/ui/output/ApiOutput.java index f5bdc5ca1f1..eaf4ea4f0a8 100644 --- a/src/main/java/teammates/ui/output/ApiOutput.java +++ b/src/main/java/teammates/ui/output/ApiOutput.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Generic output format for all API requests. diff --git a/src/main/java/teammates/ui/output/AuthInfo.java b/src/main/java/teammates/ui/output/AuthInfo.java index 696b2bbed63..91f78627cce 100644 --- a/src/main/java/teammates/ui/output/AuthInfo.java +++ b/src/main/java/teammates/ui/output/AuthInfo.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.UserInfo; diff --git a/src/main/java/teammates/ui/output/CourseData.java b/src/main/java/teammates/ui/output/CourseData.java index 89b751de3fd..b5787bf2f48 100644 --- a/src/main/java/teammates/ui/output/CourseData.java +++ b/src/main/java/teammates/ui/output/CourseData.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.InstructorPermissionSet; import teammates.common.datatransfer.attributes.CourseAttributes; diff --git a/src/main/java/teammates/ui/output/FeedbackQuestionRecipientData.java b/src/main/java/teammates/ui/output/FeedbackQuestionRecipientData.java index 5acd6b0457f..02a07f625a6 100644 --- a/src/main/java/teammates/ui/output/FeedbackQuestionRecipientData.java +++ b/src/main/java/teammates/ui/output/FeedbackQuestionRecipientData.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.FeedbackQuestionRecipient; diff --git a/src/main/java/teammates/ui/output/FeedbackResponseData.java b/src/main/java/teammates/ui/output/FeedbackResponseData.java index 4aa5d084c64..c6b49db91ed 100644 --- a/src/main/java/teammates/ui/output/FeedbackResponseData.java +++ b/src/main/java/teammates/ui/output/FeedbackResponseData.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.attributes.FeedbackResponseAttributes; import teammates.common.datatransfer.questions.FeedbackResponseDetails; diff --git a/src/main/java/teammates/ui/output/FeedbackSessionData.java b/src/main/java/teammates/ui/output/FeedbackSessionData.java index b5aef354d88..a0b2f46b050 100644 --- a/src/main/java/teammates/ui/output/FeedbackSessionData.java +++ b/src/main/java/teammates/ui/output/FeedbackSessionData.java @@ -6,7 +6,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.InstructorPermissionSet; import teammates.common.datatransfer.attributes.FeedbackSessionAttributes; diff --git a/src/main/java/teammates/ui/output/HasResponsesData.java b/src/main/java/teammates/ui/output/HasResponsesData.java index aec14a88dac..1ffe6ff36f3 100644 --- a/src/main/java/teammates/ui/output/HasResponsesData.java +++ b/src/main/java/teammates/ui/output/HasResponsesData.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * The API output format to represent if there are responses. diff --git a/src/main/java/teammates/ui/output/InstructorData.java b/src/main/java/teammates/ui/output/InstructorData.java index e185028ce1e..bb2f4b14499 100644 --- a/src/main/java/teammates/ui/output/InstructorData.java +++ b/src/main/java/teammates/ui/output/InstructorData.java @@ -1,6 +1,6 @@ package teammates.ui.output; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.InstructorPermissionRole; import teammates.common.datatransfer.attributes.InstructorAttributes; diff --git a/src/main/java/teammates/ui/output/SessionResultsData.java b/src/main/java/teammates/ui/output/SessionResultsData.java index 796aba29558..edb63924ee1 100644 --- a/src/main/java/teammates/ui/output/SessionResultsData.java +++ b/src/main/java/teammates/ui/output/SessionResultsData.java @@ -9,7 +9,7 @@ import java.util.Queue; import java.util.Set; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.CourseRoster; import teammates.common.datatransfer.FeedbackParticipantType; @@ -718,7 +718,7 @@ public List getQuestions() { /** * API output format for questions in session results. */ - public static class QuestionOutput { + public static final class QuestionOutput { private final FeedbackQuestionData feedbackQuestion; private final String questionStatistics; @@ -785,7 +785,7 @@ public List> getOtherResponses() { /** * API output format for question responses. */ - public static class ResponseOutput { + public static final class ResponseOutput { private boolean isMissingResponse; @@ -989,7 +989,7 @@ ResponseOutput build() { /** * API output format for response comments. */ - public static class CommentOutput extends FeedbackResponseCommentData { + public static final class CommentOutput extends FeedbackResponseCommentData { @Nullable private String commentGiverName; diff --git a/src/main/java/teammates/ui/output/StudentData.java b/src/main/java/teammates/ui/output/StudentData.java index 21138ae9026..162ea0bf5a5 100644 --- a/src/main/java/teammates/ui/output/StudentData.java +++ b/src/main/java/teammates/ui/output/StudentData.java @@ -2,7 +2,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.storage.sqlentity.Student; diff --git a/src/main/java/teammates/ui/request/AccountCreateRequest.java b/src/main/java/teammates/ui/request/AccountCreateRequest.java index 9e39b524549..3e63e750b9b 100644 --- a/src/main/java/teammates/ui/request/AccountCreateRequest.java +++ b/src/main/java/teammates/ui/request/AccountCreateRequest.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.util.FieldValidator; import teammates.common.util.StringHelper; diff --git a/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java b/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java index 89884e13b7d..d432c629eeb 100644 --- a/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java +++ b/src/main/java/teammates/ui/request/AccountRequestRejectionRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.util.SanitizationHelper; diff --git a/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java b/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java index cc653d79ddb..39895cf5ef2 100644 --- a/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java +++ b/src/main/java/teammates/ui/request/AccountRequestUpdateRequest.java @@ -1,6 +1,6 @@ package teammates.ui.request; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.AccountRequestStatus; import teammates.common.util.SanitizationHelper; diff --git a/src/main/java/teammates/ui/request/FeedbackSessionBasicRequest.java b/src/main/java/teammates/ui/request/FeedbackSessionBasicRequest.java index f1b0b42ed96..a564d1e5616 100644 --- a/src/main/java/teammates/ui/request/FeedbackSessionBasicRequest.java +++ b/src/main/java/teammates/ui/request/FeedbackSessionBasicRequest.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.time.Instant; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.util.Const; import teammates.ui.output.ResponseVisibleSetting; diff --git a/src/main/java/teammates/ui/request/FeedbackSessionCreateRequest.java b/src/main/java/teammates/ui/request/FeedbackSessionCreateRequest.java index fce6ffcf963..b92dcc63431 100644 --- a/src/main/java/teammates/ui/request/FeedbackSessionCreateRequest.java +++ b/src/main/java/teammates/ui/request/FeedbackSessionCreateRequest.java @@ -1,6 +1,6 @@ package teammates.ui.request; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * The request body format for creation of feedback session. diff --git a/src/main/java/teammates/ui/request/InstructorCreateRequest.java b/src/main/java/teammates/ui/request/InstructorCreateRequest.java index f73841665b0..b8bccd89744 100644 --- a/src/main/java/teammates/ui/request/InstructorCreateRequest.java +++ b/src/main/java/teammates/ui/request/InstructorCreateRequest.java @@ -1,6 +1,6 @@ package teammates.ui.request; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import teammates.common.datatransfer.InstructorPermissionRole; diff --git a/src/main/java/teammates/ui/servlets/AuthServlet.java b/src/main/java/teammates/ui/servlets/AuthServlet.java index 45f55b1d858..1cae38e6cc4 100644 --- a/src/main/java/teammates/ui/servlets/AuthServlet.java +++ b/src/main/java/teammates/ui/servlets/AuthServlet.java @@ -4,9 +4,9 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; import com.google.api.client.auth.oauth2.AuthorizationCodeFlow; import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow; diff --git a/src/main/java/teammates/ui/servlets/DevServerLoginServlet.java b/src/main/java/teammates/ui/servlets/DevServerLoginServlet.java index db8f8ebf321..d36082f523c 100644 --- a/src/main/java/teammates/ui/servlets/DevServerLoginServlet.java +++ b/src/main/java/teammates/ui/servlets/DevServerLoginServlet.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/teammates/ui/servlets/HealthCheckServlet.java b/src/main/java/teammates/ui/servlets/HealthCheckServlet.java index f6073cd6757..2488c3c7cb4 100644 --- a/src/main/java/teammates/ui/servlets/HealthCheckServlet.java +++ b/src/main/java/teammates/ui/servlets/HealthCheckServlet.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/teammates/ui/servlets/HibernateContextListener.java b/src/main/java/teammates/ui/servlets/HibernateContextListener.java index 9497dbae1f2..f3dc35ea6ea 100644 --- a/src/main/java/teammates/ui/servlets/HibernateContextListener.java +++ b/src/main/java/teammates/ui/servlets/HibernateContextListener.java @@ -1,7 +1,7 @@ package teammates.ui.servlets; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import teammates.common.util.Config; import teammates.common.util.HibernateUtil; diff --git a/src/main/java/teammates/ui/servlets/LegacyUrlMapper.java b/src/main/java/teammates/ui/servlets/LegacyUrlMapper.java index eb905b9b5f1..b1ecb2a1f16 100644 --- a/src/main/java/teammates/ui/servlets/LegacyUrlMapper.java +++ b/src/main/java/teammates/ui/servlets/LegacyUrlMapper.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/teammates/ui/servlets/LoginServlet.java b/src/main/java/teammates/ui/servlets/LoginServlet.java index a2bfeb76bfa..14c03632ea8 100644 --- a/src/main/java/teammates/ui/servlets/LoginServlet.java +++ b/src/main/java/teammates/ui/servlets/LoginServlet.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/teammates/ui/servlets/LogoutServlet.java b/src/main/java/teammates/ui/servlets/LogoutServlet.java index 9a5ac4a3c49..dcfde659e43 100644 --- a/src/main/java/teammates/ui/servlets/LogoutServlet.java +++ b/src/main/java/teammates/ui/servlets/LogoutServlet.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; @@ -28,6 +28,8 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc if (frontendUrl == null) { frontendUrl = ""; } + // Prevent HTTP response splitting + frontendUrl = resp.encodeRedirectURL(frontendUrl.replace("\r\n", "")); log.request(req, HttpStatus.SC_MOVED_TEMPORARILY, "Redirect to home page after logging out"); resp.sendRedirect(frontendUrl + "/web"); } diff --git a/src/main/java/teammates/ui/servlets/OAuth2CallbackServlet.java b/src/main/java/teammates/ui/servlets/OAuth2CallbackServlet.java index abad67f4862..c83cd485d20 100644 --- a/src/main/java/teammates/ui/servlets/OAuth2CallbackServlet.java +++ b/src/main/java/teammates/ui/servlets/OAuth2CallbackServlet.java @@ -5,9 +5,9 @@ import java.net.URISyntaxException; import java.util.Map; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; @@ -158,7 +158,7 @@ private void logAndPrintError(HttpServletRequest req, HttpServletResponse resp, log.request(req, status, message); } - private static class AuthResult { + private static final class AuthResult { private final String email; private final String nextUrl; diff --git a/src/main/java/teammates/ui/servlets/ObjectifyFilter.java b/src/main/java/teammates/ui/servlets/ObjectifyFilter.java new file mode 100644 index 00000000000..faca19c5431 --- /dev/null +++ b/src/main/java/teammates/ui/servlets/ObjectifyFilter.java @@ -0,0 +1,30 @@ +package teammates.ui.servlets; + +import java.io.Closeable; +import java.io.IOException; + +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; + +import com.googlecode.objectify.ObjectifyService; + +/** + * Filter to activate Objectify service. + * + *

    This is adapted from the official ObjectifyFilter class + * with modification to support jakarta.servlet in place of javax.servlet. + * + * @see https://github.com/objectify/objectify/blob/6.0.7/src/main/java/com/googlecode/objectify/ObjectifyFilter.java + */ +public class ObjectifyFilter implements Filter { + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + try (Closeable ignored = ObjectifyService.begin()) { + chain.doFilter(request, response); + } + } +} diff --git a/src/main/java/teammates/ui/servlets/OriginCheckFilter.java b/src/main/java/teammates/ui/servlets/OriginCheckFilter.java index 4d6cfeb6e0d..cbd1e8d7b9a 100644 --- a/src/main/java/teammates/ui/servlets/OriginCheckFilter.java +++ b/src/main/java/teammates/ui/servlets/OriginCheckFilter.java @@ -3,14 +3,13 @@ import java.io.IOException; import java.util.Arrays; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpDelete; @@ -49,11 +48,6 @@ public class OriginCheckFilter implements Filter { "ngsw-bypass" )); - @Override - public void init(FilterConfig filterConfig) { - // nothing to do - } - @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) req; @@ -73,7 +67,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) } // The header X-AppEngine-QueueName cannot be spoofed as GAE will strip any user-sent X-AppEngine-QueueName headers. - // Reference: https://cloud.google.com/appengine/docs/standard/java/taskqueue/push/creating-handlers#reading_request_headers + // Reference: https://cloud.google.com/tasks/docs/creating-appengine-handlers#reading_task_request_headers boolean isRequestFromAppEngineQueue = request.getHeader("X-AppEngine-QueueName") != null; if (isRequestFromAppEngineQueue) { @@ -181,9 +175,4 @@ private void denyAccess(String message, HttpServletRequest request, HttpServletR log.request(request, statusCode, message); } - @Override - public void destroy() { - // nothing to do - } - } diff --git a/src/main/java/teammates/ui/servlets/RequestTraceFilter.java b/src/main/java/teammates/ui/servlets/RequestTraceFilter.java index 75ba7fcfd8e..234640ee323 100644 --- a/src/main/java/teammates/ui/servlets/RequestTraceFilter.java +++ b/src/main/java/teammates/ui/servlets/RequestTraceFilter.java @@ -3,14 +3,13 @@ import java.io.IOException; import java.util.Random; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Hex; import org.apache.http.HttpStatus; @@ -27,11 +26,6 @@ public class RequestTraceFilter implements Filter { private static final Logger log = Logger.getLogger(); - @Override - public void init(FilterConfig filterConfig) { - // nothing to do - } - @Override public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException { HttpServletResponse response = (HttpServletResponse) resp; @@ -60,7 +54,7 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain } // The header X-AppEngine-QueueName cannot be spoofed as GAE will strip any user-sent X-AppEngine-QueueName headers. - // Reference: https://cloud.google.com/appengine/docs/standard/java/taskqueue/push/creating-handlers#reading_request_headers + // Reference: https://cloud.google.com/tasks/docs/creating-appengine-handlers#reading_task_request_headers boolean isRequestFromAppEngineQueue = request.getHeader("X-AppEngine-QueueName") != null; // GAE will terminate an instance if any request exceeds 10 minutes. @@ -93,11 +87,6 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain chain.doFilter(req, resp); } - @Override - public void destroy() { - // nothing to do - } - private void throwError(HttpServletRequest req, HttpServletResponse resp, int statusCode, String message) throws IOException { JsonResult result = new JsonResult(message, statusCode); diff --git a/src/main/java/teammates/ui/servlets/WebApiServlet.java b/src/main/java/teammates/ui/servlets/WebApiServlet.java index f4ee00059d8..eaeac90d399 100644 --- a/src/main/java/teammates/ui/servlets/WebApiServlet.java +++ b/src/main/java/teammates/ui/servlets/WebApiServlet.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; import org.hibernate.HibernateException; diff --git a/src/main/java/teammates/ui/servlets/WebPageServlet.java b/src/main/java/teammates/ui/servlets/WebPageServlet.java index e36f26b56e2..ec5bb560b9e 100644 --- a/src/main/java/teammates/ui/servlets/WebPageServlet.java +++ b/src/main/java/teammates/ui/servlets/WebPageServlet.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/teammates/ui/servlets/WebSecurityHeaderFilter.java b/src/main/java/teammates/ui/servlets/WebSecurityHeaderFilter.java index 707753568c7..2158f6ecf46 100644 --- a/src/main/java/teammates/ui/servlets/WebSecurityHeaderFilter.java +++ b/src/main/java/teammates/ui/servlets/WebSecurityHeaderFilter.java @@ -3,13 +3,12 @@ import java.io.IOException; import java.util.Arrays; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import teammates.common.util.Config; @@ -36,11 +35,6 @@ public class WebSecurityHeaderFilter implements Filter { "base-uri 'self'" )); - @Override - public void init(FilterConfig filterConfig) { - // nothing to do - } - @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { @@ -54,9 +48,4 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha chain.doFilter(request, resp); } - @Override - public void destroy() { - // nothing to do - } - } diff --git a/src/main/java/teammates/ui/webapi/Action.java b/src/main/java/teammates/ui/webapi/Action.java index ab32d4ed21d..773c7f6f6cf 100644 --- a/src/main/java/teammates/ui/webapi/Action.java +++ b/src/main/java/teammates/ui/webapi/Action.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import teammates.common.datatransfer.InstructorPermissionSet; import teammates.common.datatransfer.UserInfo; diff --git a/src/main/java/teammates/ui/webapi/ActionFactory.java b/src/main/java/teammates/ui/webapi/ActionFactory.java index 4bcd0202673..9a144adb368 100644 --- a/src/main/java/teammates/ui/webapi/ActionFactory.java +++ b/src/main/java/teammates/ui/webapi/ActionFactory.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpDelete; @@ -143,7 +143,7 @@ public final class ActionFactory { map(ResourceURIs.ACTION_CLASS, GET, GetActionClassesAction.class); // Cron jobs; use GET request - // Reference: https://cloud.google.com/appengine/docs/standard/java11/scheduling-jobs-with-cron-yaml + // Reference: https://cloud.google.com/appengine/docs/standard/scheduling-jobs-with-cron-yaml map(CronJobURIs.AUTOMATED_LOG_COMPILATION, GET, CompileLogsAction.class); map(CronJobURIs.AUTOMATED_DATASTORE_BACKUP, GET, DatastoreBackupAction.class); diff --git a/src/main/java/teammates/ui/webapi/ActionResult.java b/src/main/java/teammates/ui/webapi/ActionResult.java index 7876dc4ab85..b2c664bbc1a 100644 --- a/src/main/java/teammates/ui/webapi/ActionResult.java +++ b/src/main/java/teammates/ui/webapi/ActionResult.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Represents the result of executing an {@link Action}. diff --git a/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java b/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java index daf43603a91..7c3b31931d5 100644 --- a/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java +++ b/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java @@ -418,6 +418,7 @@ void verifySessionOpenExceptForModeration(FeedbackSession feedbackSession) throw /** * Gets the section of a recipient. */ + @SuppressWarnings("PMD.ImplicitSwitchFallThrough") // false positive Section getRecipientSection( String courseId, FeedbackParticipantType giverType, FeedbackParticipantType recipientType, String recipientIdentifier) { @@ -465,6 +466,7 @@ Section getRecipientSection( /** * Gets the section of a recipient. */ + @SuppressWarnings("PMD.ImplicitSwitchFallThrough") // false positive String getDatastoreRecipientSection( String courseId, FeedbackParticipantType giverType, FeedbackParticipantType recipientType, String recipientIdentifier) { diff --git a/src/main/java/teammates/ui/webapi/GateKeeper.java b/src/main/java/teammates/ui/webapi/GateKeeper.java index 75b73feefe0..42edf4a5bbd 100644 --- a/src/main/java/teammates/ui/webapi/GateKeeper.java +++ b/src/main/java/teammates/ui/webapi/GateKeeper.java @@ -161,8 +161,7 @@ void verifyAccessible(InstructorAttributes instructor, CourseAttributes course, } boolean instructorIsAllowedCoursePrivilege = instructor.isAllowedForPrivilege(privilegeName); - boolean instructorIsAllowedSectionPrivilege = - instructor.getSectionsWithPrivilege(privilegeName).size() != 0; + boolean instructorIsAllowedSectionPrivilege = !instructor.getSectionsWithPrivilege(privilegeName).isEmpty(); if (!instructorIsAllowedCoursePrivilege && !instructorIsAllowedSectionPrivilege) { throw new UnauthorizedAccessException("Course [" + course.getId() + "] is not accessible to instructor [" + instructor.getEmail() + "] for privilege [" + privilegeName + "]"); @@ -179,8 +178,7 @@ void verifyAccessible(Instructor instructor, Course course, String privilegeName verifyAccessible(instructor, course); boolean instructorIsAllowedCoursePrivilege = instructor.isAllowedForPrivilege(privilegeName); - boolean instructorIsAllowedSectionPrivilege = - instructor.getSectionsWithPrivilege(privilegeName).size() != 0; + boolean instructorIsAllowedSectionPrivilege = !instructor.getSectionsWithPrivilege(privilegeName).isEmpty(); if (!instructorIsAllowedCoursePrivilege && !instructorIsAllowedSectionPrivilege) { throw new UnauthorizedAccessException("Course [" + course.getId() + "] is not accessible to instructor [" + instructor.getEmail() + "] for privilege [" + privilegeName + "]"); diff --git a/src/main/java/teammates/ui/webapi/GetAuthInfoAction.java b/src/main/java/teammates/ui/webapi/GetAuthInfoAction.java index ed2aaa444ea..28dc4ca030c 100644 --- a/src/main/java/teammates/ui/webapi/GetAuthInfoAction.java +++ b/src/main/java/teammates/ui/webapi/GetAuthInfoAction.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.List; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import teammates.common.util.Const; import teammates.common.util.HttpRequestHelper; diff --git a/src/main/java/teammates/ui/webapi/GetCoursesAction.java b/src/main/java/teammates/ui/webapi/GetCoursesAction.java index 41d1cf55c6d..76e8963e3c1 100644 --- a/src/main/java/teammates/ui/webapi/GetCoursesAction.java +++ b/src/main/java/teammates/ui/webapi/GetCoursesAction.java @@ -34,8 +34,8 @@ AuthType getMinAuthLevel() { void checkSpecificAccessControl() throws UnauthorizedAccessException { String entityType = getNonNullRequestParamValue(Const.ParamsNames.ENTITY_TYPE); - if (!(entityType.equals(Const.EntityType.STUDENT) && userInfo.isStudent) - && !(entityType.equals(Const.EntityType.INSTRUCTOR) && userInfo.isInstructor)) { + if (!(Const.EntityType.STUDENT.equals(entityType) && userInfo.isStudent) + && !(Const.EntityType.INSTRUCTOR.equals(entityType) && userInfo.isInstructor)) { throw new UnauthorizedAccessException("Current account cannot access to courses of request entity type"); } } diff --git a/src/main/java/teammates/ui/webapi/GetFeedbackSessionsAction.java b/src/main/java/teammates/ui/webapi/GetFeedbackSessionsAction.java index b14a5369bd8..d4c1c1ae954 100644 --- a/src/main/java/teammates/ui/webapi/GetFeedbackSessionsAction.java +++ b/src/main/java/teammates/ui/webapi/GetFeedbackSessionsAction.java @@ -38,13 +38,13 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { String entityType = getNonNullRequestParamValue(Const.ParamsNames.ENTITY_TYPE); - if (!(entityType.equals(Const.EntityType.STUDENT) || entityType.equals(Const.EntityType.INSTRUCTOR))) { + if (!(Const.EntityType.STUDENT.equals(entityType) || Const.EntityType.INSTRUCTOR.equals(entityType))) { throw new UnauthorizedAccessException("entity type not supported."); } String courseId = getRequestParamValue(Const.ParamsNames.COURSE_ID); - if (entityType.equals(Const.EntityType.STUDENT)) { + if (Const.EntityType.STUDENT.equals(entityType)) { if (!userInfo.isStudent) { throw new UnauthorizedAccessException("User " + userInfo.getId() + " does not have student privileges"); @@ -90,7 +90,7 @@ public JsonResult execute() { List studentEmails = new ArrayList<>(); if (courseId == null) { - if (entityType.equals(Const.EntityType.STUDENT)) { + if (Const.EntityType.STUDENT.equals(entityType)) { List students = sqlLogic.getStudentsByGoogleId(userInfo.getId()); for (Student student : students) { String studentCourseId = student.getCourse().getId(); @@ -113,7 +113,7 @@ public JsonResult execute() { feedbackSessionAttributes.addAll(sessions); } - } else if (entityType.equals(Const.EntityType.INSTRUCTOR)) { + } else if (Const.EntityType.INSTRUCTOR.equals(entityType)) { boolean isInRecycleBin = getBooleanRequestParamValue(Const.ParamsNames.IS_IN_RECYCLE_BIN); instructors = sqlLogic.getInstructorsForGoogleId(userInfo.getId()); @@ -135,33 +135,33 @@ public JsonResult execute() { } else { if (isCourseMigrated(courseId)) { feedbackSessions = sqlLogic.getFeedbackSessionsForCourse(courseId); - if (entityType.equals(Const.EntityType.STUDENT) && !feedbackSessions.isEmpty()) { + if (Const.EntityType.STUDENT.equals(entityType) && !feedbackSessions.isEmpty()) { Student student = sqlLogic.getStudentByGoogleId(courseId, userInfo.getId()); assert student != null; String emailAddress = student.getEmail(); studentEmails.add(emailAddress); - } else if (entityType.equals(Const.EntityType.INSTRUCTOR)) { + } else if (Const.EntityType.INSTRUCTOR.equals(entityType)) { instructors = Collections.singletonList( sqlLogic.getInstructorByGoogleId(courseId, userInfo.getId())); } } else { feedbackSessionAttributes = logic.getFeedbackSessionsForCourse(courseId); - if (entityType.equals(Const.EntityType.STUDENT) && !feedbackSessionAttributes.isEmpty()) { + if (Const.EntityType.STUDENT.equals(entityType) && !feedbackSessionAttributes.isEmpty()) { StudentAttributes student = logic.getStudentForGoogleId(courseId, userInfo.getId()); assert student != null; String emailAddress = student.getEmail(); feedbackSessionAttributes = feedbackSessionAttributes.stream() .map(instructorSession -> instructorSession.getCopyForStudent(emailAddress)) .collect(Collectors.toList()); - } else if (entityType.equals(Const.EntityType.INSTRUCTOR)) { + } else if (Const.EntityType.INSTRUCTOR.equals(entityType)) { dataStoreInstructors = Collections.singletonList(logic.getInstructorForGoogleId(courseId, userInfo.getId())); } } } - if (entityType.equals(Const.EntityType.STUDENT)) { + if (Const.EntityType.STUDENT.equals(entityType)) { // hide session not visible to student feedbackSessions = feedbackSessions.stream() .filter(FeedbackSession::isVisible).collect(Collectors.toList()); @@ -182,9 +182,9 @@ public JsonResult execute() { responseData.hideInformationForStudent(studentEmail); } - if (entityType.equals(Const.EntityType.STUDENT)) { + if (Const.EntityType.STUDENT.equals(entityType)) { responseData.getFeedbackSessions().forEach(FeedbackSessionData::hideInformationForStudent); - } else if (entityType.equals(Const.EntityType.INSTRUCTOR)) { + } else if (Const.EntityType.INSTRUCTOR.equals(entityType)) { responseData.getFeedbackSessions().forEach(session -> { Instructor instructor = courseIdToInstructor.get(session.getCourseId()); InstructorAttributes dataStoreInstructor = dataStoreCourseIdToInstructor.get(session.getCourseId()); diff --git a/src/main/java/teammates/ui/webapi/GetHasResponsesAction.java b/src/main/java/teammates/ui/webapi/GetHasResponsesAction.java index f5a2ecb57c6..668d5e3a84e 100644 --- a/src/main/java/teammates/ui/webapi/GetHasResponsesAction.java +++ b/src/main/java/teammates/ui/webapi/GetHasResponsesAction.java @@ -30,11 +30,11 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { String entityType = getNonNullRequestParamValue(Const.ParamsNames.ENTITY_TYPE); - if (!(entityType.equals(Const.EntityType.STUDENT) || entityType.equals(Const.EntityType.INSTRUCTOR))) { + if (!(Const.EntityType.STUDENT.equals(entityType) || Const.EntityType.INSTRUCTOR.equals(entityType))) { throw new UnauthorizedAccessException("entity type not supported."); } - if (entityType.equals(Const.EntityType.INSTRUCTOR)) { + if (Const.EntityType.INSTRUCTOR.equals(entityType)) { //An instructor of the feedback session can check responses for questions within it. String questionId = getRequestParamValue(Const.ParamsNames.FEEDBACK_QUESTION_ID); if (questionId != null) { @@ -117,7 +117,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { public JsonResult execute() { String entityType = getNonNullRequestParamValue(Const.ParamsNames.ENTITY_TYPE); - if (entityType.equals(Const.EntityType.INSTRUCTOR)) { + if (Const.EntityType.INSTRUCTOR.equals(entityType)) { return handleInstructorReq(); } diff --git a/src/main/java/teammates/ui/webapi/GetStudentsAction.java b/src/main/java/teammates/ui/webapi/GetStudentsAction.java index e422aa16e93..1dd1c7a1cfc 100644 --- a/src/main/java/teammates/ui/webapi/GetStudentsAction.java +++ b/src/main/java/teammates/ui/webapi/GetStudentsAction.java @@ -68,7 +68,7 @@ public JsonResult execute() { boolean hasCoursePrivilege = instructor != null && instructor.isAllowedForPrivilege(privilegeName); boolean hasSectionPrivilege = instructor != null - && instructor.getSectionsWithPrivilege(privilegeName).size() != 0; + && !instructor.getSectionsWithPrivilege(privilegeName).isEmpty(); if (teamName == null && hasCoursePrivilege) { // request to get all course students by instructor with course privilege @@ -104,7 +104,7 @@ public JsonResult execute() { boolean hasCoursePrivilege = instructor != null && instructor.isAllowedForPrivilege(privilegeName); boolean hasSectionPrivilege = instructor != null - && instructor.getSectionsWithPrivilege(privilegeName).size() != 0; + && !instructor.getSectionsWithPrivilege(privilegeName).isEmpty(); if (teamName == null && hasCoursePrivilege) { // request to get all course students by instructor with course privilege diff --git a/src/main/java/teammates/ui/webapi/JsonResult.java b/src/main/java/teammates/ui/webapi/JsonResult.java index db9460311f6..b966be65f9f 100644 --- a/src/main/java/teammates/ui/webapi/JsonResult.java +++ b/src/main/java/teammates/ui/webapi/JsonResult.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/teammates/ui/webapi/SearchStudentsAction.java b/src/main/java/teammates/ui/webapi/SearchStudentsAction.java index c975dae8756..d801f7e48d1 100644 --- a/src/main/java/teammates/ui/webapi/SearchStudentsAction.java +++ b/src/main/java/teammates/ui/webapi/SearchStudentsAction.java @@ -38,10 +38,10 @@ public JsonResult execute() { List students; try { - if (userInfo.isInstructor && entity.equals(Const.EntityType.INSTRUCTOR)) { + if (userInfo.isInstructor && Const.EntityType.INSTRUCTOR.equals(entity)) { List instructors = sqlLogic.getInstructorsForGoogleId(userInfo.id); students = sqlLogic.searchStudents(searchKey, instructors); - } else if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { + } else if (userInfo.isAdmin && Const.EntityType.ADMIN.equals(entity)) { students = sqlLogic.searchStudentsInWholeSystem(searchKey); } else { throw new InvalidHttpParameterException("Invalid entity type for search"); @@ -53,10 +53,10 @@ public JsonResult execute() { // Search in datastore. For more information on dual db support, see this [PR](https://github.com/TEAMMATES/teammates/pull/12728/files) List studentsDatastore; try { - if (userInfo.isInstructor && entity.equals(Const.EntityType.INSTRUCTOR)) { + if (userInfo.isInstructor && Const.EntityType.INSTRUCTOR.equals(entity)) { List instructors = logic.getInstructorsForGoogleId(userInfo.id); studentsDatastore = logic.searchStudents(searchKey, instructors); - } else if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { + } else if (userInfo.isAdmin && Const.EntityType.ADMIN.equals(entity)) { studentsDatastore = logic.searchStudentsInWholeSystem(searchKey); } else { throw new InvalidHttpParameterException("Invalid entity type for search"); @@ -70,7 +70,7 @@ public JsonResult execute() { for (Student s : students) { StudentData studentData = new StudentData(s); - if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { + if (userInfo.isAdmin && Const.EntityType.ADMIN.equals(entity)) { studentData.addAdditionalInformationForAdminSearch( s.getRegKey(), sqlLogic.getCourseInstitute(s.getCourseId()), @@ -88,7 +88,7 @@ public JsonResult execute() { continue; } - if (userInfo.isAdmin && entity.equals(Const.EntityType.ADMIN)) { + if (userInfo.isAdmin && Const.EntityType.ADMIN.equals(entity)) { studentData.addAdditionalInformationForAdminSearch( s.getKey(), logic.getCourseInstitute(s.getCourse()), diff --git a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java index 416106d32d6..c3e756c8b4d 100644 --- a/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateAccountRequestAction.java @@ -41,13 +41,13 @@ public JsonResult execute() throws InvalidOperationException, InvalidHttpRequest && (accountRequest.getStatus() == AccountRequestStatus.PENDING || accountRequest.getStatus() == AccountRequestStatus.REJECTED)) { - if (sqlLogic.getAccountsForEmailWithTransaction(accountRequest.getEmail()).size() > 0) { + if (!sqlLogic.getAccountsForEmailWithTransaction(accountRequest.getEmail()).isEmpty()) { throw new InvalidOperationException(String.format("An account with email %s already exists. " + "Please reject or delete the account request instead.", accountRequest.getEmail())); } - if (sqlLogic.getApprovedAccountRequestsForEmailWithTransaction(accountRequest.getEmail()).size() > 0) { + if (!sqlLogic.getApprovedAccountRequestsForEmailWithTransaction(accountRequest.getEmail()).isEmpty()) { throw new InvalidOperationException(String.format( "An account request with email %s has already been approved. " + "Please reject or delete the account request instead.", diff --git a/src/main/resources/logsForLocalDev.json b/src/main/resources/logsForLocalDev.json index 66d5c04a118..ed155eb3581 100644 --- a/src/main/resources/logsForLocalDev.json +++ b/src/main/resources/logsForLocalDev.json @@ -28,8 +28,8 @@ "teammates.ui.webapi.CreateCourseAction.execute(CreateCourseAction.java:18)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doPost(WebApiServlet.java:48)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:707)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:707)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790)", "..." ], [ @@ -114,8 +114,8 @@ "teammates.ui.webapi.CreateCourseAction.execute(CreateCourseAction.java:18)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doPost(WebApiServlet.java:48)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:707)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:707)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790)", "..." ], [ @@ -197,8 +197,8 @@ "teammates.ui.webapi.SearchInstructorsAction.execute(SearchInstructorsAction.java:19)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:43)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ], [ @@ -270,8 +270,8 @@ "teammates.ui.webapi.QueryLogsAction.execute(QueryLogsAction.java:42)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:43)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], @@ -316,8 +316,8 @@ "teammates.ui.webapi.QueryLogsAction.execute(QueryLogsAction.java:42)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:43)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], @@ -363,8 +363,8 @@ "teammates.ui.webapi.CompileLogsAction.execute(CompileLogsAction.java:11)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:43)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], @@ -410,8 +410,8 @@ "teammates.ui.webapi.CompileLogsAction.execute(CompileLogsAction.java:11)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:43)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], @@ -457,8 +457,8 @@ "teammates.ui.webapi.CompileLogsAction.execute(CompileLogsAction.java:11)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:70)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:43)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], @@ -501,9 +501,9 @@ "teammates.ui.webapi.ActionFactory.getAction(ActionFactory.java:163)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:67)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:44)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], @@ -546,9 +546,9 @@ "teammates.ui.webapi.ActionFactory.getAction(ActionFactory.java:163)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:67)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:44)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ] ], diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index f2033dc9143..7194f33e6f0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -40,7 +40,7 @@ ObjectifyFilter - com.googlecode.objectify.ObjectifyFilter + teammates.ui.servlets.ObjectifyFilter ObjectifyFilter diff --git a/src/test/java/teammates/architecture/ArchitectureTest.java b/src/test/java/teammates/architecture/ArchitectureTest.java index 83d1221a6e2..040a1f90779 100644 --- a/src/test/java/teammates/architecture/ArchitectureTest.java +++ b/src/test/java/teammates/architecture/ArchitectureTest.java @@ -551,6 +551,7 @@ public void testArchitecture_externalApi_objectifyApiCanOnlyBeAccessedBySomePack .and().resideOutsideOfPackage(includeSubpackages(CLIENT_SCRIPTS_PACKAGE)) .and().doNotHaveSimpleName("BaseTestCaseWithSqlDatabaseAccess") .and().doNotHaveSimpleName("BaseTestCaseWithLocalDatabaseAccess") + .and().doNotHaveSimpleName("ObjectifyFilter") .should().accessClassesThat().resideInAPackage("com.googlecode.objectify..") .check(ALL_CLASSES); } @@ -564,7 +565,7 @@ public void testArchitecture_externalApi_servletApiCanOnlyBeAccessedBySomePackag .and().doNotHaveSimpleName("MockHttpServletResponse") .and().doNotHaveSimpleName("MockPart") .and().resideOutsideOfPackage(includeSubpackages(UI_WEBAPI_PACKAGE)) - .should().accessClassesThat().haveFullyQualifiedName("javax.servlet..") + .should().accessClassesThat().haveFullyQualifiedName("jakarta.servlet..") .check(ALL_CLASSES); } @@ -581,7 +582,7 @@ public void testArchitecture_externalApi_assertionApiCanOnlyBeAccessedBySomePack .and().doNotHaveSimpleName("BaseTestCase") .and().doNotHaveSimpleName("AssertHelper") .and().doNotHaveSimpleName("EmailChecker") - .should().accessClassesThat().haveFullyQualifiedName("org.junit.Assert") + .should().accessClassesThat().haveFullyQualifiedName("org.junit.jupiter.api.Assertions") .check(ALL_CLASSES); } diff --git a/src/test/java/teammates/common/datatransfer/ErrorLogEntryTest.java b/src/test/java/teammates/common/datatransfer/ErrorLogEntryTest.java index 4092891e80c..1554babf2c7 100644 --- a/src/test/java/teammates/common/datatransfer/ErrorLogEntryTest.java +++ b/src/test/java/teammates/common/datatransfer/ErrorLogEntryTest.java @@ -64,9 +64,9 @@ public void testFromLogEntry_exceptionLogDetails_shouldGetPrettyPrintedLog() { "teammates.ui.webapi.ActionFactory.getAction(ActionFactory.java:163)", "teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:67)", "teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:44)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", - "javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", + "jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", "..." ) )); @@ -81,9 +81,9 @@ public void testFromLogEntry_exceptionLogDetails_shouldGetPrettyPrintedLog() { " at teammates.ui.webapi.ActionFactory.getAction(ActionFactory.java:163)", " at teammates.ui.webapi.WebApiServlet.invokeServlet(WebApiServlet.java:67)", " at teammates.ui.webapi.WebApiServlet.doGet(WebApiServlet.java:44)", - " at javax.servlet.http.HttpServlet.service(HttpServlet.java:687)", - " at javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", - " at javax.servlet.http.HttpServlet.service(HttpServlet.java:790),", + " at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:687)", + " at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", + " at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:790),", " at ...", "" )); diff --git a/src/test/java/teammates/common/util/JsonUtilsTest.java b/src/test/java/teammates/common/util/JsonUtilsTest.java index 57477d7a599..a1e3c615698 100644 --- a/src/test/java/teammates/common/util/JsonUtilsTest.java +++ b/src/test/java/teammates/common/util/JsonUtilsTest.java @@ -1,6 +1,7 @@ package teammates.common.util; import java.util.ArrayList; +import java.util.List; import org.testng.annotations.Test; @@ -20,7 +21,7 @@ public class JsonUtilsTest extends BaseTestCase { public void testFeedbackQuestionDetailsAdaptor_withComposedQuestionDetails_shouldSerializeToConcreteClass() { FeedbackTextQuestionDetails questionDetails = new FeedbackTextQuestionDetails("Question text."); - ArrayList participants = new ArrayList<>(); + List participants = new ArrayList<>(); participants.add(FeedbackParticipantType.OWN_TEAM_MEMBERS); participants.add(FeedbackParticipantType.RECEIVER); diff --git a/src/test/java/teammates/logic/core/NotificationsLogicTest.java b/src/test/java/teammates/logic/core/NotificationsLogicTest.java index 44e5c79b844..1aaf53efd01 100644 --- a/src/test/java/teammates/logic/core/NotificationsLogicTest.java +++ b/src/test/java/teammates/logic/core/NotificationsLogicTest.java @@ -23,6 +23,7 @@ public class NotificationsLogicTest extends BaseLogicTest { private NotificationAttributes n; private final NotificationsDb notifDb = NotificationsDb.inst(); private final NotificationsLogic notifLogic = NotificationsLogic.inst(); + @SuppressWarnings("PMD.FinalFieldCouldBeStatic") private final Map typicalNotifications = getTypicalDataBundle().notifications; @Override diff --git a/src/test/java/teammates/logic/external/GoogleRecaptchaServiceTest.java b/src/test/java/teammates/logic/external/GoogleRecaptchaServiceTest.java index 6a418a84e9a..8066cf6b4a1 100644 --- a/src/test/java/teammates/logic/external/GoogleRecaptchaServiceTest.java +++ b/src/test/java/teammates/logic/external/GoogleRecaptchaServiceTest.java @@ -57,7 +57,7 @@ public void testIsVerificationSuccessful() { * * @see reCAPTCHA API error codes */ - private static class GoogleRecaptchaServiceStub extends GoogleRecaptchaService { + private static final class GoogleRecaptchaServiceStub extends GoogleRecaptchaService { private GoogleRecaptchaServiceStub(String secretKey) { super(secretKey); diff --git a/src/test/java/teammates/sqllogic/core/FeedbackQuestionsLogicTest.java b/src/test/java/teammates/sqllogic/core/FeedbackQuestionsLogicTest.java index fb7b75ceed1..4b77e1d75d7 100644 --- a/src/test/java/teammates/sqllogic/core/FeedbackQuestionsLogicTest.java +++ b/src/test/java/teammates/sqllogic/core/FeedbackQuestionsLogicTest.java @@ -73,7 +73,7 @@ public void testGetFeedbackQuestionsForSession_questionNumbersOutOfOrder_success fq4.setQuestionNumber(4); fq5.setQuestionNumber(5); - ArrayList questions = new ArrayList<>(List.of(fq2, fq4, fq3, fq1, fq5)); + List questions = new ArrayList<>(List.of(fq2, fq4, fq3, fq1, fq5)); fs.setId(UUID.randomUUID()); when(fqDb.getFeedbackQuestionsForSession(fs.getId())).thenReturn(questions); @@ -116,7 +116,7 @@ public void testCreateFeedbackQuestion_questionNumbersAreInconsistent_canCreateF fq3.setQuestionNumber(4); fq4.setQuestionNumber(5); - ArrayList questionsBefore = new ArrayList<>(List.of(fq1, fq2, fq3, fq4)); + List questionsBefore = new ArrayList<>(List.of(fq1, fq2, fq3, fq4)); fs.setId(UUID.randomUUID()); when(fqDb.getFeedbackQuestionsForSession(fs.getId())).thenReturn(questionsBefore); when(fqDb.createFeedbackQuestion(fq5)).thenReturn(fq5); @@ -142,7 +142,7 @@ public void testCreateFeedbackQuestion_oldQuestionNumberLargerThanNewQuestionNum fq4.setQuestionNumber(5); fq5.setQuestionNumber(1); - ArrayList questionsBefore = new ArrayList<>(List.of(fq1, fq2, fq3, fq4)); + List questionsBefore = new ArrayList<>(List.of(fq1, fq2, fq3, fq4)); fs.setId(UUID.randomUUID()); when(fqDb.getFeedbackQuestionsForSession(fs.getId())).thenReturn(questionsBefore); when(fqDb.createFeedbackQuestion(fq5)).thenReturn(fq5); @@ -170,7 +170,7 @@ public void testCreateFeedbackQuestion_oldQuestionNumberSmallerThanNewQuestionNu fq3.setQuestionNumber(2); fq4.setQuestionNumber(3); - ArrayList questionsBefore = new ArrayList<>(List.of(fq1, fq2, fq3, fq4)); + List questionsBefore = new ArrayList<>(List.of(fq1, fq2, fq3, fq4)); fs.setId(UUID.randomUUID()); when(fqDb.getFeedbackQuestionsForSession(fs.getId())).thenReturn(questionsBefore); when(fqDb.createFeedbackQuestion(fq5)).thenReturn(fq5); @@ -275,7 +275,7 @@ public void testGetRecipientsOfQuestion_giverTypeStudents() { } private List createQuestionList(FeedbackSession fs, int numOfQuestions) { - ArrayList questions = new ArrayList<>(); + List questions = new ArrayList<>(); for (int i = 1; i <= numOfQuestions; i++) { FeedbackQuestion fq = getTypicalFeedbackQuestionForSession(fs); fq.setQuestionNumber(i); diff --git a/src/test/java/teammates/sqlui/webapi/BaseActionTest.java b/src/test/java/teammates/sqlui/webapi/BaseActionTest.java index 615f031d1c6..98e3535fecb 100644 --- a/src/test/java/teammates/sqlui/webapi/BaseActionTest.java +++ b/src/test/java/teammates/sqlui/webapi/BaseActionTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpDelete; diff --git a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java index 6fcaf98daff..ebd2a467001 100644 --- a/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java +++ b/src/test/java/teammates/sqlui/webapi/UpdateFeedbackSessionLogsActionTest.java @@ -107,7 +107,7 @@ public void testExecute_noRecentLogs_noLogsCreated() UpdateFeedbackSessionLogsAction action = getAction(); action.execute(); - verify(mockLogic).createFeedbackSessionLogs(argThat(filteredLogs -> filteredLogs.size() == 0)); + verify(mockLogic).createFeedbackSessionLogs(argThat(filteredLogs -> filteredLogs.isEmpty())); } @Test diff --git a/src/test/java/teammates/storage/api/NotificationsDbTest.java b/src/test/java/teammates/storage/api/NotificationsDbTest.java index 282254e98be..c90bb4091ec 100644 --- a/src/test/java/teammates/storage/api/NotificationsDbTest.java +++ b/src/test/java/teammates/storage/api/NotificationsDbTest.java @@ -23,6 +23,7 @@ public class NotificationsDbTest extends BaseTestCaseWithLocalDatabaseAccess { private final NotificationsDb notificationsDb = NotificationsDb.inst(); + @SuppressWarnings("PMD.FinalFieldCouldBeStatic") private final Map typicalNotifications = getTypicalDataBundle().notifications; @BeforeMethod diff --git a/src/test/java/teammates/test/AssertHelper.java b/src/test/java/teammates/test/AssertHelper.java index 384388a753e..bd96ccd8dd5 100644 --- a/src/test/java/teammates/test/AssertHelper.java +++ b/src/test/java/teammates/test/AssertHelper.java @@ -1,7 +1,7 @@ package teammates.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.time.Instant; import java.util.ArrayList; diff --git a/src/test/java/teammates/test/BaseTestCase.java b/src/test/java/teammates/test/BaseTestCase.java index c7df328d887..91ec35f2ff7 100644 --- a/src/test/java/teammates/test/BaseTestCase.java +++ b/src/test/java/teammates/test/BaseTestCase.java @@ -9,7 +9,8 @@ import java.util.Map; import java.util.UUID; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.function.Executable; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -45,6 +46,7 @@ /** * Base class for all test cases. */ +@SuppressWarnings("PMD.TestClassWithoutTestCases") public class BaseTestCase { /** @@ -185,8 +187,8 @@ protected FeedbackSession getTypicalFeedbackSessionForCourse(Course course) { protected FeedbackQuestion getTypicalFeedbackQuestionForSession(FeedbackSession session) { return FeedbackQuestion.makeQuestion(session, 1, "test-description", - FeedbackParticipantType.SELF, FeedbackParticipantType.SELF, 1, new ArrayList(), - new ArrayList(), new ArrayList(), + FeedbackParticipantType.SELF, FeedbackParticipantType.SELF, 1, new ArrayList<>(), + new ArrayList<>(), new ArrayList<>(), new FeedbackTextQuestionDetails("test question text")); } @@ -284,127 +286,83 @@ protected static String getPopulatedEmptyStringErrorMessage(String messageTempla */ protected static void assertTrue(boolean condition) { - Assert.assertTrue(condition); + Assertions.assertTrue(condition); } protected static void assertTrue(String message, boolean condition) { - Assert.assertTrue(message, condition); + Assertions.assertTrue(condition, message); } protected static void assertFalse(boolean condition) { - Assert.assertFalse(condition); + Assertions.assertFalse(condition); } protected static void assertFalse(String message, boolean condition) { - Assert.assertFalse(message, condition); + Assertions.assertFalse(condition, message); } protected static void assertEquals(int expected, int actual) { - Assert.assertEquals(expected, actual); + Assertions.assertEquals(expected, actual); } protected static void assertEquals(String message, int expected, int actual) { - Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } protected static void assertEquals(long expected, long actual) { - Assert.assertEquals(expected, actual); + Assertions.assertEquals(expected, actual); } protected static void assertEquals(double expected, double actual, double delta) { - Assert.assertEquals(expected, actual, delta); + Assertions.assertEquals(expected, actual, delta); } protected static void assertEquals(Object expected, Object actual) { - Assert.assertEquals(expected, actual); + Assertions.assertEquals(expected, actual); } protected static void assertEquals(String message, Object expected, Object actual) { - Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } protected static void assertArrayEquals(byte[] expected, byte[] actual) { - Assert.assertArrayEquals(expected, actual); + Assertions.assertArrayEquals(expected, actual); } protected static void assertNotEquals(Object first, Object second) { - Assert.assertNotEquals(first, second); + Assertions.assertNotEquals(first, second); } protected static void assertSame(Object expected, Object actual) { - Assert.assertSame(expected, actual); + Assertions.assertSame(expected, actual); } protected static void assertNotSame(Object unexpected, Object actual) { - Assert.assertNotSame(unexpected, actual); + Assertions.assertNotSame(unexpected, actual); } protected static void assertNull(Object object) { - Assert.assertNull(object); + Assertions.assertNull(object); } protected static void assertNull(String message, Object object) { - Assert.assertNull(message, object); + Assertions.assertNull(object, message); } protected static void assertNotNull(Object object) { - Assert.assertNotNull(object); + Assertions.assertNotNull(object); } protected static void assertNotNull(String message, Object object) { - Assert.assertNotNull(message, object); + Assertions.assertNotNull(object, message); } protected static void fail(String message) { - Assert.fail(message); + Assertions.fail(message); } - // This method is adapted from JUnit 5's assertThrows. - // Once we upgrade to JUnit 5, their built-in method shall be used instead. - @SuppressWarnings({ - "unchecked", - "PMD.AvoidCatchingThrowable", // As per reference method's specification - }) protected static T assertThrows(Class expectedType, Executable executable) { - try { - executable.execute(); - } catch (Throwable actualException) { - if (expectedType.isInstance(actualException)) { - return (T) actualException; - } else { - String message = String.format("Expected %s to be thrown, but %s was instead thrown.", - getCanonicalName(expectedType), getCanonicalName(actualException.getClass())); - throw new AssertionError(message, actualException); - } - } - - String message = String.format("Expected %s to be thrown, but nothing was thrown.", getCanonicalName(expectedType)); - throw new AssertionError(message); + return Assertions.assertThrows(expectedType, executable); } - private static String getCanonicalName(Class clazz) { - String canonicalName = clazz.getCanonicalName(); - return canonicalName == null ? clazz.getName() : canonicalName; - } - - /** - * {@code Executable} is a functional interface that can be used to - * implement any generic block of code that potentially throws a - * {@link Throwable}. - * - *

    The {@code Executable} interface is similar to {@link Runnable}, - * except that an {@code Executable} can throw any kind of exception. - */ - // This interface is adapted from JUnit 5's Executable interface. - // Once we upgrade to JUnit 5, this interface shall no longer be necessary. - public interface Executable { - - /** - * Executes a block of code, potentially throwing a {@link Throwable}. - */ - // CHECKSTYLE.OFF:IllegalThrows - void execute() throws Throwable; - // CHECKSTYLE.ON:IllegalThrows - - } } diff --git a/src/test/java/teammates/test/EmailChecker.java b/src/test/java/teammates/test/EmailChecker.java index 41b6f81cb59..e429f714af7 100644 --- a/src/test/java/teammates/test/EmailChecker.java +++ b/src/test/java/teammates/test/EmailChecker.java @@ -1,6 +1,6 @@ package teammates.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; diff --git a/src/test/java/teammates/test/MockFilterChain.java b/src/test/java/teammates/test/MockFilterChain.java index 6a485586800..2919610aa53 100644 --- a/src/test/java/teammates/test/MockFilterChain.java +++ b/src/test/java/teammates/test/MockFilterChain.java @@ -1,8 +1,8 @@ package teammates.test; -import javax.servlet.FilterChain; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * Mocks {@link FilterChain} for testing purpose. diff --git a/src/test/java/teammates/test/MockHttpServletRequest.java b/src/test/java/teammates/test/MockHttpServletRequest.java index d7809c97f5c..e66396d1c5d 100644 --- a/src/test/java/teammates/test/MockHttpServletRequest.java +++ b/src/test/java/teammates/test/MockHttpServletRequest.java @@ -13,20 +13,20 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionContext; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; import teammates.common.util.Const; diff --git a/src/test/java/teammates/test/MockHttpServletResponse.java b/src/test/java/teammates/test/MockHttpServletResponse.java index a95593a7d33..508d584e407 100644 --- a/src/test/java/teammates/test/MockHttpServletResponse.java +++ b/src/test/java/teammates/test/MockHttpServletResponse.java @@ -7,9 +7,9 @@ import java.util.List; import java.util.Locale; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpStatus; diff --git a/src/test/java/teammates/test/TestProperties.java b/src/test/java/teammates/test/TestProperties.java index c9124580b67..809bcd011e6 100644 --- a/src/test/java/teammates/test/TestProperties.java +++ b/src/test/java/teammates/test/TestProperties.java @@ -11,6 +11,7 @@ /** * Settings for component tests. */ +@SuppressWarnings("PMD.TestClassWithoutTestCases") public final class TestProperties { /** The directory where HTML files for testing email contents are stored. */ diff --git a/src/test/java/teammates/ui/webapi/BaseActionTest.java b/src/test/java/teammates/ui/webapi/BaseActionTest.java index a1d87f563c0..826eb97d490 100644 --- a/src/test/java/teammates/ui/webapi/BaseActionTest.java +++ b/src/test/java/teammates/ui/webapi/BaseActionTest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpDelete; diff --git a/src/test/java/teammates/ui/webapi/GetAuthInfoActionTest.java b/src/test/java/teammates/ui/webapi/GetAuthInfoActionTest.java index f9d97e6843f..e57237aaa08 100644 --- a/src/test/java/teammates/ui/webapi/GetAuthInfoActionTest.java +++ b/src/test/java/teammates/ui/webapi/GetAuthInfoActionTest.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.Arrays; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.testng.annotations.Test; diff --git a/src/test/java/teammates/ui/webapi/JsonResultTest.java b/src/test/java/teammates/ui/webapi/JsonResultTest.java index c691cc75714..458f6958b5d 100644 --- a/src/test/java/teammates/ui/webapi/JsonResultTest.java +++ b/src/test/java/teammates/ui/webapi/JsonResultTest.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import org.testng.annotations.Test; diff --git a/static-analysis/teammates-checkstyle.xml b/static-analysis/teammates-checkstyle.xml index 8fa0d80ea19..8e58b6f8f47 100644 --- a/static-analysis/teammates-checkstyle.xml +++ b/static-analysis/teammates-checkstyle.xml @@ -145,13 +145,13 @@ - + - + diff --git a/static-analysis/teammates-pmd.xml b/static-analysis/teammates-pmd.xml index a75119b031e..d5529f08fd9 100644 --- a/static-analysis/teammates-pmd.xml +++ b/static-analysis/teammates-pmd.xml @@ -20,6 +20,8 @@ + + @@ -31,11 +33,13 @@ - + + + + + + - - @@ -148,7 +152,6 @@ - @@ -157,7 +160,7 @@ - + @@ -177,10 +180,12 @@ + + From ce839ab4351aba3036c19afa92edc60cadcbd85f Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Thu, 18 Apr 2024 21:23:44 +0800 Subject: [PATCH 77/95] fix edit (#13056) Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> --- .../account-request-table.component.spec.ts | 27 ++++++++++++------- .../account-request-table.component.ts | 11 ++++---- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/web/app/components/account-requests-table/account-request-table.component.spec.ts b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts index 6de7c277b22..8434b006bb5 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.spec.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts @@ -294,9 +294,12 @@ describe('AccountRequestTableComponent', () => { component.accountRequests = accountRequestResults; fixture.detectChanges(); - const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => { - return createMockNgbModalRef({}); - }); + const mockModalRef = { + componentInstance: {}, + result: Promise.resolve({}), + }; + + const modalSpy = jest.spyOn(ngbModal, 'open').mockReturnValue(mockModalRef as any); const editButton: any = fixture.debugElement.nativeElement.querySelector('#edit-account-request-0'); editButton.click(); @@ -381,9 +384,12 @@ describe('AccountRequestTableComponent', () => { component.accountRequests = accountRequestResults; fixture.detectChanges(); - jest.spyOn(ngbModal, 'open').mockImplementation(() => { - return createMockNgbModalRef({}); - }); + const mockModalRef = { + componentInstance: {}, + result: Promise.resolve({}), + }; + + jest.spyOn(ngbModal, 'open').mockReturnValue(mockModalRef as any); jest.spyOn(accountService, 'editAccountRequest').mockReturnValue(throwError(() => ({ error: { @@ -410,9 +416,12 @@ describe('AccountRequestTableComponent', () => { component.accountRequests = accountRequestResults; fixture.detectChanges(); - const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => { - return createMockNgbModalRef({}); - }); + const mockModalRef = { + componentInstance: {}, + result: Promise.resolve({}), + }; + + const modalSpy = jest.spyOn(ngbModal, 'open').mockReturnValue(mockModalRef as any); const editedAccountRequest : AccountRequest = { id: 'id', diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index ce51e6ef3c7..889571e5b78 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableRowModel } from './account-request-table-model'; +import { EditRequestModalComponentResult } from './admin-edit-request-modal/admin-edit-request-modal-model'; import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; import { RejectWithReasonModalComponent, @@ -63,14 +64,14 @@ export class AccountRequestTableComponent { modalRef.componentInstance.accountRequestInstitution = accountRequest.instituteAndCountry; modalRef.componentInstance.accountRequestComments = accountRequest.comments; - modalRef.result.then(() => { + modalRef.result.then((res: EditRequestModalComponentResult) => { this.accountService.editAccountRequest( accountRequest.id, - modalRef.componentInstance.accountRequestName, - modalRef.componentInstance.accountRequestEmail, - modalRef.componentInstance.accountRequestInstitution, + res.accountRequestName, + res.accountRequestEmail, + res.accountRequestInstitution, accountRequest.status, - modalRef.componentInstance.accountRequestComments) + res.accountRequestComment) .subscribe({ next: (resp: AccountRequest) => { accountRequest.comments = resp.comments ?? ''; From 4aa2af7367af52d1f3406f7e53b003ed8dfb117e Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:03:04 +0800 Subject: [PATCH 78/95] [#12048] Migrate InstructorStudentListPageE2ETest (#13014) * Migrate InstructorStudentListPageE2ETest * Add InstructorStudentListPageE2ETest to sql xml --------- Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../sql/InstructorStudentListPageE2ETest.java | 123 ++++++++ .../InstructorStudentListPageSql.java | 199 ++++++++++++ .../InstructorStudentListPageE2ETestSql.json | 282 ++++++++++++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + 4 files changed, 605 insertions(+) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/InstructorStudentListPageE2ETest.java create mode 100644 src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPageSql.java create mode 100644 src/e2e/resources/data/InstructorStudentListPageE2ETestSql.json diff --git a/src/e2e/java/teammates/e2e/cases/sql/InstructorStudentListPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/InstructorStudentListPageE2ETest.java new file mode 100644 index 00000000000..b16564db651 --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/InstructorStudentListPageE2ETest.java @@ -0,0 +1,123 @@ +package teammates.e2e.cases.sql; + +import java.util.HashMap; +import java.util.Map; + +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.InstructorCourseEnrollPage; +import teammates.e2e.pageobjects.InstructorCourseStudentDetailsEditPage; +import teammates.e2e.pageobjects.InstructorCourseStudentDetailsViewPage; +import teammates.e2e.pageobjects.InstructorStudentListPageSql; +import teammates.e2e.pageobjects.InstructorStudentRecordsPage; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#INSTRUCTOR_STUDENT_LIST_PAGE}. + */ +public class InstructorStudentListPageE2ETest extends BaseE2ETestCase { + + @Override + protected void prepareTestData() { + testData = removeAndRestoreDataBundle( + loadSqlDataBundle("/InstructorStudentListPageE2ETestSql.json")); + } + + @Test + @Override + public void testAll() { + + ______TS("verify loaded data"); + + Instructor instructor = testData.instructors.get("instructorOfCourse1"); + String instructorId = instructor.getGoogleId(); + + AppUrl listPageUrl = createFrontendUrl(Const.WebPageURIs.INSTRUCTOR_STUDENT_LIST_PAGE); + InstructorStudentListPageSql listPage = loginToPage(listPageUrl, InstructorStudentListPageSql.class, instructorId); + + listPage.verifyAllCoursesHaveTabs(testData.courses.values()); + + Course course1 = testData.courses.get("course1"); + Course course2 = testData.courses.get("course2"); + Course course3 = testData.courses.get("course3"); + + // Expand all headers first + + listPage.clickCourseTabHeader(course1); + listPage.clickCourseTabHeader(course2); + listPage.clickCourseTabHeader(course3); + + Student[] studentsInCourse1 = {}; + + Student[] studentsInCourse3 = { + testData.students.get("Student1Course3"), + testData.students.get("Student2Course3"), + testData.students.get("Student3Course3"), + testData.students.get("Student4Course3"), + }; + + Map courseIdToStudents = new HashMap<>(); + courseIdToStudents.put(course1.getId(), studentsInCourse1); + courseIdToStudents.put(course3.getId(), studentsInCourse3); + + Map courseIdToCourse = new HashMap<>(); + courseIdToCourse.put(course1.getId(), course1); + courseIdToCourse.put(course3.getId(), course3); + + listPage.verifyStudentDetails(courseIdToCourse, courseIdToStudents); + listPage.verifyStudentDetailsNotViewable(course2); + + ______TS("link: enroll page"); + + InstructorCourseEnrollPage enrollPage = listPage.clickEnrollStudents(course3); + enrollPage.verifyIsCorrectPage(course3.getId()); + + listPage = getNewPageInstance(listPageUrl, InstructorStudentListPageSql.class); + listPage.clickCourseTabHeader(course3); + + ______TS("link: view student details page"); + + Student studentToView = testData.students.get("Student1Course3"); + String studentEmail = studentToView.getEmail(); + + InstructorCourseStudentDetailsViewPage studentDetailsViewPage = + listPage.clickViewStudent(course3, studentEmail); + studentDetailsViewPage.verifyIsCorrectPage(course3.getId(), studentEmail); + studentDetailsViewPage.closeCurrentWindowAndSwitchToParentWindow(); + + ______TS("link: edit student details page"); + + InstructorCourseStudentDetailsEditPage studentDetailsEditPage = + listPage.clickEditStudent(course3, studentEmail); + studentDetailsEditPage.verifyIsCorrectPage(course3.getId(), studentEmail); + studentDetailsEditPage.closeCurrentWindowAndSwitchToParentWindow(); + + ______TS("link: view all records page"); + + InstructorStudentRecordsPage studentRecordsPage = + listPage.clickViewAllRecords(course3, studentEmail); + studentRecordsPage.verifyIsCorrectPage(course3.getId(), studentToView.getName()); + studentRecordsPage.closeCurrentWindowAndSwitchToParentWindow(); + + ______TS("action: delete student"); + + Student studentToDelete = testData.students.get("Student3Course3"); + + listPage.deleteStudent(course3, studentToDelete.getEmail()); + + Student[] studentsAfterDelete = { + testData.students.get("Student1Course3"), + testData.students.get("Student2Course3"), + testData.students.get("Student4Course3"), + }; + + listPage.verifyStudentDetails(course3, studentsAfterDelete); + verifyAbsentInDatabase(studentToDelete); + + } + +} diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPageSql.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPageSql.java new file mode 100644 index 00000000000..272a036e169 --- /dev/null +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorStudentListPageSql.java @@ -0,0 +1,199 @@ +package teammates.e2e.pageobjects; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import teammates.e2e.util.TestProperties; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.Student; +import teammates.test.ThreadHelper; + +/** + * Page Object Model for instructor student list page. + */ +public class InstructorStudentListPageSql extends AppPage { + + public InstructorStudentListPageSql(Browser browser) { + super(browser); + } + + @Override + protected boolean containsExpectedPageContents() { + return getPageSource().contains("Students"); + } + + private List getCoursesTabs() { + return browser.driver.findElements(By.className("course-table")); + } + + private String createHeaderText(Course course) { + return String.format("[%s]: %s", course.getId(), course.getName()); + } + + public void clickCourseTabHeader(Course course) { + String targetHeader = createHeaderText(course); + List courseTabs = getCoursesTabs(); + for (WebElement courseTab : courseTabs) { + WebElement headerElement = courseTab.findElement(By.className("card-header")); + String header = headerElement.getText(); + if (header.equals(targetHeader)) { + click(headerElement); + waitForPageToLoad(); + waitUntilAnimationFinish(); + } + } + } + + public void verifyAllCoursesHaveTabs(Collection courses) { + List courseTabs = getCoursesTabs(); + assertEquals(courses.size(), courseTabs.size()); + } + + public void verifyStudentDetails(Map courses, Map students) { + assertEquals(students.size(), courses.size()); + + students.forEach((courseId, studentsForCourse) -> verifyStudentDetails(courses.get(courseId), studentsForCourse)); + } + + public void verifyStudentDetails(Course course, Student[] students) { + WebElement targetCourse = getCourseTab(course); + if (targetCourse == null) { + fail("Course with ID " + course.getId() + " is not found"); + } + + if (students.length == 0) { + String noStudentText = targetCourse.findElement(By.className("card-body")).getText(); + // Need to account for the text from the enroll students button as well + String expectedText = "There are no students in this course." + + TestProperties.LINE_SEPARATOR + "Enroll Students"; + assertEquals(expectedText, noStudentText); + } else { + WebElement studentList = targetCourse.findElement(By.tagName("table")); + verifyTableBodyValues(studentList, getExpectedStudentValues(students)); + verifyDisplayedNumbers(targetCourse, students); + } + } + + public void verifyStudentDetailsNotViewable(Course course) { + WebElement targetCourse = getCourseTab(course); + if (targetCourse == null) { + fail("Course with ID " + course.getId() + " is not found"); + } + String noViewStudentsPermissionText = targetCourse.findElement(By.className("card-body")).getText(); + String expectedText = "You do not have permission to view the details of the students in this course."; + assertEquals(expectedText, noViewStudentsPermissionText); + } + + private WebElement getCourseTab(Course course) { + String targetHeader = createHeaderText(course); + List courseTabs = getCoursesTabs(); + + return courseTabs.stream().filter(courseTab -> { + String courseHeader = courseTab.findElement(By.className("card-header")).getText(); + return targetHeader.equals(courseHeader); + }).findFirst().orElse(null); + } + + private void verifyDisplayedNumbers(WebElement courseTab, Student[] students) { + String nStudents = courseTab.findElement(By.id("num-students")).getText(); + String nSections = courseTab.findElement(By.id("num-sections")).getText(); + String nTeams = courseTab.findElement(By.id("num-teams")).getText(); + + String expectedNStudents = students.length + " students"; + String expectedNSections = Arrays.stream(students) + .map(Student::getSection) + .distinct() + .count() + " sections"; + String expectedNTeams = Arrays.stream(students) + .map(Student::getTeam) + .distinct() + .count() + " teams"; + + assertEquals(expectedNStudents, nStudents); + assertEquals(expectedNSections, nSections); + assertEquals(expectedNTeams, nTeams); + } + + private String[][] getExpectedStudentValues(Student[] students) { + String[][] expected = new String[students.length][5]; + for (int i = 0; i < students.length; i++) { + Student student = students[i]; + expected[i][0] = student.getSectionName(); + expected[i][1] = student.getTeamName(); + expected[i][2] = student.getName(); + expected[i][3] = student.getGoogleId() == null ? "Yet to Join" : "Joined"; + expected[i][4] = student.getEmail(); + } + return expected; + } + + public void deleteStudent(Course course, String studentEmail) { + clickAndConfirm(getDeleteButton(course, studentEmail)); + waitUntilAnimationFinish(); + } + + private WebElement getDeleteButton(Course course, String studentEmail) { + WebElement studentRow = getStudentRow(course, studentEmail); + return studentRow.findElement(By.cssSelector("[id^='btn-delete-']")); + } + + private WebElement getStudentRow(Course course, String studentEmail) { + WebElement targetCourse = getCourseTab(course); + if (targetCourse == null) { + fail("Course with ID " + course.getId() + " is not found"); + } + + List studentRows = targetCourse.findElements(By.cssSelector("tbody tr")); + for (WebElement studentRow : studentRows) { + List studentCells = studentRow.findElements(By.tagName("td")); + if (studentCells.get(4).getText().equals(studentEmail)) { + return studentRow; + } + } + return null; + } + + public InstructorCourseEnrollPage clickEnrollStudents(Course course) { + WebElement studentRow = getCourseTab(course); + WebElement enrollButton = studentRow.findElement(By.id("btn-enroll")); + click(enrollButton); + waitForPageToLoad(); + return changePageType(InstructorCourseEnrollPage.class); + } + + public InstructorCourseStudentDetailsViewPage clickViewStudent(Course course, String studentEmail) { + WebElement studentRow = getStudentRow(course, studentEmail); + WebElement viewButton = studentRow.findElement(By.cssSelector("[id^='btn-view-details-']")); + click(viewButton); + ThreadHelper.waitFor(2000); + switchToNewWindow(); + return changePageType(InstructorCourseStudentDetailsViewPage.class); + } + + public InstructorCourseStudentDetailsEditPage clickEditStudent(Course course, String studentEmail) { + WebElement studentRow = getStudentRow(course, studentEmail); + WebElement viewButton = studentRow.findElement(By.cssSelector("[id^='btn-edit-details-']")); + click(viewButton); + ThreadHelper.waitFor(2000); + switchToNewWindow(); + return changePageType(InstructorCourseStudentDetailsEditPage.class); + } + + public InstructorStudentRecordsPage clickViewAllRecords(Course course, String studentEmail) { + WebElement studentRow = getStudentRow(course, studentEmail); + WebElement viewButton = studentRow.findElement(By.cssSelector("[id^='btn-view-records-']")); + click(viewButton); + ThreadHelper.waitFor(2000); + switchToNewWindow(); + return changePageType(InstructorStudentRecordsPage.class); + } + +} diff --git a/src/e2e/resources/data/InstructorStudentListPageE2ETestSql.json b/src/e2e/resources/data/InstructorStudentListPageE2ETestSql.json new file mode 100644 index 00000000000..41c5f4af82e --- /dev/null +++ b/src/e2e/resources/data/InstructorStudentListPageE2ETestSql.json @@ -0,0 +1,282 @@ +{ + "accounts": { + "instructorOfCourse1": { + "googleId": "tm.e2e.ISList.instr1", + "name": "Instructor of Course 1", + "email": "ISList.instr1@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000001" + }, + "Student3Course3": { + "googleId": "tm.e2e.ISList.charlie.tmms", + "name": "Charlie D", + "email": "ISList.charlie.tmms@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000002" + } + }, + "accountRequests": {}, + "courses": { + "course1": { + "id": "tm.e2e.ISList.course1", + "name": "Name of Course 1", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 1" + }, + "course2": { + "id": "tm.e2e.ISList.course2", + "name": "Name of Course 2", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 1" + }, + "course3": { + "id": "tm.e2e.ISList.course3", + "name": "Name of Course 3", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 5" + } + }, + "sections": { + "tm.e2e.ISList.course2-SectionA": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "tm.e2e.ISList.course2" + }, + "name": "Section A" + }, + "tm.e2e.ISList.course2-SectionB": { + "id": "00000000-0000-4000-8000-000000000202", + "course": { + "id": "tm.e2e.ISList.course2" + }, + "name": "Section B" + }, + "tm.e2e.ISList.course3-Section1": { + "id": "00000000-0000-4000-8000-000000000203", + "course": { + "id": "tm.e2e.ISList.course3" + }, + "name": "Section 1" + } + }, + "teams": { + "tm.e2e.ISList.course2-SectionA-Team1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + }, + "tm.e2e.ISList.course2-SectionB-Team2": { + "id": "00000000-0000-4000-8000-000000000302", + "section": { + "id": "00000000-0000-4000-8000-000000000202" + }, + "name": "Team 2" + }, + "tm.e2e.ISList.course3-Section1-Team1": { + "id": "00000000-0000-4000-8000-000000000303", + "section": { + "id": "00000000-0000-4000-8000-000000000203" + }, + "name": "Team 1" + }, + "tm.e2e.ISList.course3-Section1-Team2": { + "id": "00000000-0000-4000-8000-000000000304", + "section": { + "id": "00000000-0000-4000-8000-000000000203" + }, + "name": "Team 2" + } + }, + "deadlineExtensions": {}, + "instructors": { + "instructorOfCourse1": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "courseId": "tm.e2e.ISList.course1", + "course": { + "id": "tm.e2e.ISList.course1" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Instructor1 Course1", + "email": "ISList.instr1@gmail.tmt" + }, + "instructorOfCourse2": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_CUSTOM", + "privileges": { + "courseLevel": { + "canModifyCourse": false, + "canModifyInstructor": false, + "canModifySession": false, + "canModifyStudent": false, + "canViewStudentInSections": false, + "canViewSessionInSections": false, + "canSubmitSessionInSections": false, + "canModifySessionCommentsInSections": false + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000502", + "courseId": "tm.e2e.ISList.course2", + "course": { + "id": "tm.e2e.ISList.course2" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Instructor1 Course2", + "email": "ISList.instr1@gmail.tmt" + }, + "instructorOfCourse3": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000503", + "courseId": "tm.e2e.ISList.course3", + "course": { + "id": "tm.e2e.ISList.course3" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Instructor1 Course3", + "email": "ISList.instr1@gmail.tmt" + } + }, + "students": { + "Student1Course2": { + "comments": "This student's name is Alice", + "id": "00000000-0000-4000-8000-000000000601", + "courseId": "tm.e2e.ISList.course2", + "course": { + "id": "tm.e2e.ISList.course2" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Alice", + "email": "ISList.alice.tmms@gmail.tmt" + }, + "Student2Course2": { + "comments": "This student's name is Benny Charles", + "id": "00000000-0000-4000-8000-000000000602", + "courseId": "tm.e2e.ISList.course2", + "course": { + "id": "tm.e2e.ISList.course2" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000302" + }, + "name": "Benny Charles", + "email": "benny.c.tmms@gmail.tmt" + }, + "Student3Course2": { + "comments": "This student's name is Hugh Ivanov", + "id": "00000000-0000-4000-8000-000000000603", + "courseId": "tm.e2e.ISList.course2", + "course": { + "id": "tm.e2e.ISList.course2" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000302" + }, + "name": "Hugh Ivanov", + "email": "hugh.i.tmms@gmail.tmt" + }, + "Student1Course3": { + "comments": "This student's name is Alice", + "id": "00000000-0000-4000-8000-000000000604", + "courseId": "tm.e2e.ISList.course3", + "course": { + "id": "tm.e2e.ISList.course3" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Alice Betsy", + "email": "ISList.alice.tmms@gmail.tmt" + }, + "Student2Course3": { + "comments": "This student's name is Benny Charles", + "id": "00000000-0000-4000-8000-000000000605", + "courseId": "tm.e2e.ISList.course3", + "course": { + "id": "tm.e2e.ISList.course3" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Benny Charles", + "email": "benny.c.tmms@gmail.tmt" + }, + "Student3Course3": { + "comments": "This student's name is Charlie Davis", + "id": "00000000-0000-4000-8000-000000000606", + "courseId": "tm.e2e.ISList.course3", + "course": { + "id": "tm.e2e.ISList.course3" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000002" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000304" + }, + "name": "Charlie D", + "email": "ISList.charlie.tmms@gmail.tmt" + }, + "Student4Course3": { + "comments": "This student's name is Denny Charlés", + "id": "00000000-0000-4000-8000-000000000607", + "courseId": "tm.e2e.ISList.course3", + "course": { + "id": "tm.e2e.ISList.course3" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000304" + }, + "name": "Denny Charlés", + "email": "denny.c.tmms@gmail.tmt" + } + }, + "feedbackSessions": {}, + "feedbackQuestions": {}, + "feedbackResponses": {}, + "feedbackResponseComments": {}, + "notifications": {}, + "readNotifications": {} +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index fb3f2597ed6..a78c2339825 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -12,6 +12,7 @@ + From c665348430ab86aa700979f6554ed8c360e1855b Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Fri, 19 Apr 2024 05:05:20 +0800 Subject: [PATCH 79/95] [#12048] Migrate instructor home page e2e test (#13016) * return FeedbackSession directly from moveFeedbackSessionToRecycleBin * Add verify accessible for RestoreFeedbackSessionAction and pass correct params to fsDb.getSoftDeletedFeedbackSession * add feedbacksession to getEntity * add getfeedbacksession methods * migrate instructorhome page e2e test * fix checkstyle issues * fix pmd issues * sort course by name instead of creation time --------- Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../e2e/cases/sql/BaseE2ETestCase.java | 23 + .../cases/sql/InstructorHomePageE2ETest.java | 261 ++++++++++ .../e2e/pageobjects/InstructorHomePage.java | 64 +++ .../data/InstructorHomePageE2ETestSql.json | 452 ++++++++++++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + .../java/teammates/sqllogic/api/Logic.java | 6 +- .../sqllogic/core/FeedbackSessionsLogic.java | 6 +- .../storage/sqlapi/FeedbackSessionsDb.java | 6 +- .../storage/sqlentity/FeedbackSession.java | 9 +- .../ui/webapi/BinFeedbackSessionAction.java | 6 +- .../webapi/RestoreFeedbackSessionAction.java | 21 +- .../java/teammates/test/AbstractBackDoor.java | 10 +- .../BaseTestCaseWithSqlDatabaseAccess.java | 4 + 13 files changed, 847 insertions(+), 22 deletions(-) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/InstructorHomePageE2ETest.java create mode 100644 src/e2e/resources/data/InstructorHomePageE2ETestSql.json diff --git a/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java b/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java index fbfd60ea84b..6878da94e44 100644 --- a/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java +++ b/src/e2e/java/teammates/e2e/cases/sql/BaseE2ETestCase.java @@ -22,12 +22,15 @@ import teammates.e2e.util.TestProperties; import teammates.storage.sqlentity.FeedbackQuestion; import teammates.storage.sqlentity.FeedbackResponse; +import teammates.storage.sqlentity.FeedbackSession; import teammates.storage.sqlentity.Student; import teammates.test.BaseTestCaseWithSqlDatabaseAccess; import teammates.test.FileHelper; import teammates.test.ThreadHelper; import teammates.ui.output.FeedbackQuestionData; import teammates.ui.output.FeedbackResponseData; +import teammates.ui.output.FeedbackSessionData; +import teammates.ui.output.FeedbackSessionPublishStatus; import teammates.ui.output.StudentData; /** @@ -266,6 +269,26 @@ protected StudentData getStudent(Student student) { return getStudent(student.getCourseId(), student.getEmail()); } + FeedbackSessionData getFeedbackSession(String courseId, String feedbackSessionName) { + return BACKDOOR.getFeedbackSessionData(courseId, feedbackSessionName); + } + + @Override + protected FeedbackSessionData getFeedbackSession(FeedbackSession feedbackSession) { + return getFeedbackSession(feedbackSession.getCourse().getId(), feedbackSession.getName()); + } + + /** + * Checks if the feedback session is published. + */ + protected boolean isFeedbackSessionPublished(FeedbackSessionPublishStatus status) { + return status == FeedbackSessionPublishStatus.PUBLISHED; + } + + FeedbackSessionData getSoftDeletedSession(String feedbackSessionName, String instructorId) { + return BACKDOOR.getSoftDeletedSessionData(feedbackSessionName, instructorId); + } + /** * Puts the documents in the database using BACKDOOR. * @param dataBundle the data to be put in the database diff --git a/src/e2e/java/teammates/e2e/cases/sql/InstructorHomePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/InstructorHomePageE2ETest.java new file mode 100644 index 00000000000..239de4ce25c --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/InstructorHomePageE2ETest.java @@ -0,0 +1,261 @@ +package teammates.e2e.cases.sql; + +import java.time.Duration; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.InstructorHomePage; +import teammates.e2e.util.TestProperties; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; +import teammates.test.ThreadHelper; +import teammates.ui.output.FeedbackSessionData; + +/** + * SUT: {@link Const.WebPageURIs#INSTRUCTOR_HOME_PAGE}. + */ +public class InstructorHomePageE2ETest extends BaseE2ETestCase { + private Instructor instructor; + private Student studentToEmail; + private Course course; + private Course otherCourse; + + private FeedbackSession feedbackSessionAwaiting; + private FeedbackSession feedbackSessionOpen; + private FeedbackSession feedbackSessionClosed; + private FeedbackSession feedbackSessionPublished; + private FeedbackSession otherCourseSession; + + private String fileName; + + @Override + protected void prepareTestData() { + testData = loadSqlDataBundle("/InstructorHomePageE2ETestSql.json"); + studentToEmail = testData.students.get("IHome.charlie.d.tmms@IHome.CS2104"); + studentToEmail.setEmail(TestProperties.TEST_EMAIL); + testData = removeAndRestoreDataBundle(testData); + putDocuments(testData); + + instructor = testData.instructors.get("IHome.instr.CS2104"); + course = testData.courses.get("IHome.CS2104"); + otherCourse = testData.courses.get("IHome.CS1101"); + + feedbackSessionAwaiting = testData.feedbackSessions.get("Second Feedback Session"); + feedbackSessionOpen = testData.feedbackSessions.get("First Feedback Session"); + feedbackSessionClosed = testData.feedbackSessions.get("Third Feedback Session"); + feedbackSessionPublished = testData.feedbackSessions.get("Fourth Feedback Session"); + otherCourseSession = testData.feedbackSessions.get("CS1101 Session"); + + fileName = "/" + feedbackSessionOpen.getCourse().getId() + "_" + feedbackSessionOpen.getName() + + "_result.csv"; + } + + @BeforeClass + public void classSetup() { + deleteDownloadsFile(fileName); + } + + @Test + @Override + public void testAll() { + AppUrl url = createFrontendUrl(Const.WebPageURIs.INSTRUCTOR_HOME_PAGE); + InstructorHomePage homePage = loginToPage(url, InstructorHomePage.class, instructor.getGoogleId()); + + ______TS("verify loaded data"); + homePage.sortCoursesById(); + int courseIndex = 1; + int otherCourseIndex = 0; + // by default, sessions are sorted by end date in descending order + FeedbackSession[] courseSessions = { feedbackSessionOpen, feedbackSessionAwaiting, + feedbackSessionClosed, feedbackSessionPublished }; + FeedbackSession[] otherCourseSessions = { otherCourseSession }; + // use course index instead of searching for course in table to test sorted order of courses + homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessions); + homePage.verifyCourseTabDetails(courseIndex, course, courseSessions); + + ______TS("notification banner is visible"); + assertTrue(homePage.isBannerVisible()); + + ______TS("verify response rate"); + for (int i = 0; i < courseSessions.length; i++) { + homePage.verifyResponseRate(courseIndex, i, getExpectedResponseRate(courseSessions[i])); + } + + ______TS("copy session with modified session timings"); + int sessionIndex = 1; + String newName = "Copied Name"; + FeedbackSession copiedSession = feedbackSessionAwaiting.getCopy(); + copiedSession.setCourse(otherCourse); + copiedSession.setName(newName); + copiedSession.setCreatedAt(Instant.now()); + int startHour = ZonedDateTime.ofInstant(copiedSession.getStartTime(), + ZoneId.of(copiedSession.getCourse().getTimeZone())).getHour(); + copiedSession.setStartTime(ZonedDateTime.now(ZoneId.of(otherCourse.getTimeZone())).plus(Duration.ofDays(2)) + .withHour(startHour).truncatedTo(ChronoUnit.HOURS).toInstant()); + int endHour = ZonedDateTime.ofInstant(copiedSession.getEndTime(), ZoneId.of(copiedSession.getCourse().getTimeZone())) + .getHour(); + copiedSession.setEndTime(ZonedDateTime.now(ZoneId.of(otherCourse.getTimeZone())).plus(Duration.ofDays(7)) + .withHour(endHour).truncatedTo(ChronoUnit.HOURS).toInstant()); + copiedSession.setSessionVisibleFromTime(ZonedDateTime.now(ZoneId.of(otherCourse.getTimeZone())) + .minus(Duration.ofDays(28)).withHour(startHour).truncatedTo(ChronoUnit.HOURS).toInstant()); + copiedSession.setResultsVisibleFromTime(Const.TIME_REPRESENTS_LATER); + homePage.copySession(courseIndex, sessionIndex, otherCourse, newName); + + homePage.waitForConfirmationModalAndClickOk(); + homePage = getNewPageInstance(url, InstructorHomePage.class); + homePage.sortCoursesByName(); + // flip index after sorting + courseIndex = 0; + otherCourseIndex = 1; + FeedbackSession[] otherCourseSessionsWithCopy = { copiedSession, otherCourseSession }; + homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessionsWithCopy); + verifyPresentInDatabase(copiedSession); + + ______TS("copy session with same session timings"); + sessionIndex = 0; + newName = "Copied Name 2"; + FeedbackSession copiedSession2 = copiedSession.getCopy(); + copiedSession2.setName(newName); + copiedSession2.setCreatedAt(Instant.now()); + homePage.copySession(otherCourseIndex, sessionIndex, otherCourse, newName); + + homePage.verifyStatusMessage("The feedback session has been copied. " + + "Please modify settings/questions as necessary."); + homePage = getNewPageInstance(url, InstructorHomePage.class); + homePage.sortCoursesByName(); + FeedbackSession[] otherCourseSessionsWithTwoCopies = { copiedSession, copiedSession2, otherCourseSession }; + homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessionsWithTwoCopies); + verifyPresentInDatabase(copiedSession2); + + ______TS("publish results"); + sessionIndex = 0; + feedbackSessionOpen.setResultsVisibleFromTime(Const.TIME_REPRESENTS_NOW); + homePage.publishSessionResults(courseIndex, sessionIndex); + + homePage.verifyStatusMessage("The feedback session has been published. " + + "Please allow up to 1 hour for all the notification emails to be sent out."); + homePage.verifySessionDetails(courseIndex, sessionIndex, feedbackSessionOpen); + verifySessionPublishedState(feedbackSessionOpen, true); + verifyEmailSent(studentToEmail.getEmail(), "TEAMMATES: Feedback session results published" + + " [Course: " + course.getName() + "][Feedback Session: " + + feedbackSessionOpen.getName() + "]"); + + ______TS("send reminder email to selected student"); + homePage.sendReminderEmailToSelectedStudent(courseIndex, sessionIndex, studentToEmail); + + homePage.verifyStatusMessage("Reminder e-mails have been sent out to those students" + + " and instructors. Please allow up to 1 hour for all the notification emails to be sent out."); + verifyEmailSent(studentToEmail.getEmail(), "TEAMMATES: Feedback session reminder" + + " [Course: " + course.getName() + "][Feedback Session: " + + feedbackSessionOpen.getName() + "]"); + + ______TS("send reminder email to all student non-submitters"); + homePage.sendReminderEmailToNonSubmitters(courseIndex, sessionIndex); + + homePage.verifyStatusMessage("Reminder e-mails have been sent out to those students" + + " and instructors. Please allow up to 1 hour for all the notification emails to be sent out."); + verifyEmailSent(studentToEmail.getEmail(), "TEAMMATES: Feedback session reminder" + + " [Course: " + course.getName() + "][Feedback Session: " + + feedbackSessionOpen.getName() + "]"); + ______TS("resend results link"); + homePage.resendResultsLink(courseIndex, sessionIndex, studentToEmail); + + homePage.verifyStatusMessage("Session published notification emails have been resent" + + " to those students and instructors. Please allow up to 1 hour for all the notification emails to be" + + " sent out."); + verifyEmailSent(studentToEmail.getEmail(), "TEAMMATES: Feedback session results published" + + " [Course: " + course.getName() + "][Feedback Session: " + + feedbackSessionOpen.getName() + "]"); + + ______TS("unpublish results"); + feedbackSessionOpen.setResultsVisibleFromTime(Const.TIME_REPRESENTS_LATER); + homePage.unpublishSessionResults(courseIndex, sessionIndex); + + homePage.verifyStatusMessage("The feedback session has been unpublished."); + homePage.verifySessionDetails(courseIndex, sessionIndex, feedbackSessionOpen); + verifySessionPublishedState(feedbackSessionOpen, false); + verifyEmailSent(studentToEmail.getEmail(), "TEAMMATES: Feedback session results unpublished" + + " [Course: " + course.getName() + "][Feedback Session: " + + feedbackSessionOpen.getName() + "]"); + + ______TS("download results"); + homePage.downloadResults(courseIndex, sessionIndex); + List expectedContent = Arrays.asList("Course,tm.e2e.IHome.CS2104", + "Session Name,First Feedback Session", "Question 1,Rate 5 other students' products"); + verifyDownloadedFile(fileName, expectedContent); + + ______TS("soft delete session"); + sessionIndex = 1; + copiedSession.setDeletedAt(Instant.now()); + homePage.deleteSession(otherCourseIndex, sessionIndex); + + homePage.verifyStatusMessage("The feedback session has been deleted. " + + "You can restore it from the 'Sessions' tab."); + homePage.sortCoursesByName(); + otherCourseIndex = 1; + FeedbackSession[] otherCourseSessionsWithCopyTwo = { copiedSession, otherCourseSession }; + homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessionsWithCopyTwo); + assertNotNull(getSoftDeletedSession(copiedSession2.getName(), + instructor.getGoogleId())); + + ______TS("delete course"); + otherCourseIndex = 1; + homePage.deleteCourse(otherCourseIndex); + + homePage.verifyStatusMessage("The course " + otherCourse.getId() + " has been deleted. " + + "You can restore it from the Recycle Bin manually."); + homePage.verifyNumCourses(1); + assertTrue(BACKDOOR.isCourseInRecycleBin(otherCourse.getId())); + } + + private String getExpectedResponseRate(FeedbackSession session) { + String sessionName = session.getName(); + boolean hasQuestion = testData.feedbackQuestions.values() + .stream() + .anyMatch(q -> q.getFeedbackSessionName().equals(sessionName)); + + if (!hasQuestion) { + return "0 / 0"; + } + + long numStudents = testData.students.values() + .stream() + .filter(s -> s.getCourse().getId().equals(session.getCourse().getId())) + .count(); + + Set uniqueGivers = new HashSet<>(); + testData.feedbackResponses.values() + .stream() + .filter(r -> r.getFeedbackQuestion().getFeedbackSessionName().equals(sessionName)) + .forEach(r -> uniqueGivers.add(r.getGiver())); + int numResponses = uniqueGivers.size(); + + return numResponses + " / " + numStudents; + } + + private void verifySessionPublishedState(FeedbackSession feedbackSession, boolean state) { + int retryLimit = 5; + FeedbackSessionData actual = getFeedbackSession(feedbackSession.getCourse().getId(), + feedbackSession.getName()); + while (isFeedbackSessionPublished(actual.getPublishStatus()) != state && retryLimit > 0) { + retryLimit--; + ThreadHelper.waitFor(1000); + actual = getFeedbackSession(feedbackSession.getCourse().getId(), + feedbackSession.getName()); + } + assertEquals(isFeedbackSessionPublished(actual.getPublishStatus()), state); + } +} diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java index 21dbce2247a..ab9ee676def 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorHomePage.java @@ -12,6 +12,9 @@ import teammates.common.datatransfer.attributes.CourseAttributes; import teammates.common.datatransfer.attributes.FeedbackSessionAttributes; import teammates.common.datatransfer.attributes.StudentAttributes; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Student; /** * Represents the instructor home page. @@ -38,12 +41,29 @@ public void verifyCourseTabDetails(int courseTabIndex, CourseAttributes course, verifyTableBodyValues(getSessionsTable(courseTabIndex), expectedValues); } + public void verifyCourseTabDetails(int courseTabIndex, Course course, FeedbackSession[] sessions) { + String expectedDetails = "[" + course.getId() + "]: " + course.getName(); + assertEquals(getCourseDetails(courseTabIndex), expectedDetails); + + String[][] expectedValues = new String[sessions.length][5]; + for (int i = 0; i < sessions.length; i++) { + expectedValues[i] = getExpectedSessionDetails(sessions[i]); + } + verifyTableBodyValues(getSessionsTable(courseTabIndex), expectedValues); + } + public void verifySessionDetails(int courseTabIndex, int sessionIndex, FeedbackSessionAttributes session) { String[] expectedValues = getExpectedSessionDetails(session); WebElement sessionRow = getSessionsTable(courseTabIndex).findElements(By.cssSelector("tbody tr")).get(sessionIndex); verifyTableRowValues(sessionRow, expectedValues); } + public void verifySessionDetails(int courseTabIndex, int sessionIndex, FeedbackSession session) { + String[] expectedValues = getExpectedSessionDetails(session); + WebElement sessionRow = getSessionsTable(courseTabIndex).findElements(By.cssSelector("tbody tr")).get(sessionIndex); + verifyTableRowValues(sessionRow, expectedValues); + } + public void verifyNumCourses(int expectedNum) { assertEquals(getNumCourses(), expectedNum); } @@ -59,6 +79,13 @@ public void copySession(int courseTabIndex, int sessionIndex, CourseAttributes c click(browser.driver.findElement(By.id("btn-confirm-copy-course"))); } + public void copySession(int courseTabIndex, int sessionIndex, Course copyToCourse, String newSessionName) { + WebElement copyFsModal = clickCopyButtonInTable(courseTabIndex, sessionIndex); + fillTextBox(copyFsModal.findElement(By.id("copy-session-name")), newSessionName); + selectCourseToCopyToInModal(copyFsModal, copyToCourse.getId()); + click(browser.driver.findElement(By.id("btn-confirm-copy-course"))); + } + public void publishSessionResults(int courseTabIndex, int sessionIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-results-" + sessionIndex))); @@ -85,6 +112,18 @@ public void sendReminderEmailToSelectedStudent(int courseTabIndex, int sessionIn click(courseTab.findElement(By.className("btn-remind-" + sessionIndex))); } + public void sendReminderEmailToSelectedStudent(int courseTabIndex, int sessionIndex, Student student) { + WebElement courseTab = getCourseTab(courseTabIndex); + click(courseTab.findElement(By.className("btn-remind-" + sessionIndex))); + List remindSelectedButtons = browser.driver.findElements( + By.className("btn-remind-selected-" + sessionIndex) + ); + click(remindSelectedButtons.get(remindSelectedButtons.size() - 1)); + selectStudentToEmail(student.getEmail()); + click(browser.driver.findElement(By.id("btn-confirm-send-reminder"))); + click(courseTab.findElement(By.className("btn-remind-" + sessionIndex))); + } + public void sendReminderEmailToNonSubmitters(int courseTabIndex, int sessionIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-remind-" + sessionIndex))); @@ -104,6 +143,14 @@ public void resendResultsLink(int courseTabIndex, int sessionIndex, StudentAttri click(browser.driver.findElement(By.id("btn-confirm-resend-results"))); } + public void resendResultsLink(int courseTabIndex, int sessionIndex, Student student) { + WebElement courseTab = getCourseTab(courseTabIndex); + click(courseTab.findElement(By.className("btn-results-" + sessionIndex))); + click(waitForElementPresence(By.className("btn-resend-" + sessionIndex))); + selectStudentToEmail(student.getEmail()); + click(browser.driver.findElement(By.id("btn-confirm-resend-results"))); + } + public void downloadResults(int courseTabIndex, int sessionIndex) { WebElement courseTab = getCourseTab(courseTabIndex); click(courseTab.findElement(By.className("btn-results-" + sessionIndex))); @@ -183,6 +230,23 @@ private String[] getExpectedSessionDetails(FeedbackSessionAttributes session) { return details; } + private String[] getExpectedSessionDetails(FeedbackSession session) { + String[] details = new String[5]; + details[0] = session.getName(); + details[1] = getDateString(session.getStartTime(), session.getCourse().getTimeZone()); + details[2] = getDateString(session.getEndTime(), session.getCourse().getTimeZone()); + + if (session.isClosed()) { + details[3] = "Closed"; + } else if (session.isVisible() && (session.isOpened() || session.isInGracePeriod())) { + details[3] = "Open"; + } else { + details[3] = "Awaiting"; + } + details[4] = session.isPublished() ? "Published" : "Not Published"; + return details; + } + private String getResponseRate(int courseTabIndex, int sessionIndex) { WebElement showButton = null; try { diff --git a/src/e2e/resources/data/InstructorHomePageE2ETestSql.json b/src/e2e/resources/data/InstructorHomePageE2ETestSql.json new file mode 100644 index 00000000000..ec5fa8858b7 --- /dev/null +++ b/src/e2e/resources/data/InstructorHomePageE2ETestSql.json @@ -0,0 +1,452 @@ +{ + "accounts": { + "IHome.instr": { + "id": "00000000-0000-4000-8000-000000000001", + "googleId": "tm.e2e.IHome.instructor.tmms", + "name": "Teammates Test", + "email": "IHome.instructor.tmms@gmail.tmt" + } + }, + "accountRequests": {}, + "courses": { + "IHome.CS2104": { + "id": "tm.e2e.IHome.CS2104", + "name": "Programming Language Concepts", + "timeZone": "Asia/Singapore", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2012-04-01T23:58:00Z" + }, + "IHome.CS1101": { + "id": "tm.e2e.IHome.CS1101", + "name": "Programming Methodology", + "timeZone": "Asia/Singapore", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2013-04-01T23:59:00Z" + } + }, + "sections": { + "tm.e2e.IHome.CS2104-None": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "name": "None" + }, + "tm.e2e.IHome.CS1101-None": { + "id": "00000000-0000-4000-8000-000000000202", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "name": "None" + } + }, + "teams": { + "tm.e2e.IHome.CS2104-None-Team1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + }, + "tm.e2e.IHome.CS2104-None-Team2": { + "id": "00000000-0000-4000-8000-000000000302", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 2" + }, + "tm.e2e.IHome.CS1101-None-Team1": { + "id": "00000000-0000-4000-8000-000000000303", + "section": { + "id": "00000000-0000-4000-8000-000000000202" + }, + "name": "Team 1" + }, + "tm.e2e.IHome.CS1101-None-Team2": { + "id": "00000000-0000-4000-8000-000000000304", + "section": { + "id": "00000000-0000-4000-8000-000000000202" + }, + "name": "Team 2" + } + }, + "deadlineExtensions": {}, + "instructors": { + "IHome.instr.CS2104": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "courseId": "tm.e2e.IHome.CS2104", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "IHome.instructor.tmms@gmail.tmt" + }, + "IHome.instr.CS1101": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000502", + "courseId": "tm.e2e.IHome.CS1101", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "IHome.instructor.tmms@gmail.tmt" + } + }, + "students": { + "IHome.alice.b.tmms@IHome.CS2104": { + "comments": "This student's name is Alice Betsy", + "id": "00000000-0000-4000-8000-000000000601", + "courseId": "tm.e2e.IHome.CS2104", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Alice Betsy", + "email": "IHome.alice.b.tmms@gmail.tmt" + }, + "IHome.benny.c.tmms@IHome.CS2104": { + "comments": "This student's name is Benny Charles", + "id": "00000000-0000-4000-8000-000000000602", + "courseId": "tm.e2e.IHome.CS2104", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Benny Charles", + "email": "IHome.benny.c.tmms@gmail.tmt" + }, + "IHome.charlie.d.tmms@IHome.CS2104": { + "comments": "This student's name is Charlie Davis", + "id": "00000000-0000-4000-8000-000000000603", + "courseId": "tm.e2e.IHome.CS2104", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000302" + }, + "name": "Charlie Davis", + "email": "IHome.charlie.d.tmms@gmail.tmt" + }, + "IHome.danny.e.tmms@IHome.CS2104": { + "comments": "This student's name is Danny Engrid", + "id": "00000000-0000-4000-8000-000000000604", + "courseId": "tm.e2e.IHome.CS2104", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000302" + }, + "name": "Danny Engrid", + "email": "IHome.danny.e.tmms@gmail.tmt" + }, + "IHome.alice.b.tmms@IHome.CS1101": { + "comments": "This student's name is Alice Betsy", + "id": "00000000-0000-4000-8000-000000000605", + "courseId": "tm.e2e.IHome.CS1101", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Alice Betsy", + "email": "IHome.alice.b.tmms@gmail.tmt" + }, + "IHome.benny.c.tmms@IHome.CS1101": { + "comments": "This student's name is Benny Charles", + "id": "00000000-0000-4000-8000-000000000606", + "courseId": "tm.e2e.IHome.CS1101", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000303" + }, + "name": "Benny Charles", + "email": "IHome.benny.c.tmms@gmail.tmt" + }, + "IHome.charlie.d.tmms@IHome.CS1101": { + "comments": "This student's name is Charlie Davis", + "id": "00000000-0000-4000-8000-000000000607", + "courseId": "tm.e2e.IHome.CS1101", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000304" + }, + "name": "Charlie Davis", + "email": "IHome.charlie.d.tmms@gmail.tmt" + }, + "IHome.danny.e.tmms@IHome.CS1101": { + "comments": "This student's name is Danny Engrid", + "id": "00000000-0000-4000-8000-000000000608", + "courseId": "tm.e2e.IHome.CS1101", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000304" + }, + "name": "Danny Engrid", + "email": "IHome.danny.e.tmms@gmail.tmt" + } + }, + "feedbackSessions": { + "First Feedback Session": { + "id": "00000000-0000-4000-8000-000000000701", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "name": "First Feedback Session", + "creatorEmail": "IHome.instructor.tmms@gmail.tmt", + "instructions": "Please please fill in the following questions.", + "startTime": "2012-04-01T04:00:00Z", + "endTime": "2027-04-30T16:00:00Z", + "sessionVisibleFromTime": "2012-03-28T16:00:00Z", + "resultsVisibleFromTime": "2027-05-01T16:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-03-20T23:59:00Z" + }, + "Second Feedback Session": { + "id": "00000000-0000-4000-8000-000000000702", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "name": "Second Feedback Session", + "creatorEmail": "IHome.instructor.tmms@gmail.tmt", + "instructions": "Please please fill in the following questions.", + "startTime": "2012-03-29T04:00:00Z", + "endTime": "2012-05-01T04:00:00Z", + "sessionVisibleFromTime": "2012-03-28T16:00:00Z", + "resultsVisibleFromTime": "2012-05-01T16:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-03-20T23:59:00Z" + }, + "Third Feedback Session": { + "id": "00000000-0000-4000-8000-000000000703", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "name": "Third Feedback Session", + "creatorEmail": "IHome.instructor.tmms@gmail.tmt", + "instructions": "Please please fill in the following questions.", + "startTime": "2012-04-10T16:00:00Z", + "endTime": "2012-04-30T16:00:00Z", + "sessionVisibleFromTime": "2012-03-28T16:00:00Z", + "resultsVisibleFromTime": "2027-05-01T16:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-03-20T23:59:00Z" + }, + "Fourth Feedback Session": { + "id": "00000000-0000-4000-8000-000000000704", + "course": { + "id": "tm.e2e.IHome.CS2104" + }, + "name": "Fourth Feedback Session", + "creatorEmail": "IHome.instructor.tmms@gmail.tmt", + "instructions": "Please please fill in the following questions.", + "startTime": "2012-04-05T04:00:00Z", + "endTime": "2012-04-20T04:00:00Z", + "sessionVisibleFromTime": "2012-03-28T16:00:00Z", + "resultsVisibleFromTime": "2012-05-01T16:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-03-20T23:59:00Z" + }, + "CS1101 Session": { + "id": "00000000-0000-4000-8000-000000000705", + "course": { + "id": "tm.e2e.IHome.CS1101" + }, + "name": "CS1101 Session", + "creatorEmail": "IHome.instructor.tmms@gmail.tmt", + "instructions": "Please please fill in the following questions.", + "startTime": "2012-04-05T04:00:00Z", + "endTime": "2012-04-20T04:00:00Z", + "sessionVisibleFromTime": "2012-03-28T16:00:00Z", + "resultsVisibleFromTime": "2012-05-01T16:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-03-20T23:59:00Z" + } + }, + "feedbackQuestions": { + "IHome.CS2104:First Feedback Session:Q1": { + "questionDetails": { + "shouldAllowRichText": true, + "questionType": "TEXT", + "questionText": "Rate 5 other students' products" + }, + "id": "00000000-0000-4000-8000-000000000801", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000701" + }, + "description": "Feedback text question.", + "questionNumber": 1, + "giverType": "STUDENTS", + "recipientType": "STUDENTS", + "numOfEntitiesToGiveFeedbackTo": 5, + "showResponsesTo": [ + "INSTRUCTORS", + "RECEIVER" + ], + "showGiverNameTo": [ + "INSTRUCTORS" + ], + "showRecipientNameTo": [ + "INSTRUCTORS", + "RECEIVER" + ] + }, + "IHome.CS2104:Third Feedback Session:Q1": { + "questionDetails": { + "shouldAllowRichText": true, + "questionType": "TEXT", + "questionText": "Rate 5 other students' products" + }, + "id": "00000000-0000-4000-8000-000000000802", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000703" + }, + "description": "Feedback text question.", + "questionNumber": 1, + "giverType": "STUDENTS", + "recipientType": "STUDENTS", + "numOfEntitiesToGiveFeedbackTo": 5, + "showResponsesTo": [ + "INSTRUCTORS", + "RECEIVER" + ], + "showGiverNameTo": [ + "INSTRUCTORS" + ], + "showRecipientNameTo": [ + "INSTRUCTORS", + "RECEIVER" + ] + } + }, + "feedbackResponses": { + "response1": { + "answer": { + "answer": "Alice response to Danny.", + "questionType": "TEXT" + }, + "id": "00000000-0000-4000-8000-000000000901", + "giver": "IHome.alice.b.tmms@gmail.tmt", + "giverSection": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "recipient": "IHome.danny.e.tmms@gmail.tmt", + "recipientSection": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "feedbackQuestion": { + "id": "00000000-0000-4000-8000-000000000801", + "questionDetails": { + "shouldAllowRichText": true, + "questionType": "TEXT", + "questionText": "Rate 5 other students' products" + } + } + } + }, + "feedbackResponseComments": {}, + "notifications": { + "notification1": { + "id": "00000000-0000-4000-8000-000000000002", + "startTime": "2011-01-01T00:00:00Z", + "endTime": "2099-01-01T00:00:00Z", + "style": "DANGER", + "targetUser": "GENERAL", + "title": "A deprecation note", + "message": "

    Deprecation happens in three minutes

    ", + "shown": false + } + }, + "readNotifications": {} +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index a78c2339825..149758c87e2 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -17,6 +17,7 @@ + diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 42cbd8a6eb2..659f27750c5 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -676,15 +676,15 @@ public void deleteFeedbackSessionCascade(String feedbackSessionName, String cour } /** - * Soft-deletes a specific session to Recycle Bin. + * Soft-deletes a specific session to Recycle Bin. */ - public void moveFeedbackSessionToRecycleBin(String feedbackSessionName, String courseId) + public FeedbackSession moveFeedbackSessionToRecycleBin(String feedbackSessionName, String courseId) throws EntityDoesNotExistException { assert feedbackSessionName != null; assert courseId != null; - feedbackSessionsLogic.moveFeedbackSessionToRecycleBin(feedbackSessionName, courseId); + return feedbackSessionsLogic.moveFeedbackSessionToRecycleBin(feedbackSessionName, courseId); } /** diff --git a/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java index a707990d083..b634d441e6a 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackSessionsLogic.java @@ -121,7 +121,7 @@ public List getFeedbackSessionsForCourseStartingAfter(String co * @return null if not found. */ public FeedbackSession getFeedbackSessionFromRecycleBin(String feedbackSessionName, String courseId) { - return fsDb.getSoftDeletedFeedbackSession(courseId, feedbackSessionName); + return fsDb.getSoftDeletedFeedbackSession(feedbackSessionName, courseId); } /** @@ -291,9 +291,9 @@ public void deleteFeedbackSessionCascade(String feedbackSessionName, String cour /** * Soft-deletes a specific feedback session to Recycle Bin. - * @return the time when the feedback session is moved to the recycle bin + * @return the feedback session */ - public Instant moveFeedbackSessionToRecycleBin(String feedbackSessionName, String courseId) + public FeedbackSession moveFeedbackSessionToRecycleBin(String feedbackSessionName, String courseId) throws EntityDoesNotExistException { return fsDb.softDeleteFeedbackSession(feedbackSessionName, courseId); diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java index 1a666124c84..3303551e763 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackSessionsDb.java @@ -196,9 +196,9 @@ public void deleteFeedbackSession(FeedbackSession feedbackSession) { /** * Soft-deletes a specific feedback session by its name and course id. * - * @return Soft-deletion time of the feedback session. + * @return the feedback session. */ - public Instant softDeleteFeedbackSession(String feedbackSessionName, String courseId) + public FeedbackSession softDeleteFeedbackSession(String feedbackSessionName, String courseId) throws EntityDoesNotExistException { assert courseId != null; assert feedbackSessionName != null; @@ -212,7 +212,7 @@ public Instant softDeleteFeedbackSession(String feedbackSessionName, String cour feedbackSessionEntity.setDeletedAt(Instant.now()); merge(feedbackSessionEntity); - return feedbackSessionEntity.getDeletedAt(); + return feedbackSessionEntity; } /** diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java index b82c45e01e5..78306541c18 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java @@ -140,7 +140,12 @@ public FeedbackSession getCopyForUser(String userEmail) { return copy; } - private FeedbackSession getCopy() { + /** + * Creates a copy of the feedback session. + * + * @return The copy of this object. + */ + public FeedbackSession getCopy() { FeedbackSession fs = new FeedbackSession( name, course, creatorEmail, instructions, startTime, endTime, sessionVisibleFromTime, resultsVisibleFromTime, @@ -507,7 +512,7 @@ public boolean isInGracePeriodGivenExtendedDeadline(Instant extendedDeadline) { } /** - * Returns {@code true} if the results of the feedback session is visible; {@code false} if not. + * Returns {@code true} if the results of the feedback session is published; {@code false} if not. * Does not care if the session has ended or not. */ public boolean isPublished() { diff --git a/src/main/java/teammates/ui/webapi/BinFeedbackSessionAction.java b/src/main/java/teammates/ui/webapi/BinFeedbackSessionAction.java index f88dd7da312..a26404b13f7 100644 --- a/src/main/java/teammates/ui/webapi/BinFeedbackSessionAction.java +++ b/src/main/java/teammates/ui/webapi/BinFeedbackSessionAction.java @@ -43,13 +43,11 @@ public JsonResult execute() { if (isCourseMigrated(courseId)) { try { - sqlLogic.moveFeedbackSessionToRecycleBin(feedbackSessionName, courseId); + FeedbackSession fs = sqlLogic.moveFeedbackSessionToRecycleBin(feedbackSessionName, courseId); + return new JsonResult(new FeedbackSessionData(fs)); } catch (EntityDoesNotExistException e) { throw new EntityNotFoundException(e); } - - FeedbackSession recycleBinFs = sqlLogic.getFeedbackSessionFromRecycleBin(feedbackSessionName, courseId); - return new JsonResult(new FeedbackSessionData(recycleBinFs)); } else { return oldFeedbackSession(courseId, feedbackSessionName); } diff --git a/src/main/java/teammates/ui/webapi/RestoreFeedbackSessionAction.java b/src/main/java/teammates/ui/webapi/RestoreFeedbackSessionAction.java index c93d6ba4b2c..33a19137d32 100644 --- a/src/main/java/teammates/ui/webapi/RestoreFeedbackSessionAction.java +++ b/src/main/java/teammates/ui/webapi/RestoreFeedbackSessionAction.java @@ -23,12 +23,23 @@ AuthType getMinAuthLevel() { void checkSpecificAccessControl() throws UnauthorizedAccessException { String courseId = getNonNullRequestParamValue(Const.ParamsNames.COURSE_ID); String feedbackSessionName = getNonNullRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_NAME); - FeedbackSessionAttributes feedbackSession = logic.getFeedbackSessionFromRecycleBin(feedbackSessionName, courseId); - gateKeeper.verifyAccessible( - logic.getInstructorForGoogleId(courseId, userInfo.getId()), - feedbackSession, - Const.InstructorPermissions.CAN_MODIFY_SESSION); + if (isCourseMigrated(courseId)) { + FeedbackSession feedbackSession = sqlLogic.getFeedbackSessionFromRecycleBin(feedbackSessionName, courseId); + + gateKeeper.verifyAccessible( + sqlLogic.getInstructorByGoogleId(courseId, userInfo.getId()), + feedbackSession, + Const.InstructorPermissions.CAN_MODIFY_SESSION); + } else { + FeedbackSessionAttributes feedbackSession = + logic.getFeedbackSessionFromRecycleBin(feedbackSessionName, courseId); + + gateKeeper.verifyAccessible( + logic.getInstructorForGoogleId(courseId, userInfo.getId()), + feedbackSession, + Const.InstructorPermissions.CAN_MODIFY_SESSION); + } } @Override diff --git a/src/test/java/teammates/test/AbstractBackDoor.java b/src/test/java/teammates/test/AbstractBackDoor.java index 48fb1eec380..84319580325 100644 --- a/src/test/java/teammates/test/AbstractBackDoor.java +++ b/src/test/java/teammates/test/AbstractBackDoor.java @@ -646,7 +646,7 @@ private Map convertDeadlinesToInstant(Map deadlin /** * Get soft deleted feedback session from database. */ - public FeedbackSessionAttributes getSoftDeletedSession(String feedbackSessionName, String instructorId) { + public FeedbackSessionData getSoftDeletedSessionData(String feedbackSessionName, String instructorId) { Map params = new HashMap<>(); params.put(Const.ParamsNames.ENTITY_TYPE, Const.EntityType.INSTRUCTOR); params.put(Const.ParamsNames.IS_IN_RECYCLE_BIN, "true"); @@ -657,12 +657,18 @@ public FeedbackSessionAttributes getSoftDeletedSession(String feedbackSessionNam } FeedbackSessionsData sessionsData = JsonUtils.fromJson(response.responseBody, FeedbackSessionsData.class); - FeedbackSessionData feedbackSession = sessionsData.getFeedbackSessions() + return sessionsData.getFeedbackSessions() .stream() .filter(fs -> fs.getFeedbackSessionName().equals(feedbackSessionName)) .findFirst() .orElse(null); + } + /** + * Get soft deleted feedback session from database. + */ + public FeedbackSessionAttributes getSoftDeletedSession(String feedbackSessionName, String instructorId) { + FeedbackSessionData feedbackSession = getSoftDeletedSessionData(feedbackSessionName, instructorId); if (feedbackSession == null) { return null; } diff --git a/src/test/java/teammates/test/BaseTestCaseWithSqlDatabaseAccess.java b/src/test/java/teammates/test/BaseTestCaseWithSqlDatabaseAccess.java index dddf3288a93..c5663428800 100644 --- a/src/test/java/teammates/test/BaseTestCaseWithSqlDatabaseAccess.java +++ b/src/test/java/teammates/test/BaseTestCaseWithSqlDatabaseAccess.java @@ -222,6 +222,8 @@ private ApiOutput getEntity(BaseEntity entity) { return getStudent((Student) entity); } else if (entity instanceof FeedbackQuestion) { return getFeedbackQuestion((FeedbackQuestion) entity); + } else if (entity instanceof FeedbackSession) { + return getFeedbackSession((FeedbackSession) entity); } else if (entity instanceof FeedbackResponse) { return getFeedbackResponse((FeedbackResponse) entity); } else { @@ -231,6 +233,8 @@ private ApiOutput getEntity(BaseEntity entity) { protected abstract FeedbackQuestionData getFeedbackQuestion(FeedbackQuestion fq); + protected abstract FeedbackSessionData getFeedbackSession(FeedbackSession fq); + protected abstract FeedbackResponseData getFeedbackResponse(FeedbackResponse fq); protected abstract StudentData getStudent(Student student); From 10273348f1639b3b7bcb83d486714611f9d8d68c Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:44:46 +0800 Subject: [PATCH 80/95] migrate StudentCourseJoinConfirmationPageE2ETest (#13008) Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- ...dentCourseJoinConfirmationPageE2ETest.java | 56 ++++++ ...tCourseJoinConfirmationPageE2ETestSql.json | 159 ++++++++++++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + 3 files changed, 216 insertions(+) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/StudentCourseJoinConfirmationPageE2ETest.java create mode 100644 src/e2e/resources/data/StudentCourseJoinConfirmationPageE2ETestSql.json diff --git a/src/e2e/java/teammates/e2e/cases/sql/StudentCourseJoinConfirmationPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/StudentCourseJoinConfirmationPageE2ETest.java new file mode 100644 index 00000000000..807c7caf2bd --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/StudentCourseJoinConfirmationPageE2ETest.java @@ -0,0 +1,56 @@ +package teammates.e2e.cases.sql; + +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.CourseJoinConfirmationPage; +import teammates.e2e.pageobjects.StudentHomePage; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#JOIN_PAGE}. + */ +public class StudentCourseJoinConfirmationPageE2ETest extends BaseE2ETestCase { + private Student newStudent; + private String newStudentGoogleId; + + @Override + protected void prepareTestData() { + testData = removeAndRestoreDataBundle(loadSqlDataBundle("/StudentCourseJoinConfirmationPageE2ETestSql.json")); + + newStudent = testData.students.get("alice.tmms@SCJoinConf.CS2104"); + newStudentGoogleId = testData.accounts.get("alice.tmms").getGoogleId(); + } + + @Test + @Override + public void testAll() { + ______TS("Click join link: invalid key"); + String courseId = testData.courses.get("SCJoinConf.CS2104").getId(); + String invalidKey = "invalidKey"; + AppUrl joinLink = createFrontendUrl(Const.WebPageURIs.JOIN_PAGE) + .withRegistrationKey(invalidKey) + .withCourseId(courseId) + .withEntityType(Const.EntityType.STUDENT); + CourseJoinConfirmationPage confirmationPage = loginToPage( + joinLink, CourseJoinConfirmationPage.class, newStudentGoogleId); + + confirmationPage.verifyDisplayedMessage("The course join link is invalid. You may have " + + "entered the URL incorrectly or the URL may correspond to a/an student that does not exist."); + + ______TS("Click join link: valid key"); + joinLink = createFrontendUrl(Const.WebPageURIs.JOIN_PAGE) + .withRegistrationKey(newStudent.getRegKey()) + .withCourseId(courseId) + .withEntityType(Const.EntityType.STUDENT); + confirmationPage = getNewPageInstance(joinLink, CourseJoinConfirmationPage.class); + + confirmationPage.verifyJoiningUser(newStudentGoogleId); + confirmationPage.confirmJoinCourse(StudentHomePage.class); + + ______TS("Already joined, no confirmation page"); + + getNewPageInstance(joinLink, StudentHomePage.class); + } +} diff --git a/src/e2e/resources/data/StudentCourseJoinConfirmationPageE2ETestSql.json b/src/e2e/resources/data/StudentCourseJoinConfirmationPageE2ETestSql.json new file mode 100644 index 00000000000..4866f6f16c2 --- /dev/null +++ b/src/e2e/resources/data/StudentCourseJoinConfirmationPageE2ETestSql.json @@ -0,0 +1,159 @@ +{ + "accounts": { + "SCJoinConf.instr": { + "googleId": "tm.e2e.SCJoinConf.instr", + "name": "Teammates Test", + "email": "SCJoinConf.instr@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000001" + }, + "alice.tmms": { + "googleId": "tm.e2e.SCJoinConf.alice", + "name": "Alice B", + "email": "SCJoinConf.alice@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000002" + } + }, + "accountRequests": {}, + "courses": { + "SCJoinConf.CS2104": { + "id": "tm.e2e.SCJoinConf.CS2104", + "name": "Programming Language Concepts", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 1" + }, + "SCJoinConf.CS1101": { + "id": "tm.e2e.SCJoinConf.CS1101", + "name": "Programming Methodology", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 1" + } + }, + "sections": { + "tm.e2e.SCJoinConf.CS2104-None": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "tm.e2e.SCJoinConf.CS2104" + }, + "name": "None" + }, + "tm.e2e.SCJoinConf.CS1101-None": { + "id": "00000000-0000-4000-8000-000000000202", + "course": { + "id": "tm.e2e.SCJoinConf.CS1101" + }, + "name": "None" + } + }, + "teams": { + "tm.e2e.SCJoinConf.CS2104-None-Team1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + }, + "tm.e2e.SCJoinConf.CS1101-None-Team1": { + "id": "00000000-0000-4000-8000-000000000302", + "section": { + "id": "00000000-0000-4000-8000-000000000202" + }, + "name": "Team 1" + } + }, + "deadlineExtensions": {}, + "instructors": { + "SCJoinConf.instr.CS2104": { + "isDisplayedToStudents": true, + "displayName": "Co-owner", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "course": { + "id": "tm.e2e.SCJoinConf.CS2104" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "SCJoinConf.instr@gmail.tmt" + }, + "SCJoinConf.instr.CS1101": { + "isDisplayedToStudents": true, + "displayName": "Co-owner", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "courseId": "tm.e2e.SCJoinConf.CS1101", + "course": { + "id": "tm.e2e.SCJoinConf.CS1101" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "SCJoinConf.instr@gmail.tmt" + } + }, + "students": { + "alice.tmms@SCJoinConf.CS2104": { + "comments": "This student's name is Amy Betsy", + "id": "00000000-0000-4000-8000-000000000601", + "courseId": "tm.e2e.SCJoinConf.CS2104", + "course": { + "id": "tm.e2e.SCJoinConf.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Amy Betsy", + "email": "SCJoinConf.alice@gmail.tmt" + }, + "alice.tmms@SCJoinConf.CS1101": { + "comments": "This student's name is Amy Betsy", + "id": "00000000-0000-4000-8000-000000000602", + "courseId": "tm.e2e.SCJoinConf.CS1101", + "course": { + "id": "tm.e2e.SCJoinConf.CS1101" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000002" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Amy Betsy", + "email": "SCJoinConf.alice@gmail.tmt" + } + }, + "feedbackSessions": {}, + "feedbackQuestions": {}, + "feedbackResponses": {}, + "feedbackResponseComments": {}, + "notifications": {}, + "readNotifications": {} +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index 149758c87e2..53346084dac 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -14,6 +14,7 @@ + From f8bae93711d421abca2d55c08b8fd25e77a4f2ca Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:53:30 +0800 Subject: [PATCH 81/95] [#11878] Fix console errors (#13058) --- .../account-request-table.component.spec.ts.snap | 15 --------------- .../account-request-table.component.html | 6 +++--- .../account-request-table.component.ts | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap b/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap index f5364641514..bbf59a6a945 100644 --- a/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap +++ b/src/web/app/components/account-requests-table/__snapshots__/account-request-table.component.spec.ts.snap @@ -85,7 +85,6 @@ exports[`AccountRequestTableComponent should display account requests with no re >
    - +
    diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index 889571e5b78..57d0afb0b3b 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -84,7 +84,7 @@ export class AccountRequestTableComponent { this.statusMessageService.showErrorToast(resp.error.message); }, }); - }); + }, () => {}); } approveAccountRequest(accountRequest: AccountRequestTableRowModel): void { From ba6979e784af277f72d96563cb16ac4518618559 Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Fri, 19 Apr 2024 15:30:25 +0800 Subject: [PATCH 82/95] [#11878] Fix Rejection Modal (#13059) --- .../account-request-table.component.spec.ts | 9 ++++++--- .../account-request-table.component.ts | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/web/app/components/account-requests-table/account-request-table.component.spec.ts b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts index 8434b006bb5..40ccbc007c3 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.spec.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts @@ -315,9 +315,12 @@ describe('AccountRequestTableComponent', () => { component.accountRequests = accountRequestResults; fixture.detectChanges(); - const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => { - return createMockNgbModalRef({}); - }); + const mockModalRef = { + componentInstance: {}, + result: Promise.resolve({}), + }; + + const modalSpy = jest.spyOn(ngbModal, 'open').mockReturnValue(mockModalRef as any); const rejectButton: any = fixture.debugElement.nativeElement.querySelector('#reject-request-with-reason-0'); rejectButton.click(); diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index 57d0afb0b3b..07ba413d77b 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -3,6 +3,9 @@ import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableRowModel } from './account-request-table-model'; import { EditRequestModalComponentResult } from './admin-edit-request-modal/admin-edit-request-modal-model'; import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; +import { + RejectWithReasonModalComponentResult, +} from './admin-reject-with-reason-modal/admin-reject-with-reason-modal-model'; import { RejectWithReasonModalComponent, } from './admin-reject-with-reason-modal/admin-reject-with-reason-modal.component'; @@ -173,9 +176,9 @@ export class AccountRequestTableComponent { modalRef.componentInstance.accountRequestName = accountRequest.name; modalRef.componentInstance.accountRequestEmail = accountRequest.email; - modalRef.result.then(() => { + modalRef.result.then((res: RejectWithReasonModalComponentResult) => { this.accountService.rejectAccountRequest(accountRequest.id, - modalRef.componentInstance.rejectionReasonTitle, modalRef.componentInstance.rejectionReasonBody) + res.rejectionReasonTitle, res.rejectionReasonBody) .subscribe({ next: (resp: AccountRequest) => { accountRequest.status = resp.status; From 498efdc87b2e1f1b201446fe05c1dbce3a54d210 Mon Sep 17 00:00:00 2001 From: Marques Tye Jia Jun <97437396+marquestye@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:37:40 +0800 Subject: [PATCH 83/95] Add composite index for data migration (#13057) Co-authored-by: FergusMok --- .../client/scripts/sql/IndexCourseFields.java | 37 +++++++++++++++++++ src/main/appengine/index.yaml | 12 ++++++ 2 files changed, 49 insertions(+) create mode 100644 src/client/java/teammates/client/scripts/sql/IndexCourseFields.java diff --git a/src/client/java/teammates/client/scripts/sql/IndexCourseFields.java b/src/client/java/teammates/client/scripts/sql/IndexCourseFields.java new file mode 100644 index 00000000000..283bc8e2da9 --- /dev/null +++ b/src/client/java/teammates/client/scripts/sql/IndexCourseFields.java @@ -0,0 +1,37 @@ +package teammates.client.scripts.sql; + +import com.googlecode.objectify.cmd.Query; + +import teammates.client.scripts.DataMigrationEntitiesBaseScript; +import teammates.storage.entity.Course; + +/** + * Index the newly-indexable fields of courses. + */ +public class IndexCourseFields extends DataMigrationEntitiesBaseScript { + + public static void main(String[] args) { + new IndexCourseFields().doOperationRemotely(); + } + + @Override + protected Query getFilterQuery() { + return ofy().load().type(Course.class); + } + + @Override + protected boolean isPreview() { + return true; + } + + @Override + protected boolean isMigrationNeeded(Course course) { + return true; + } + + @Override + protected void migrateEntity(Course course) { + // Save without any update; this will build the previously non-existing indexes + saveEntityDeferred(course); + } +} diff --git a/src/main/appengine/index.yaml b/src/main/appengine/index.yaml index db65f2b21b8..33b16c66f74 100644 --- a/src/main/appengine/index.yaml +++ b/src/main/appengine/index.yaml @@ -93,3 +93,15 @@ indexes: name: targetUser - direction: asc name: endTime +- kind: Course + properties: + - direction: asc + name: isMigrated + - direction: asc + name: createdAt +- kind: Course + properties: + - direction: asc + name: isMigrated + - direction: desc + name: createdAt From 81eae1798515cb3306c68cce0fdcb92d4585a53b Mon Sep 17 00:00:00 2001 From: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com> Date: Fri, 19 Apr 2024 20:43:27 +0800 Subject: [PATCH 84/95] [#13060] Add beta 5 liquibase changelog and developers json (#13061) * Add beta 5 changelog * Update changelog to be in alphabetical order * Update developers.json --- docs/schema-migration.md | 3 +- .../db/changelog/db.changelog-root.xml | 1 + .../changelog/db.changelog-v9.0.0beta.5.xml | 37 +++++++++++++++++++ src/web/data/developers.json | 12 ++++-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml diff --git a/docs/schema-migration.md b/docs/schema-migration.md index a88f49ece0f..463f0cbb3c1 100644 --- a/docs/schema-migration.md +++ b/docs/schema-migration.md @@ -31,4 +31,5 @@ Here is a brief description of the activities defined for Liquibase 5. Generate snapshot of database by running `./gradlew liquibaseSnapshot -PrunList=snapshot`, the snapshot will be output to `liquibase-snapshot.json` 6. Checkout your branch and repeat steps 2 and 4 to generate the tables found on your branch 7. Run `./gradlew liquibaseDiffChangeLog -PrunList=diffMain` to generate changeLog to resolve database schema differences - +8. Manually add a changeSet to tag the database using `release_number` (See the last changeset in v9.0.0 for reference). +9. Include the new changelog file in `changelog-root.xml`. diff --git a/src/main/resources/db/changelog/db.changelog-root.xml b/src/main/resources/db/changelog/db.changelog-root.xml index af5c5e34d7e..4b13a967223 100644 --- a/src/main/resources/db/changelog/db.changelog-root.xml +++ b/src/main/resources/db/changelog/db.changelog-root.xml @@ -5,4 +5,5 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> + diff --git a/src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml b/src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml new file mode 100644 index 00000000000..e0270bc4a14 --- /dev/null +++ b/src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/web/data/developers.json b/src/web/data/developers.json index 0800a8c25cf..e5878d21caf 100644 --- a/src/web/data/developers.json +++ b/src/web/data/developers.json @@ -211,14 +211,14 @@ "name": "André Alves", "username": "andremralves" }, - { - "name": "Andy Daehn", - "username": "andydaehn" - }, { "name": "Andy", "username": "Andy-W-Developer" }, + { + "name": "Andy Daehn", + "username": "andydaehn" + }, { "multiple": true, "name": "Ang Ji Kai", @@ -649,6 +649,10 @@ { "username": "Emp923" }, + { + "name": "", + "username": "eraldprifti03" + }, { "name": "Eric Liu", "username": "ericluoliu" From 0a0e7c94c66d93709db39f4c8fda68b4b87859be Mon Sep 17 00:00:00 2001 From: Nicolas <25302138+NicolasCwy@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:09:18 +0800 Subject: [PATCH 85/95] [#12048] Update changelog docs and changelog name (#13062) * Update docs * Rename changelog file * Amend changelog naming --- docs/schema-migration.md | 4 ++-- src/main/resources/db/changelog/db.changelog-root.xml | 2 +- ...ngelog-v9.0.0beta.5.xml => db.changelog-v9.0.0-beta.5.xml} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/main/resources/db/changelog/{db.changelog-v9.0.0beta.5.xml => db.changelog-v9.0.0-beta.5.xml} (97%) diff --git a/docs/schema-migration.md b/docs/schema-migration.md index 463f0cbb3c1..a681a7bc4ff 100644 --- a/docs/schema-migration.md +++ b/docs/schema-migration.md @@ -31,5 +31,5 @@ Here is a brief description of the activities defined for Liquibase 5. Generate snapshot of database by running `./gradlew liquibaseSnapshot -PrunList=snapshot`, the snapshot will be output to `liquibase-snapshot.json` 6. Checkout your branch and repeat steps 2 and 4 to generate the tables found on your branch 7. Run `./gradlew liquibaseDiffChangeLog -PrunList=diffMain` to generate changeLog to resolve database schema differences -8. Manually add a changeSet to tag the database using `release_number` (See the last changeset in v9.0.0 for reference). -9. Include the new changelog file in `changelog-root.xml`. +8. Manually add a changeSet to tag the database using `release_number`. The tag should be named ` - + diff --git a/src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml b/src/main/resources/db/changelog/db.changelog-v9.0.0-beta.5.xml similarity index 97% rename from src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml rename to src/main/resources/db/changelog/db.changelog-v9.0.0-beta.5.xml index e0270bc4a14..14642683cb1 100644 --- a/src/main/resources/db/changelog/db.changelog-v9.0.0beta.5.xml +++ b/src/main/resources/db/changelog/db.changelog-v9.0.0-beta.5.xml @@ -32,6 +32,6 @@ - + From 10e96cba2075d38da8843dc5611a41105c8b9941 Mon Sep 17 00:00:00 2001 From: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:55:18 +0800 Subject: [PATCH 86/95] [#12048] Migrate StudentCourseDetailsPageE2ETest (#13012) * Migrate StudentCourseDetailsPageE2ETest * Add StudentCourseDetailsPageE2ETest to sql xml --------- Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../sql/StudentCourseDetailsPageE2ETest.java | 43 +++++ .../pageobjects/StudentCourseDetailsPage.java | 39 +++++ .../StudentCourseDetailsPageE2ETestSql.json | 152 ++++++++++++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + 4 files changed, 235 insertions(+) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/StudentCourseDetailsPageE2ETest.java create mode 100644 src/e2e/resources/data/StudentCourseDetailsPageE2ETestSql.json diff --git a/src/e2e/java/teammates/e2e/cases/sql/StudentCourseDetailsPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/StudentCourseDetailsPageE2ETest.java new file mode 100644 index 00000000000..0e3cbc2b065 --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/StudentCourseDetailsPageE2ETest.java @@ -0,0 +1,43 @@ +package teammates.e2e.cases.sql; + +import org.testng.annotations.Test; + +import teammates.common.util.AppUrl; +import teammates.common.util.Const; +import teammates.e2e.pageobjects.StudentCourseDetailsPage; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; + +/** + * SUT: {@link Const.WebPageURIs#STUDENT_COURSE_DETAILS_PAGE}. + */ +public class StudentCourseDetailsPageE2ETest extends BaseE2ETestCase { + + @Override + protected void prepareTestData() { + testData = removeAndRestoreDataBundle( + loadSqlDataBundle("/StudentCourseDetailsPageE2ETestSql.json")); + } + + @Test + @Override + public void testAll() { + + AppUrl url = createFrontendUrl(Const.WebPageURIs.STUDENT_COURSE_DETAILS_PAGE) + .withCourseId("tm.e2e.SCDet.CS2104"); + StudentCourseDetailsPage detailsPage = loginToPage(url, StudentCourseDetailsPage.class, + testData.accounts.get("SCDet.alice").getGoogleId()); + + ______TS("verify loaded data"); + Instructor[] instructors = { testData.instructors.get("SCDet.instr"), + testData.instructors.get("SCDet.instr2") }; + Student[] teammates = { testData.students.get("SCDet.benny"), + testData.students.get("SCDet.charlie") }; + + detailsPage.verifyCourseDetails(testData.courses.get("SCDet.CS2104")); + detailsPage.verifyInstructorsDetails(instructors); + detailsPage.verifyStudentDetails(testData.students.get("SCDet.alice")); + detailsPage.sortTeammatesByName(); + detailsPage.verifyTeammatesDetails(teammates); + } +} diff --git a/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java b/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java index e1f33b35dc0..43f7cec0b6d 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/StudentCourseDetailsPage.java @@ -14,6 +14,9 @@ import teammates.common.datatransfer.attributes.InstructorAttributes; import teammates.common.datatransfer.attributes.StudentAttributes; import teammates.e2e.util.TestProperties; +import teammates.storage.sqlentity.Course; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; /** * Page Object Model for student course details page. @@ -59,6 +62,12 @@ public void verifyCourseDetails(CourseAttributes courseDetails) { assertEquals(courseDetails.getInstitute(), courseInstituteField.getText()); } + public void verifyCourseDetails(Course courseDetails) { + assertEquals(courseDetails.getName(), courseNameField.getText()); + assertEquals(courseDetails.getId(), courseIdField.getText()); + assertEquals(courseDetails.getInstitute(), courseInstituteField.getText()); + } + public void verifyInstructorsDetails(InstructorAttributes[] instructorDetails) { String[] actualInstructors = instructorsList.getText().split(TestProperties.LINE_SEPARATOR); for (int i = 0; i < instructorDetails.length; i++) { @@ -68,6 +77,15 @@ public void verifyInstructorsDetails(InstructorAttributes[] instructorDetails) { } } + public void verifyInstructorsDetails(Instructor[] instructorDetails) { + String[] actualInstructors = instructorsList.getText().split(TestProperties.LINE_SEPARATOR); + for (int i = 0; i < instructorDetails.length; i++) { + Instructor expected = instructorDetails[i]; + assertEquals(expected.getDisplayName() + ": " + expected.getName() + " (" + expected.getEmail() + ")", + actualInstructors[i]); + } + } + public void verifyStudentDetails(StudentAttributes studentDetails) { assertEquals(studentDetails.getName(), studentNameField.getText()); assertEquals(studentDetails.getSection(), studentSectionField.getText()); @@ -75,6 +93,13 @@ public void verifyStudentDetails(StudentAttributes studentDetails) { assertEquals(studentDetails.getEmail(), studentEmailField.getText()); } + public void verifyStudentDetails(Student studentDetails) { + assertEquals(studentDetails.getName(), studentNameField.getText()); + assertEquals(studentDetails.getSectionName(), studentSectionField.getText()); + assertEquals(studentDetails.getTeamName(), studentTeamField.getText()); + assertEquals(studentDetails.getEmail(), studentEmailField.getText()); + } + public void verifyTeammatesDetails(StudentAttributes[] teammates) { int numTables = teammates.length; @@ -89,6 +114,20 @@ public void verifyTeammatesDetails(StudentAttributes[] teammates) { } } + public void verifyTeammatesDetails(Student[] teammates) { + int numTables = teammates.length; + + for (int i = 0; i < numTables; i++) { + List profileItems = new ArrayList<>(); + profileItems.add("Name: " + teammates[i].getName()); + profileItems.add("Email: " + teammates[i].getEmail()); + + WebElement actualProfile = browser.driver.findElement(By.id("teammates-details-" + i)); + assertEquals(profileItems.stream().collect(Collectors.joining(TestProperties.LINE_SEPARATOR)), + actualProfile.getText()); + } + } + public void sortTeammatesByName() { click(browser.driver.findElement(By.id("sort-name"))); } diff --git a/src/e2e/resources/data/StudentCourseDetailsPageE2ETestSql.json b/src/e2e/resources/data/StudentCourseDetailsPageE2ETestSql.json new file mode 100644 index 00000000000..c56b3fde3f3 --- /dev/null +++ b/src/e2e/resources/data/StudentCourseDetailsPageE2ETestSql.json @@ -0,0 +1,152 @@ +{ + "accounts": { + "SCDet.instr": { + "googleId": "tm.e2e.SCDet.instr", + "name": "Instructor", + "email": "tmms.test@gmail.tmt", + "id": "00000000-0000-4000-8000-000000000001" + }, + "SCDet.alice": { + "googleId": "tm.e2e.SCDet.alice", + "email": "SCDet.alice@gmail.tmt", + "name": "Alice Betsy", + "id": "00000000-0000-4000-8000-000000000002" + } + }, + "accountRequests": {}, + "courses": { + "SCDet.CS2104": { + "id": "tm.e2e.SCDet.CS2104", + "name": "Programming Language Concepts", + "timeZone": "UTC", + "institute": "TEAMMATES Test Institute 1", + "createdAt": "2012-04-02T11:00:00Z" + } + }, + "sections": { + "tm.e2e.SCDet.CS2104-None": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "tm.e2e.SCDet.CS2104" + }, + "name": "None" + } + }, + "teams": { + "tm.e2e.SCDet.CS2104-None-Team1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + } + }, + "deadlineExtensions": {}, + "instructors": { + "SCDet.instr": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "courseId": "tm.e2e.SCDet.CS2104", + "course": { + "id": "tm.e2e.SCDet.CS2104" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "SCDet.instr@gmail.tmt" + }, + "SCDet.instr2": { + "isDisplayedToStudents": true, + "displayName": "Instructor", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000502", + "courseId": "tm.e2e.SCDet.CS2104", + "course": { + "id": "tm.e2e.SCDet.CS2104" + }, + "name": "Teammates Test 2", + "email": "SCDet.instr2@gmail.tmt" + } + }, + "students": { + "SCDet.alice": { + "comments": "This student's name is Alice Betsy", + "id": "00000000-0000-4000-8000-000000000601", + "courseId": "tm.e2e.SCDet.CS2104", + "course": { + "id": "tm.e2e.SCDet.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000002" + }, + "name": "Alice Betsy", + "email": "SCDet.alice@gmail.tmt" + }, + "SCDet.benny": { + "comments": "This student's name is Benny Charles", + "id": "00000000-0000-4000-8000-000000000602", + "courseId": "tm.e2e.SCDet.CS2104", + "course": { + "id": "tm.e2e.SCDet.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Benny Charles", + "email": "SCDet.benny@gmail.tmt" + }, + "SCDet.charlie": { + "comments": "This student's name is Charlie Davis", + "id": "00000000-0000-4000-8000-000000000603", + "courseId": "tm.e2e.SCDet.CS2104", + "course": { + "id": "tm.e2e.SCDet.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "name": "Charlie Davis", + "email": "SCDet.charlie@gmail.tmt" + } + }, + "feedbackSessions": {}, + "feedbackQuestions": {}, + "feedbackResponses": {}, + "feedbackResponseComments": {}, + "notifications": {}, + "readNotifications": {} +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index 53346084dac..e8615603a8b 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -20,6 +20,7 @@ + From 76db4ccd88782571cd9ecddb9ba14e2bc5cc5f8e Mon Sep 17 00:00:00 2001 From: domoberzin <74132255+domoberzin@users.noreply.github.com> Date: Mon, 22 Apr 2024 22:50:22 +0800 Subject: [PATCH 87/95] [#11878] Account Request Indexing Script (#13076) * add script * order commit * update logic * convert to batch * remove print --- .../scripts/UpdateAccountRequestIndexing.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 src/client/java/teammates/client/scripts/UpdateAccountRequestIndexing.java diff --git a/src/client/java/teammates/client/scripts/UpdateAccountRequestIndexing.java b/src/client/java/teammates/client/scripts/UpdateAccountRequestIndexing.java new file mode 100644 index 00000000000..0d47f1de58c --- /dev/null +++ b/src/client/java/teammates/client/scripts/UpdateAccountRequestIndexing.java @@ -0,0 +1,81 @@ +package teammates.client.scripts; + +import java.util.List; + +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + +import teammates.client.util.BackDoor; +import teammates.client.util.ClientProperties; +import teammates.common.datatransfer.SqlDataBundle; +import teammates.common.exception.HttpRequestFailedException; +import teammates.common.util.HibernateUtil; +import teammates.storage.sqlentity.AccountRequest; + +/** + * Script to trigger indexing for all account requests. + */ +public class UpdateAccountRequestIndexing { + public static void main(String[] args) { + UpdateAccountRequestIndexing updater = new UpdateAccountRequestIndexing(); + updater.initSession(); + updater.updateAccountRequestIndexing(); + } + + /** + * Initializes the Hibernate session. + */ + public void initSession() { + String connectionUrl = ClientProperties.SCRIPT_API_URL; + String username = ClientProperties.SCRIPT_API_NAME; + String password = ClientProperties.SCRIPT_API_PASSWORD; + + HibernateUtil.buildSessionFactory(connectionUrl, username, password); + } + + /** + * Updates the indexing for all account requests using the backdoor and batch processing. + */ + public void updateAccountRequestIndexing() { + int batchSize = 100; + int firstResult = 0; + HibernateUtil.beginTransaction(); + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cr = cb.createQuery(AccountRequest.class); + Root root = cr.from(AccountRequest.class); + cr.select(root); + TypedQuery query = HibernateUtil.createQuery(cr) + .setMaxResults(batchSize); + + List accountRequests; + + do { + query.setFirstResult(firstResult); + accountRequests = query.getResultList(); + SqlDataBundle dataBundle = new SqlDataBundle(); + + for (AccountRequest accountRequest : accountRequests) { + dataBundle.accountRequests.put(accountRequest.getId().toString(), accountRequest); + } + + insertDocs(dataBundle); + firstResult += batchSize; + } while (!accountRequests.isEmpty()); + + HibernateUtil.commitTransaction(); + } + + /** + * Inserts the document. + */ + public void insertDocs(SqlDataBundle dataBundle) { + try { + BackDoor.getInstance().putSqlDocuments(dataBundle); + } catch (HttpRequestFailedException e) { + System.out.println("Error occurred while inserting documents: " + e.getMessage()); + e.printStackTrace(); + } + } +} From 6b83e4fe0aa026a6f743ab7f6b56a7705f899a02 Mon Sep 17 00:00:00 2001 From: Xenos F Date: Tue, 23 Apr 2024 13:43:55 +0800 Subject: [PATCH 88/95] [#11878] Add CAPTCHA to ARF (#13081) * Add captcha to ARF * Update front-end tests * Fix lint errors * Change captcha to uppercase in error text * Return captcha response when the getter is called --------- Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com> --- .../ui/request/AccountCreateRequest.java | 10 ++++++++ .../ui/webapi/CreateAccountRequestAction.java | 8 ++++++ ...ructor-request-form.component.spec.ts.snap | 4 +++ .../instructor-request-form.component.html | 16 ++++++++++++ .../instructor-request-form.component.spec.ts | 8 +++++- .../instructor-request-form.component.ts | 25 ++++++++++++++++++- .../request-page/request-page.module.ts | 2 ++ 7 files changed, 71 insertions(+), 2 deletions(-) diff --git a/src/main/java/teammates/ui/request/AccountCreateRequest.java b/src/main/java/teammates/ui/request/AccountCreateRequest.java index 3e63e750b9b..06f6ff555e8 100644 --- a/src/main/java/teammates/ui/request/AccountCreateRequest.java +++ b/src/main/java/teammates/ui/request/AccountCreateRequest.java @@ -18,6 +18,8 @@ public class AccountCreateRequest extends BasicRequest { private String instructorInstitution; @Nullable private String instructorComments; + @Nullable + private String captchaResponse; public String getInstructorEmail() { return instructorEmail; @@ -35,6 +37,10 @@ public String getInstructorComments() { return this.instructorComments; } + public String getCaptchaResponse() { + return this.captchaResponse; + } + public void setInstructorName(String name) { this.instructorName = name; } @@ -51,6 +57,10 @@ public void setInstructorComments(String instructorComments) { this.instructorComments = instructorComments; } + public void setCaptchaResponse(String captchaResponse) { + this.captchaResponse = captchaResponse; + } + @Override public void validate() throws InvalidHttpRequestBodyException { assertTrue(this.instructorEmail != null, "email cannot be null"); diff --git a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java index f8ba4d571c0..8a622552f40 100644 --- a/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java +++ b/src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java @@ -33,6 +33,14 @@ public JsonResult execute() throws InvalidHttpRequestBodyException, InvalidOperationException { AccountCreateRequest createRequest = getAndValidateRequestBody(AccountCreateRequest.class); + if (userInfo == null || !userInfo.isAdmin) { + String userCaptchaResponse = createRequest.getCaptchaResponse(); + if (!recaptchaVerifier.isVerificationSuccessful(userCaptchaResponse)) { + throw new InvalidHttpRequestBodyException("Something went wrong with " + + "the reCAPTCHA verification. Please try again."); + } + } + String instructorName = createRequest.getInstructorName().trim(); String instructorEmail = createRequest.getInstructorEmail().trim(); String instructorInstitution = createRequest.getInstructorInstitution().trim(); diff --git a/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap b/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap index 46dcb75b2cf..ddb6374364f 100644 --- a/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap +++ b/src/web/app/pages-static/request-page/instructor-request-form/__snapshots__/instructor-request-form.component.spec.ts.snap @@ -8,15 +8,19 @@ exports[`InstructorRequestFormComponent should render correctly 1`] = ` STUDENT_NAME_MAX_LENGTH={[Function Number]} accountService={[Function Object]} arf={[Function FormGroup]} + captchaSiteKey="" comments={[Function FormControl2]} country={[Function FormControl2]} email={[Function FormControl2]} hasSubmitAttempt="false" institution={[Function FormControl2]} + isCaptchaSuccessful="false" isLoading="false" + lang={[Function String]} name={[Function FormControl2]} requestSubmissionEvent={[Function EventEmitter_]} serverErrorMessage="" + size={[Function String]} >

    +
    + + + +
    +
    There was a problem with your submission. Please check and fix the errors above and submit again. diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts index 3a5f4fba2b8..a0c9bbac2f2 100644 --- a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; +import { NgxCaptchaModule } from 'ngx-captcha'; import { Observable, first } from 'rxjs'; import { InstructorRequestFormModel } from './instructor-request-form-model'; import { InstructorRequestFormComponent } from './instructor-request-form.component'; @@ -46,7 +47,7 @@ describe('InstructorRequestFormComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [InstructorRequestFormComponent], - imports: [ReactiveFormsModule], + imports: [ReactiveFormsModule, NgxCaptchaModule], providers: [{ provide: AccountService, useValue: accountServiceStub }], }) .compileComponents(); @@ -56,10 +57,15 @@ describe('InstructorRequestFormComponent', () => { fixture = TestBed.createComponent(InstructorRequestFormComponent); component = fixture.componentInstance; accountService = TestBed.inject(AccountService); + component.captchaSiteKey = ''; // Test ignores captcha fixture.detectChanges(); jest.clearAllMocks(); }); + it('should have empty captcha key', () => { + expect(component).toBeTruthy(); + }); + it('should create', () => { expect(component).toBeTruthy(); }); diff --git a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts index 02b2ae00fd2..7caa14e3bd9 100644 --- a/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts +++ b/src/web/app/pages-static/request-page/instructor-request-form/instructor-request-form.component.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { finalize } from 'rxjs'; import { InstructorRequestFormModel } from './instructor-request-form-model'; +import { environment } from '../../../../environments/environment'; import { AccountService } from '../../../../services/account.service'; import { AccountCreateRequest } from '../../../../types/api-request'; import { FormValidator } from '../../../../types/form-validator'; @@ -22,6 +23,13 @@ export class InstructorRequestFormComponent { readonly COUNTRY_NAME_MAX_LENGTH = FormValidator.COUNTRY_NAME_MAX_LENGTH; readonly EMAIL_MAX_LENGTH = FormValidator.EMAIL_MAX_LENGTH; + // Captcha + captchaSiteKey: string = environment.captchaSiteKey; + isCaptchaSuccessful: boolean = false; + captchaResponse?: string; + size: 'compact' | 'normal' = 'normal'; + lang: string = 'en'; + arf = new FormGroup({ name: new FormControl('', [ Validators.required, @@ -44,6 +52,7 @@ export class InstructorRequestFormComponent { Validators.maxLength(FormValidator.EMAIL_MAX_LENGTH), ]), comments: new FormControl(''), + recaptcha: new FormControl(''), }, { updateOn: 'submit' }); // Create members for easier access of arf controls @@ -79,12 +88,25 @@ export class InstructorRequestFormComponent { return str; } + /** + * Handles successful completion of reCAPTCHA challenge. + * + * @param captchaResponse user's reCAPTCHA response token. + */ + handleCaptchaSuccess(captchaResponse: string): void { + this.isCaptchaSuccessful = true; + this.captchaResponse = captchaResponse; + } + + /** + * Handles form submission. + */ onSubmit(): void { this.hasSubmitAttempt = true; this.isLoading = true; this.serverErrorMessage = ''; - if (this.arf.invalid) { + if (this.arf.invalid || (this.captchaSiteKey && !this.captchaResponse)) { this.isLoading = false; // Do not submit form return; @@ -103,6 +125,7 @@ export class InstructorRequestFormComponent { instructorEmail: email, instructorName: name, instructorInstitution: combinedInstitution, + captchaResponse: this.captchaSiteKey ? this.captchaResponse! : '', }; if (comments) { diff --git a/src/web/app/pages-static/request-page/request-page.module.ts b/src/web/app/pages-static/request-page/request-page.module.ts index 12a9d337875..1d9e96fdbc8 100644 --- a/src/web/app/pages-static/request-page/request-page.module.ts +++ b/src/web/app/pages-static/request-page/request-page.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule, Routes } from '@angular/router'; import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgxCaptchaModule } from 'ngx-captcha'; import { InstructorRequestFormComponent } from './instructor-request-form/instructor-request-form.component'; import { RequestPageComponent } from './request-page.component'; import { TeammatesRouterModule } from '../../components/teammates-router/teammates-router.module'; @@ -31,6 +32,7 @@ const routes: Routes = [ TeammatesRouterModule, ReactiveFormsModule, NgbAlertModule, + NgxCaptchaModule, ], }) export class RequestPageModule { } From e738e25d852e52ae3b8476c0f80d4252d31601a8 Mon Sep 17 00:00:00 2001 From: Pedro Henrique Braga <98167728+Stain19@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:27:06 -0300 Subject: [PATCH 89/95] [#13064] Use AccountRequestUpdateRequest as parameter (#13068) * Update editAccountRequest parameter type to AccountRequestUpdateRequest * Fixing the lint * Refatoring editAccountRequest method --------- Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com> --- .../account-request-table.component.ts | 14 +++++++++----- src/web/services/account.service.ts | 12 +----------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts index 07ba413d77b..3e7fc957730 100755 --- a/src/web/app/components/account-requests-table/account-request-table.component.ts +++ b/src/web/app/components/account-requests-table/account-request-table.component.ts @@ -13,6 +13,7 @@ import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { AccountRequest, MessageOutput } from '../../../types/api-output'; +import { AccountRequestUpdateRequest } from '../../../types/api-request'; import { ErrorMessageOutput } from '../../error-message-output'; import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { collapseAnim } from '../teammates-common/collapse-anim'; @@ -70,11 +71,14 @@ export class AccountRequestTableComponent { modalRef.result.then((res: EditRequestModalComponentResult) => { this.accountService.editAccountRequest( accountRequest.id, - res.accountRequestName, - res.accountRequestEmail, - res.accountRequestInstitution, - accountRequest.status, - res.accountRequestComment) + ({ + name: res.accountRequestName, + email: res.accountRequestEmail, + institute: res.accountRequestInstitution, + status: accountRequest.status, + comments: res.accountRequestComment, + }), + ) .subscribe({ next: (resp: AccountRequest) => { accountRequest.comments = resp.comments ?? ''; diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 35c9c238111..343b28dae72 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -118,20 +118,10 @@ export class AccountService { /** * Edits an account request by calling API. */ - editAccountRequest(id: string, name: string, email: string, institute: string, - status: AccountRequestStatus, comments: string) - : Observable { + editAccountRequest(id: string, accountReqUpdateRequest: AccountRequestUpdateRequest): Observable { const paramMap: Record = { id, }; - const accountReqUpdateRequest : AccountRequestUpdateRequest = { - name, - email, - institute, - status, - comments, - }; - return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); } From a2a9ef38b5e1a951b3527d2870fc83c402e7e421 Mon Sep 17 00:00:00 2001 From: yuanxi1 <52706394+yuanxi1@users.noreply.github.com> Date: Sun, 28 Apr 2024 23:47:05 +0800 Subject: [PATCH 90/95] [#12048] Migrate FeedbackRubricQuestionsE2E (#13078) * Add e2e test * Migrate all tests * Update xml --------- Co-authored-by: YX Z Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com> --- .../sql/FeedbackRubricQuestionE2ETest.java | 145 +++++++ .../e2e/pageobjects/FeedbackSubmitPage.java | 18 + .../InstructorFeedbackEditPage.java | 10 + .../FeedbackRubricQuestionE2ESqlTest.json | 358 ++++++++++++++++++ src/e2e/resources/testng-e2e-sql.xml | 1 + 5 files changed, 532 insertions(+) create mode 100644 src/e2e/java/teammates/e2e/cases/sql/FeedbackRubricQuestionE2ETest.java create mode 100644 src/e2e/resources/data/FeedbackRubricQuestionE2ESqlTest.json diff --git a/src/e2e/java/teammates/e2e/cases/sql/FeedbackRubricQuestionE2ETest.java b/src/e2e/java/teammates/e2e/cases/sql/FeedbackRubricQuestionE2ETest.java new file mode 100644 index 00000000000..3ee7ee03072 --- /dev/null +++ b/src/e2e/java/teammates/e2e/cases/sql/FeedbackRubricQuestionE2ETest.java @@ -0,0 +1,145 @@ +package teammates.e2e.cases.sql; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.testng.annotations.Test; + +import teammates.common.datatransfer.questions.FeedbackRubricQuestionDetails; +import teammates.common.datatransfer.questions.FeedbackRubricResponseDetails; +import teammates.e2e.pageobjects.FeedbackSubmitPage; +import teammates.e2e.pageobjects.InstructorFeedbackEditPage; +import teammates.storage.sqlentity.FeedbackQuestion; +import teammates.storage.sqlentity.FeedbackResponse; +import teammates.storage.sqlentity.Student; +import teammates.storage.sqlentity.questions.FeedbackRubricQuestion; + +/** + * SUT: {@link Const.WebPageURIs#INSTRUCTOR_SESSION_EDIT_PAGE}, {@link Const.WebPageURIs#SESSION_SUBMISSION_PAGE} + * specifically for Rubric questions. + */ +public class FeedbackRubricQuestionE2ETest extends BaseFeedbackQuestionE2ETest { + + @Override + protected void prepareTestData() { + testData = loadSqlDataBundle("/FeedbackRubricQuestionE2ESqlTest.json"); + removeAndRestoreDataBundle(testData); + + instructor = testData.instructors.get("instructor"); + course = testData.courses.get("course"); + feedbackSession = testData.feedbackSessions.get("openSession"); + student = testData.students.get("alice.tmms@FRubricQn.CS2104"); + } + + @Test + @Override + public void testAll() { + testEditPage(); + logout(); + testSubmitPage(); + } + + @Override + protected void testEditPage() { + InstructorFeedbackEditPage feedbackEditPage = loginToFeedbackEditPage(); + + ______TS("verify loaded question"); + FeedbackQuestion loadedQuestion = testData.feedbackQuestions.get("qn1ForFirstSession"); + FeedbackRubricQuestionDetails questionDetails = + (FeedbackRubricQuestionDetails) loadedQuestion.getQuestionDetailsCopy(); + feedbackEditPage.verifyRubricQuestionDetails(1, questionDetails); + + ______TS("add new question"); + // add new question exactly like loaded question + FeedbackRubricQuestion newQuestion = new FeedbackRubricQuestion( + loadedQuestion.getFeedbackSession(), 2, loadedQuestion.getDescription(), + loadedQuestion.getGiverType(), loadedQuestion.getRecipientType(), + loadedQuestion.getNumOfEntitiesToGiveFeedbackTo(), + loadedQuestion.getShowResponsesTo(), loadedQuestion.getShowGiverNameTo(), + loadedQuestion.getShowRecipientNameTo(), questionDetails); + feedbackEditPage.addRubricQuestion(newQuestion); + + feedbackEditPage.verifyRubricQuestionDetails(2, questionDetails); + verifyPresentInDatabase(newQuestion); + + ______TS("copy question"); + FeedbackQuestion copiedQuestion = testData.feedbackQuestions.get("qn1ForSecondSession"); + questionDetails = (FeedbackRubricQuestionDetails) copiedQuestion.getQuestionDetailsCopy(); + feedbackEditPage.copyQuestion(copiedQuestion.getCourseId(), + copiedQuestion.getQuestionDetailsCopy().getQuestionText()); + copiedQuestion.getCourse().setId(course.getId()); + copiedQuestion.getFeedbackSession().setName(feedbackSession.getName()); + copiedQuestion.setQuestionNumber(3); + + feedbackEditPage.verifyRubricQuestionDetails(3, questionDetails); + verifyPresentInDatabase(copiedQuestion); + + ______TS("edit question"); + // add a new choice + questionDetails = (FeedbackRubricQuestionDetails) newQuestion.getQuestionDetailsCopy(); + List choices = questionDetails.getRubricChoices(); + choices.add("Edited choice."); + List> descriptions = questionDetails.getRubricDescriptions(); + descriptions.get(0).add("Edit description."); + descriptions.get(1).add("Edit description 1."); + // edit existing descriptions + descriptions.get(0).set(1, "Edit description 2"); + descriptions.get(1).set(0, ""); + // edit existing subquestion + List subQns = questionDetails.getRubricSubQuestions(); + subQns.set(0, "Edited subquestion."); + // add a new subquestion + subQns.add("Added subquestion."); + descriptions.add(Arrays.asList("", "test", "")); + // remove assigned weights + questionDetails.setHasAssignedWeights(false); + questionDetails.setRubricWeightsForEachCell(new ArrayList<>()); + newQuestion.setQuestionDetails(questionDetails); + feedbackEditPage.editRubricQuestion(2, questionDetails); + feedbackEditPage.waitForPageToLoad(); + + feedbackEditPage.verifyRubricQuestionDetails(2, questionDetails); + verifyPresentInDatabase(newQuestion); + } + + @Override + protected void testSubmitPage() { + FeedbackSubmitPage feedbackSubmitPage = loginToFeedbackSubmitPage(); + FeedbackQuestion question = testData.feedbackQuestions.get("qn1ForFirstSession"); + question.setQuestionNumber(1); + ______TS("verify loaded question"); + Student receiver = testData.students.get("benny.tmms@FRubricQn.CS2104"); + feedbackSubmitPage.verifyRubricQuestion(1, receiver.getName(), + (FeedbackRubricQuestionDetails) question.getQuestionDetailsCopy()); + + ______TS("submit response"); + // Student giver = testData.students.get(" + FeedbackResponse response = getResponse(question, receiver, Arrays.asList(1, 1)); + feedbackSubmitPage.fillRubricResponse(1, receiver.getName(), response); + feedbackSubmitPage.clickSubmitQuestionButton(1); + + verifyPresentInDatabase(response); + + ______TS("check previous response"); + feedbackSubmitPage = getFeedbackSubmitPage(); + feedbackSubmitPage.verifyRubricResponse(1, receiver.getName(), response); + + ______TS("edit response"); + response = getResponse(question, receiver, Arrays.asList(0, 0)); + feedbackSubmitPage.fillRubricResponse(1, receiver.getName(), response); + feedbackSubmitPage.clickSubmitQuestionButton(1); + + feedbackSubmitPage = getFeedbackSubmitPage(); + feedbackSubmitPage.verifyRubricResponse(1, receiver.getName(), response); + verifyPresentInDatabase(response); + } + + private FeedbackResponse getResponse(FeedbackQuestion question, Student receiver, List answers) { + FeedbackRubricResponseDetails details = new FeedbackRubricResponseDetails(); + details.setAnswer(answers); + + return FeedbackResponse.makeResponse(question, student.getEmail(), student.getSection(), + receiver.getEmail(), receiver.getSection(), details); + } +} diff --git a/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java b/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java index f7262e63ffb..9ac179b0856 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/FeedbackSubmitPage.java @@ -544,6 +544,15 @@ public void fillRubricResponse(int qnNumber, String recipient, FeedbackResponseA } } + public void fillRubricResponse(int qnNumber, String recipient, FeedbackResponse response) { + FeedbackRubricResponseDetails responseDetails = + (FeedbackRubricResponseDetails) response.getFeedbackResponseDetailsCopy(); + List answers = responseDetails.getAnswer(); + for (int i = 0; i < answers.size(); i++) { + click(getRubricInputs(qnNumber, recipient, i + 2).get(answers.get(i))); + } + } + public void verifyRubricResponse(int qnNumber, String recipient, FeedbackResponseAttributes response) { FeedbackRubricResponseDetails responseDetails = (FeedbackRubricResponseDetails) response.getResponseDetailsCopy(); @@ -553,6 +562,15 @@ public void verifyRubricResponse(int qnNumber, String recipient, FeedbackRespons } } + public void verifyRubricResponse(int qnNumber, String recipient, FeedbackResponse response) { + FeedbackRubricResponseDetails responseDetails = + (FeedbackRubricResponseDetails) response.getFeedbackResponseDetailsCopy(); + List answers = responseDetails.getAnswer(); + for (int i = 0; i < answers.size(); i++) { + assertTrue(getRubricInputs(qnNumber, recipient, i + 2).get(answers.get(i)).isSelected()); + } + } + public void verifyRankQuestion(int qnNumber, String recipient, FeedbackRankQuestionDetails questionDetails) { if (questionDetails.getMaxOptionsToBeRanked() != Const.POINTS_NO_VALUE) { assertEquals(getQuestionForm(qnNumber).findElement(By.id("max-options-message")).getText(), diff --git a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java index b00bf8fabfe..2ba1c4d3f7e 100644 --- a/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java +++ b/src/e2e/java/teammates/e2e/pageobjects/InstructorFeedbackEditPage.java @@ -809,6 +809,16 @@ public void addRubricQuestion(FeedbackQuestionAttributes feedbackQuestion) { clickSaveNewQuestionButton(); } + public void addRubricQuestion(FeedbackQuestion feedbackQuestion) { + addNewQuestion(9); + int questionNum = getNumQuestions(); + inputQuestionDetails(questionNum, feedbackQuestion); + FeedbackRubricQuestionDetails questionDetails = + (FeedbackRubricQuestionDetails) feedbackQuestion.getQuestionDetailsCopy(); + inputRubricDetails(questionNum, questionDetails); + clickSaveNewQuestionButton(); + } + public void editRubricQuestion(int questionNum, FeedbackRubricQuestionDetails questionDetails) { clickEditQuestionButton(questionNum); inputRubricDetails(questionNum, questionDetails); diff --git a/src/e2e/resources/data/FeedbackRubricQuestionE2ESqlTest.json b/src/e2e/resources/data/FeedbackRubricQuestionE2ESqlTest.json new file mode 100644 index 00000000000..946ed81cab9 --- /dev/null +++ b/src/e2e/resources/data/FeedbackRubricQuestionE2ESqlTest.json @@ -0,0 +1,358 @@ +{ + "accounts": { + "instructorWithSessions": { + "id": "00000000-0000-4000-8000-000000000001", + "googleId": "tm.e2e.FRubricQn.instructor", + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt" + } + }, + "accountRequests": {}, + "courses": { + "course": { + "id": "tm.e2e.FRubricQn.CS2104", + "name": "Programming Language Concepts", + "timeZone": "Africa/Johannesburg", + "institute": "TEAMMATES Test Institute 1" + }, + "course2": { + "id": "tm.e2e.FRubricQn.CS1101", + "name": "Programming Methodology", + "timeZone": "Africa/Johannesburg", + "institute": "TEAMMATES Test Institute 1" + } + }, + "sections": { + "tm.e2e.FRubricQn.CS2104-None": { + "id": "00000000-0000-4000-8000-000000000201", + "course": { + "id": "tm.e2e.FRubricQn.CS2104" + }, + "name": "None" + }, + "tm.e2e.FRubricQn.CS1101-None": { + "id": "00000000-0000-4000-8000-000000000202", + "course": { + "id": "tm.e2e.FRubricQn.CS1101" + }, + "name": "None" + } + }, + "teams": { + "tm.e2e.FRubricQn.CS2104-None-Team1": { + "id": "00000000-0000-4000-8000-000000000301", + "section": { + "id": "00000000-0000-4000-8000-000000000201" + }, + "name": "Team 1" + }, + "tm.e2e.FRubricQn.CS1101-None-Team2": { + "id": "00000000-0000-4000-8000-000000000302", + "section": { + "id": "00000000-0000-4000-8000-000000000202" + }, + "name": "Team 2" + } + }, + "deadlineExtensions": {}, + "instructors": { + "instructor": { + "isDisplayedToStudents": true, + "displayName": "Co-owner", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000501", + "courseId": "tm.e2e.FRubricQn.CS2104", + "course": { + "id": "tm.e2e.FRubricQn.CS2104" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt", + "regKey": "4F647E6C589F4A653FE2E00ACBF60E97098AEE5B9B2B344F1433AC3336D567FE498879D5EDC75B130B1D4316641CEEE7AA53CA47CAAE91920644B3AC4DC6D66F" + }, + "instructor2": { + "isDisplayedToStudents": true, + "displayName": "Co-owner", + "role": "INSTRUCTOR_PERMISSION_ROLE_COOWNER", + "privileges": { + "courseLevel": { + "canModifyCourse": true, + "canModifyInstructor": true, + "canModifySession": true, + "canModifyStudent": true, + "canViewStudentInSections": true, + "canViewSessionInSections": true, + "canSubmitSessionInSections": true, + "canModifySessionCommentsInSections": true + }, + "sectionLevel": {}, + "sessionLevel": {} + }, + "id": "00000000-0000-4000-8000-000000000502", + "courseId": "tm.e2e.FRubricQn.CS1101", + "course": { + "id": "tm.e2e.FRubricQn.CS1101" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt", + "regKey": "4F647E6C589F4A653FE2E00ACBF60E97098AEE5B9B2B344F1433AC3336D567FEA097E915F0B418903EA5756DB26891F20E0D47726D1FAA6CE0C29EAF17D950CD" + } + }, + "students": { + "alice.tmms@FRubricQn.CS2104": { + "comments": "This student's name is Alice Betsy", + "id": "00000000-0000-4000-8000-000000000601", + "courseId": "tm.e2e.FRubricQn.CS2104", + "course": { + "id": "tm.e2e.FRubricQn.CS2104" + }, + "name": "Alice Betsy", + "email": "alice.b.tmms@gmail.tmt", + "regKey": "EBE50B16D49CF8511F63AC64F55EEE9A9BBF979EDD08808B815CB748176E61CBBD7364C6F112325851C21A8237FE3F2B9D157BBE8E0A82BFC8695990DDDB8DDB", + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + } + }, + "benny.tmms@FRubricQn.CS2104": { + "comments": "This student's name is Benny Charles", + "id": "00000000-0000-4000-8000-000000000602", + "courseId": "tm.e2e.FRubricQn.CS2104", + "course": { + "id": "tm.e2e.FRubricQn.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Benny Charles", + "email": "benny.tmms@gmail.tmt", + "regKey": "4E89CF58E1263D114A5A352555BDEF24FE9EBA55575B73F1FCDE2A30FF8DF1C8A04289CB0E187D938973732E18082EBF82A64E5B2EC66152A7A50EBB4790F91F" + }, + "charlie.tmms@FRubricQn.CS2104": { + "comments": "This student's name is Charlie Davis", + "id": "00000000-0000-4000-8000-000000000603", + "courseId": "tm.e2e.FRubricQn.CS2104", + "course": { + "id": "tm.e2e.FRubricQn.CS2104" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000301" + }, + "account": { + "id": "00000000-0000-4000-8000-000000000001" + }, + "name": "Charlie Davis", + "email": "FRubricQn.charlie.tmms@gmail.tmt", + "regKey": "067D131524890778C6BBB57B778D4F2FBCF1FA17123302BA4FBBC6705321C17311B2393495AFC68170567B84EB749F9C59DB034E6B00DC113C1D97A09171A55F438B4CED8016561F1425C109373DEA8C" + }, + "danny.tmms@FRubricQn.CS1101": { + "comments": "This student's name is Danny Engrid", + "id": "00000000-0000-4000-8000-000000000604", + "courseId": "tm.e2e.FRubricQn.CS1101", + "course": { + "id": "tm.e2e.FRubricQn.CS1101" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000302" + }, + "name": "Danny Engrid", + "email": "FRubricQn.danny.tmms@gmail.tmt", + "regKey": "5E0FC5BDABC5E09C5A325401E6C19A01DB3D85BD1D630C2E25655BCC0194ADC8CC61A14AE6407480F243E167055081FA688CDD2062670A825B9FFA6D130439DA6CD537E26F7DDF4AB586838EA9619B3E" + } + }, + "feedbackSessions": { + "openSession": { + "id": "00000000-0000-4000-8000-000000000701", + "course": { + "id": "tm.e2e.FRubricQn.CS2104" + }, + "name": "First Session", + "creatorEmail": "tmms.test@gmail.tmt", + "instructions": "

    Instructions for first session

    ", + "startTime": "2012-04-01T22:00:00Z", + "endTime": "2026-04-30T22:00:00Z", + "sessionVisibleFromTime": "2012-04-01T22:00:00Z", + "resultsVisibleFromTime": "2026-05-01T22:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-04-01T23:59:00Z" + }, + "openSession2": { + "id": "00000000-0000-4000-8000-000000000702", + "course": { + "id": "tm.e2e.FRubricQn.CS1101" + }, + "name": "Second Session", + "creatorEmail": "tmms.test@gmail.tmt", + "instructions": "

    Instructions for Second session

    ", + "startTime": "2012-04-01T22:00:00Z", + "endTime": "2026-04-30T22:00:00Z", + "sessionVisibleFromTime": "2012-04-01T22:00:00Z", + "resultsVisibleFromTime": "2026-05-01T22:00:00Z", + "gracePeriod": 10, + "isOpeningEmailEnabled": true, + "isClosingEmailEnabled": true, + "isPublishedEmailEnabled": true, + "isOpeningSoonEmailSent": false, + "isOpenEmailSent": false, + "isClosingSoonEmailSent": false, + "isClosedEmailSent": false, + "isPublishedEmailSent": false, + "createdAt": "2012-04-01T23:59:00Z" + } + }, + "feedbackQuestions": { + "qn1ForFirstSession": { + "questionDetails": { + "hasAssignedWeights": true, + "rubricWeightsForEachCell": [ + [ + 1.01, + -0.99 + ], + [ + 100.0, + -200.0 + ] + ], + "rubricChoices": [ + "Yes", + "No" + ], + "rubricSubQuestions": [ + "This student has done a good job.", + "This student has tried his/her best." + ], + "rubricDescriptions": [ + [ + "", + "" + ], + [ + "Most of the time", + "Less than half the time" + ] + ], + "questionType": "RUBRIC", + "questionText": "Please choose the best choice for the following sub-questions." + }, + "id": "00000000-0000-4000-8000-000000000801", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000701" + }, + "questionNumber": 1, + "description": "

    Testing description for first session

    ", + "giverType": "STUDENTS", + "recipientType": "OWN_TEAM_MEMBERS", + "numOfEntitiesToGiveFeedbackTo": -100, + "showResponsesTo": [ + "INSTRUCTORS", + "RECEIVER" + ], + "showGiverNameTo": [ + "INSTRUCTORS" + ], + "showRecipientNameTo": [ + "INSTRUCTORS", + "RECEIVER" + ] + }, + "qn1ForSecondSession": { + "questionDetails": { + "hasAssignedWeights": false, + "rubricWeightsForEachCell": [], + "rubricChoices": [ + "Strongly Agree", + "Agree", + "Neutral", + "Disagree", + "Strongly Disagree" + ], + "rubricSubQuestions": [ + "The content of the class was interesting.", + "The professor was engaging.", + "The duration of the lessons too short." + ], + "rubricDescriptions": [ + [ + "", + "", + "", + "", + "" + ], + [ + "Most of the time", + "", + "", + "", + "Less than half the time" + ], + [ + "The class should be 1 hour longer.", + "The class should be 30 min longer.", + "The class duration is just right.", + "The class should be 30 min shorter.", + "The class should be 1 hour shorter." + ] + ], + "questionType": "RUBRIC", + "questionText": "Please choose the best choice for the following sub-questions." + }, + "id": "00000000-0000-4000-8000-000000000802", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000702" + }, + "questionNumber": 1, + "description": "

    Testing description for second session

    ", + "giverType": "STUDENTS", + "recipientType": "NONE", + "numOfEntitiesToGiveFeedbackTo": -100, + "showResponsesTo": [ + "INSTRUCTORS" + ], + "showGiverNameTo": [ + "INSTRUCTORS" + ], + "showRecipientNameTo": [ + "INSTRUCTORS" + ] + } + }, + "feedbackResponses": {}, + "feedbackResponseComments": {}, + "feedbackSessionLogs": {}, + "notifications": {}, + "readNotifications": {} +} diff --git a/src/e2e/resources/testng-e2e-sql.xml b/src/e2e/resources/testng-e2e-sql.xml index e8615603a8b..7bd113b3dbc 100644 --- a/src/e2e/resources/testng-e2e-sql.xml +++ b/src/e2e/resources/testng-e2e-sql.xml @@ -10,6 +10,7 @@ + From 34248a030281645be07aa68974dfc8265be6c0d1 Mon Sep 17 00:00:00 2001 From: FergusMok Date: Thu, 2 May 2024 15:10:04 +0800 Subject: [PATCH 91/95] [#12048] Migrate SubmitFeedbackResponseAction tests (#13033) * Skeleton till shouldAllowIfBeforeDeadline * Save progress * Save progress * Fix all tests * Fix linting * Remove redundant * Refactor to fit integration tests structure * Add breaking changes * Add flush * Fix linting * Fix clean-up from access control --- .../core/FeedbackQuestionsLogicIT.java | 5 +- .../storage/sqlapi/FeedbackQuestionsDbIT.java | 8 +- .../SubmitFeedbackResponsesActionIT.java | 727 ++++++++++++++++++ src/it/resources/data/typicalDataBundle.json | 88 ++- .../java/teammates/sqllogic/api/Logic.java | 30 +- .../core/DeadlineExtensionsLogic.java | 11 +- .../sqllogic/core/FeedbackQuestionsLogic.java | 7 + .../sqllogic/core/FeedbackResponsesLogic.java | 34 +- .../storage/sqlapi/FeedbackQuestionsDb.java | 16 + .../storage/sqlapi/FeedbackResponsesDb.java | 21 + .../storage/sqlentity/FeedbackSession.java | 8 +- .../webapi/BasicFeedbackSubmissionAction.java | 10 +- .../CreateFeedbackResponseCommentAction.java | 4 +- .../DeleteFeedbackResponseCommentAction.java | 4 +- .../webapi/SubmitFeedbackResponsesAction.java | 8 +- .../UpdateFeedbackResponseCommentAction.java | 4 +- .../SubmitFeedbackResponsesActionTest.java | 4 +- 17 files changed, 934 insertions(+), 55 deletions(-) create mode 100644 src/it/java/teammates/it/ui/webapi/SubmitFeedbackResponsesActionIT.java diff --git a/src/it/java/teammates/it/sqllogic/core/FeedbackQuestionsLogicIT.java b/src/it/java/teammates/it/sqllogic/core/FeedbackQuestionsLogicIT.java index ee5706ac091..ddbc538f6f3 100644 --- a/src/it/java/teammates/it/sqllogic/core/FeedbackQuestionsLogicIT.java +++ b/src/it/java/teammates/it/sqllogic/core/FeedbackQuestionsLogicIT.java @@ -75,8 +75,11 @@ public void testGetFeedbackQuestionsForSession() { FeedbackQuestion fq4 = typicalDataBundle.feedbackQuestions.get("qn4InSession1InCourse1"); FeedbackQuestion fq5 = typicalDataBundle.feedbackQuestions.get("qn5InSession1InCourse1"); FeedbackQuestion fq6 = typicalDataBundle.feedbackQuestions.get("qn6InSession1InCourse1NoResponses"); + FeedbackQuestion fq7 = typicalDataBundle.feedbackQuestions.get("qn7InSession1InCourse1"); + FeedbackQuestion fq8 = typicalDataBundle.feedbackQuestions.get("qn8InSession1InCourse1"); + FeedbackQuestion fq9 = typicalDataBundle.feedbackQuestions.get("qn9InSession1InCourse1"); - List expectedQuestions = List.of(fq1, fq2, fq3, fq4, fq5, fq6); + List expectedQuestions = List.of(fq1, fq2, fq3, fq4, fq5, fq6, fq7, fq8, fq9); List actualQuestions = fqLogic.getFeedbackQuestionsForSession(fs); diff --git a/src/it/java/teammates/it/storage/sqlapi/FeedbackQuestionsDbIT.java b/src/it/java/teammates/it/storage/sqlapi/FeedbackQuestionsDbIT.java index 145f4ee4ef0..b201263775c 100644 --- a/src/it/java/teammates/it/storage/sqlapi/FeedbackQuestionsDbIT.java +++ b/src/it/java/teammates/it/storage/sqlapi/FeedbackQuestionsDbIT.java @@ -93,8 +93,11 @@ public void testGetFeedbackQuestionsForSession() { FeedbackQuestion fq4 = typicalDataBundle.feedbackQuestions.get("qn4InSession1InCourse1"); FeedbackQuestion fq5 = typicalDataBundle.feedbackQuestions.get("qn5InSession1InCourse1"); FeedbackQuestion fq6 = typicalDataBundle.feedbackQuestions.get("qn6InSession1InCourse1NoResponses"); + FeedbackQuestion fq7 = typicalDataBundle.feedbackQuestions.get("qn7InSession1InCourse1"); + FeedbackQuestion fq8 = typicalDataBundle.feedbackQuestions.get("qn8InSession1InCourse1"); + FeedbackQuestion fq9 = typicalDataBundle.feedbackQuestions.get("qn9InSession1InCourse1"); - List expectedQuestions = List.of(fq1, fq2, fq3, fq4, fq5, fq6); + List expectedQuestions = List.of(fq1, fq2, fq3, fq4, fq5, fq6, fq7, fq8, fq9); List actualQuestions = fqDb.getFeedbackQuestionsForSession(fs.getId()); @@ -112,8 +115,9 @@ public void testGetFeedbackQuestionsForGiverType() { FeedbackSession fs = typicalDataBundle.feedbackSessions.get("session1InCourse1"); FeedbackQuestion fq1 = typicalDataBundle.feedbackQuestions.get("qn1InSession1InCourse1"); FeedbackQuestion fq2 = typicalDataBundle.feedbackQuestions.get("qn2InSession1InCourse1"); + FeedbackQuestion fq9 = typicalDataBundle.feedbackQuestions.get("qn9InSession1InCourse1"); - List expectedQuestions = List.of(fq1, fq2); + List expectedQuestions = List.of(fq1, fq2, fq9); List actualQuestions = fqDb.getFeedbackQuestionsForGiverType(fs, FeedbackParticipantType.STUDENTS); diff --git a/src/it/java/teammates/it/ui/webapi/SubmitFeedbackResponsesActionIT.java b/src/it/java/teammates/it/ui/webapi/SubmitFeedbackResponsesActionIT.java new file mode 100644 index 00000000000..fa278a379b3 --- /dev/null +++ b/src/it/java/teammates/it/ui/webapi/SubmitFeedbackResponsesActionIT.java @@ -0,0 +1,727 @@ +package teammates.it.ui.webapi; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.commons.lang.StringEscapeUtils; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import teammates.common.datatransfer.InstructorPrivileges; +import teammates.common.datatransfer.questions.FeedbackResponseDetails; +import teammates.common.datatransfer.questions.FeedbackTextResponseDetails; +import teammates.common.exception.EntityAlreadyExistsException; +import teammates.common.exception.EntityDoesNotExistException; +import teammates.common.exception.InvalidParametersException; +import teammates.common.util.Const; +import teammates.common.util.HibernateUtil; +import teammates.common.util.SanitizationHelper; +import teammates.common.util.TimeHelper; +import teammates.storage.sqlentity.DeadlineExtension; +import teammates.storage.sqlentity.FeedbackQuestion; +import teammates.storage.sqlentity.FeedbackResponse; +import teammates.storage.sqlentity.FeedbackSession; +import teammates.storage.sqlentity.Instructor; +import teammates.storage.sqlentity.Student; +import teammates.storage.sqlentity.User; +import teammates.ui.output.FeedbackResponseData; +import teammates.ui.output.FeedbackResponsesData; +import teammates.ui.request.FeedbackResponsesRequest; +import teammates.ui.request.Intent; +import teammates.ui.webapi.JsonResult; +import teammates.ui.webapi.SubmitFeedbackResponsesAction; + +/** + * SUT: {@link SubmitFeedbackResponsesAction}. + */ +public class SubmitFeedbackResponsesActionIT extends BaseActionIT { + @Override + @BeforeMethod + protected void setUp() throws Exception { + super.setUp(); + persistDataBundle(typicalBundle); + HibernateUtil.flushSession(); + } + + @Override + protected String getActionUri() { + return Const.ResourceURIs.RESPONSES; + } + + @Override + protected String getRequestMethod() { + return PUT; + } + + private FeedbackSession getSession(String sessionId) { + return typicalBundle.feedbackSessions.get(sessionId); + } + + private Instructor getInstructor(String instructorId) { + return typicalBundle.instructors.get(instructorId); + } + + private Instructor loginInstructor(String instructorId) { + Instructor instructor = getInstructor(instructorId); + loginAsInstructor(instructor.getGoogleId()); + HibernateUtil.flushSession(); + return instructor; + } + + private Student getStudent(String studentId) { + return typicalBundle.students.get(studentId); + } + + private List getStudents(String... studentIds) { + List students = new ArrayList<>(); + for (String studentId : studentIds) { + Student student = getStudent(studentId); + students.add(student); + } + + return students; + } + + private Student loginStudent(String studentId) { + Student student = getStudent(studentId); + loginAsStudent(student.getGoogleId()); + HibernateUtil.flushSession(); + return student; + } + + private FeedbackQuestion getQuestion( + FeedbackSession session, int questionNumber) { + return logic.getFeedbackQuestionForSessionQuestionNumber(session.getId(), questionNumber); + } + + private void setStartTime(FeedbackSession session, int days) + throws InvalidParametersException, EntityDoesNotExistException { + Instant startTime = TimeHelper.getInstantDaysOffsetFromNow(days); + + session.setStartTime(startTime); + + logic.updateFeedbackSession(session); + HibernateUtil.flushSession(); + } + + private void setEndTime(FeedbackSession session, int days) + throws InvalidParametersException, EntityDoesNotExistException { + Instant endTime = TimeHelper.getInstantDaysOffsetFromNow(days); + + session.setEndTime(endTime); + + logic.updateFeedbackSession(session); + HibernateUtil.flushSession(); + } + + private void setUserDeadlineExtension(FeedbackSession session, User user, int days) + throws InvalidParametersException, EntityDoesNotExistException, EntityAlreadyExistsException { + DeadlineExtension newDeadline = + new DeadlineExtension(user, session, TimeHelper.getInstantDaysOffsetFromNow(days)); + + newDeadline.setFeedbackSession(session); + newDeadline.setUser(user); + + DeadlineExtension existingDeadlineEndTime = logic.getDeadlineExtensionEntityForUser(session, user); + if (existingDeadlineEndTime != null) { + newDeadline.setId(existingDeadlineEndTime.getId()); + logic.updateDeadlineExtension(newDeadline); + } else { + logic.createDeadlineExtension(newDeadline); + } + } + + private void deleteDeadlineExtensionForUser(FeedbackSession session, User user) { + DeadlineExtension existingDeadlineEndTime = logic.getDeadlineExtensionEntityForUser(session, user); + if (existingDeadlineEndTime == null) { + return; + } + + logic.deleteDeadlineExtension(existingDeadlineEndTime); + } + + private String[] buildSubmissionParams(FeedbackSession session, int questionNumber, Intent intent) { + FeedbackQuestion question = getQuestion(session, questionNumber); + return buildSubmissionParams(question, intent); + } + + private String[] buildSubmissionParams(FeedbackQuestion question, Intent intent) { + String questionId = question != null ? question.getId().toString() : ""; + + return new String[] {Const.ParamsNames.FEEDBACK_QUESTION_ID, questionId, Const.ParamsNames.INTENT, + intent.toString()}; + } + + private void setSubmitSessionInSectionsInstructorPrivilege(FeedbackSession session, + Instructor instructor, boolean value) + throws Exception { + String courseId = session.getCourseId(); + + InstructorPrivileges instructorPrivileges = new InstructorPrivileges(); + instructorPrivileges.updatePrivilege(Const.InstructorPermissions.CAN_SUBMIT_SESSION_IN_SECTIONS, value); + + instructor.getCourse().setId(courseId); + instructor.setPrivileges(instructorPrivileges); + + logic.updateToEnsureValidityOfInstructorsForTheCourse(courseId, instructor); + } + + private List extractStudentEmails(List students) { + return students.stream().map(recipient -> recipient.getEmail()).collect(Collectors.toList()); + } + + private List extractStudentTeams(List students) { + return students.stream().map(recipient -> recipient.getTeam().getName()).collect(Collectors.toList()); + } + + private FeedbackResponsesRequest buildRequestBodyWithStudentRecipientsEmail( + List recipients) { + List emails = extractStudentEmails(recipients); + return buildRequestBody(emails); + } + + private FeedbackResponsesRequest buildRequestBodyWithStudentRecipientsTeam( + List recipients) { + List teams = extractStudentTeams(recipients); + return buildRequestBody(teams); + } + + private List extractInstructorEmails( + List students) { + return students.stream().map(recipient -> recipient.getEmail()).collect(Collectors.toList()); + } + + private FeedbackResponsesRequest buildRequestBodyWithInstructorRecipients(List recipients) { + List emails = extractInstructorEmails(recipients); + return buildRequestBody(emails); + } + + private FeedbackResponsesRequest buildRequestBody(List values) { + List responses = new ArrayList<>(); + + for (String value : values) { + FeedbackTextResponseDetails responseDetails = new FeedbackTextResponseDetails("Response for " + value); + FeedbackResponsesRequest.FeedbackResponseRequest response = + new FeedbackResponsesRequest.FeedbackResponseRequest(value, responseDetails); + + responses.add(response); + } + + FeedbackResponsesRequest requestBody = new FeedbackResponsesRequest(); + requestBody.setResponses(responses); + return requestBody; + } + + private List callExecute(FeedbackResponsesRequest requestBody, String[] submissionParams) { + SubmitFeedbackResponsesAction action = getAction(requestBody, submissionParams); + JsonResult result = getJsonResult(action); + + FeedbackResponsesData output = (FeedbackResponsesData) result.getOutput(); + return output.getResponses(); + } + + private void validateOutputForStudentRecipientsByEmail(List responses, String giverEmail, + List recipients) { + int responsesSize = responses.size(); + assertEquals(recipients.size(), responsesSize); + + List recipientEmails = extractStudentEmails(recipients); + + validateOutput(responses, giverEmail, recipientEmails); + } + + private void validateOutputForStudentRecipientsByTeam(List responses, String giverTeam, + List recipients) { + int responsesSize = responses.size(); + assertEquals(recipients.size(), responsesSize); + + List recipientTeams = extractStudentTeams(recipients); + + validateOutput(responses, giverTeam, recipientTeams); + } + + private void validateOutputForInstructorRecipients(List responses, String giverEmail, + List recipients) { + int responsesSize = responses.size(); + assertEquals(recipients.size(), responsesSize); + + List recipientEmails = extractInstructorEmails(recipients); + + validateOutput(responses, giverEmail, recipientEmails); + } + + private void validateOutput(List responses, String giverValue, List recipientValues) { + for (int i = 0; i < recipientValues.size(); i++) { + FeedbackResponseData response = responses.get(i); + String recipientValue = recipientValues.get(i); + + assertEquals(giverValue, response.getGiverIdentifier()); + assertEquals(recipientValue, response.getRecipientIdentifier()); + + FeedbackResponseDetails responseDetails = response.getResponseDetails(); + assertEquals(StringEscapeUtils.unescapeHtml( + SanitizationHelper.sanitizeForRichText("Response for " + recipientValue)), + StringEscapeUtils.unescapeHtml(responseDetails.getAnswerString())); + } + } + + private void validateStudentDatabaseByTeam(FeedbackSession session, FeedbackQuestion question, + String giverTeam, List recipients) { + List studentTeamNames = extractStudentTeams(recipients); + + validateDatabaseWithRecipientEmails(session, question, giverTeam, studentTeamNames); + } + + private void validateStudentDatabaseByEmail(FeedbackSession session, FeedbackQuestion question, String giverEmail, + List recipients) { + List studentRecipientEmails = extractStudentEmails(recipients); + + validateDatabaseWithRecipientEmails(session, question, giverEmail, studentRecipientEmails); + } + + private void validateInstructorDatabaseByEmail( + FeedbackSession session, + FeedbackQuestion question, + String giverEmail, List recipients) { + List instructorRecipientEmails = extractInstructorEmails(recipients); + + validateDatabaseWithRecipientEmails(session, question, giverEmail, instructorRecipientEmails); + } + + private void validateDatabaseWithRecipientEmails(FeedbackSession session, FeedbackQuestion feedbackQuestion, + String giverEmail, List recipientEmails) { + + for (String recipientEmail : recipientEmails) { + List feedbackResponses = + logic.getFeedbackResponsesFromGiverAndRecipientForCourse( + session.getCourseId(), giverEmail, recipientEmail); + + for (FeedbackResponse feedbackResponse : feedbackResponses) { + FeedbackQuestion frFeedbackQuestion = feedbackResponse.getFeedbackQuestion(); + + assertEquals(frFeedbackQuestion, feedbackQuestion); + assertEquals(feedbackResponse.getGiver(), giverEmail); + assertEquals(feedbackResponse.getRecipient(), recipientEmail); + + assertEquals(session.getName(), feedbackQuestion.getFeedbackSessionName()); + assertEquals(session.getCourseId(), feedbackQuestion.getCourseId()); + + FeedbackResponseDetails responseDetails = feedbackResponse.getFeedbackResponseDetailsCopy(); + assertEquals( + StringEscapeUtils.unescapeHtml( + SanitizationHelper.sanitizeForRichText("Response for " + recipientEmail)), + StringEscapeUtils.unescapeHtml(responseDetails.getAnswerString())); + } + } + } + + @Override + @Test + protected void testAccessControl() throws Exception { + FeedbackSession session = getSession("session1InCourse1"); + Student student = loginStudent("student1InCourse1"); + Instructor instructor = loginInstructor("instructor1OfCourse1"); + deleteDeadlineExtensionForUser(session, instructor); + deleteDeadlineExtensionForUser(session, student); + + ______TS("Typical case with instructors: feedback question exists"); + setStartTime(session, -1); + setEndTime(session, 1); + + int questionNumber = 4; + String[] submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCanAccess(submissionParams); + + ______TS("Typical case with student: feedback question exists"); + loginStudent("student1InCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCanAccess(submissionParams); + + ______TS("Failure with instructors: no feedback question parameter"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + submissionParams = new String[] {Const.ParamsNames.INTENT, Intent.INSTRUCTOR_SUBMISSION.toString()}; + + verifyHttpParameterFailureAcl(submissionParams); + + ______TS("Failure with instructors: feedback question does not exist"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 222; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyEntityNotFoundAcl(submissionParams); + + ______TS("Failure with students: no feedback question parameter"); + loginStudent("student1InCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + FeedbackQuestion question = getQuestion(session, questionNumber); + submissionParams = new String[] {Const.ParamsNames.FEEDBACK_QUESTION_ID, question.getId().toString()}; + + verifyHttpParameterFailureAcl(submissionParams); + + ______TS("Failure with students: invalid intent for action STUDENT_RESULT"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_RESULT); + + verifyHttpParameterFailureAcl(submissionParams); + + ______TS("Failure with students: submission not open, start time is in the future"); + loginStudent("student1InCourse1"); + setStartTime(session, 2); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCannotAccess(submissionParams); + + ______TS("Typical success with students: redundant deadline extension"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + // No selective deadline, should pass. + verifyCanAccess(submissionParams); + + // With selective deadline, should still pass. + setUserDeadlineExtension(session, student, 7); + verifyCanAccess(submissionParams); + + ______TS("Typical success with instructor: deadline extension granted after submission closed"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -3); + setEndTime(session, -2); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + setUserDeadlineExtension(session, instructor, -1); + + // No selective deadline, should not pass. + verifyCannotAccess(submissionParams); + + // With selective deadline, should pass + setUserDeadlineExtension(session, instructor, 1); + verifyCanAccess(submissionParams); + + ______TS("Failure with instructor: submission after deadline extension expired"); + setStartTime(session, -3); + setEndTime(session, -2); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + setUserDeadlineExtension(session, instructor, -1); + verifyCannotAccess(submissionParams); + + ______TS("Typical success with student: student answers question with correct giver"); + loginStudent("student1InCourse1"); + deleteDeadlineExtensionForUser(session, student); + setEndTime(session, 3); + setStartTime(session, -1); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCanAccess(submissionParams); + + ______TS("Failure with student: student answers question with incorrect giver"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCannotAccess(submissionParams); + + ______TS("Failure with student: student logged out"); + logoutUser(); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCannotAccess(submissionParams); + + ______TS("Failure with student: student logged in as instructor"); + logoutUser(); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCannotAccess(submissionParams); + + loginStudent("student1InCourse1"); + verifyCanAccess(submissionParams); + + ______TS("Failure with student: student logged in as admin"); + logoutUser(); + loginAsAdmin(); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCannotAccess(submissionParams); + + loginStudent("student1InCourse1"); + verifyCanAccess(submissionParams); + + ______TS("Typical success with student: logged in as admin masquerading as student"); + logoutUser(); + loginAsAdmin(); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + + verifyCanMasquerade(student.getGoogleId(), submissionParams); + + ______TS("Typical success with instructor: instructor answers question with correct giver"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCanAccess(submissionParams); + + ______TS("Typical success with instructor: instructor answers question to self-answerable question"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 3; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCanAccess(submissionParams); + + ______TS("Failure with instructor: instructor answers question with incorrect giver"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 1; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCannotAccess(submissionParams); + + ______TS("Failure with instructor: instructor logged out"); + logoutUser(); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 3; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCannotAccess(submissionParams); + + ______TS("Failure with instructor: instructor logged in as admin"); + logoutUser(); + loginAsAdmin(); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCannotAccess(submissionParams); + + loginInstructor("instructor1OfCourse1"); + verifyCanAccess(submissionParams); + + ______TS("Typical success with instructor: logged in as admin masquerading as instructor"); + logoutUser(); + loginAsAdmin(); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCanMasquerade(instructor.getGoogleId(), submissionParams); + + ______TS("Failure with instructor: instructor logged in as student"); + loginStudent("student1InCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCannotAccess(submissionParams); + + ______TS("Typical success with instructor: instructor has modify session comment privileges"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + setSubmitSessionInSectionsInstructorPrivilege(session, instructor, true); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCanAccess(submissionParams); + verifyCanMasquerade(instructor.getGoogleId(), submissionParams); + + ______TS("Failure with instructor: instructor has no modify session comment privileges"); + loginInstructor("instructor1OfCourse1"); + setStartTime(session, -1); + setEndTime(session, 3); + + setSubmitSessionInSectionsInstructorPrivilege(session, instructor, false); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + verifyCannotAccess(submissionParams); + verifyCannotMasquerade(instructor.getGoogleId(), submissionParams); + + // Reset privileges + setSubmitSessionInSectionsInstructorPrivilege(session, instructor, true); + } + + @Override + @Test + public void testExecute() { + ______TS("Failure: invalid http parameters"); + loginInstructor("instructor1OfCourse1"); + + verifyHttpParameterFailure(new String[] {}); + + ______TS("Failure: not feedback question parameter specified"); + String[] submissionParams = new String[] {Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString()}; + verifyHttpParameterFailure(submissionParams); + + ______TS("Failure: feedback question does not exist"); + submissionParams = new String[] { + Const.ParamsNames.INTENT, Intent.STUDENT_SUBMISSION.toString(), + Const.ParamsNames.FEEDBACK_QUESTION_ID, "non-existent id"}; + verifyEntityNotFound(submissionParams); + + ______TS("Failure: instructor has invalid intent"); + FeedbackSession session = getSession("session1InCourse1"); + int questionNumber = 3; + + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_RESULT); + verifyHttpParameterFailure(submissionParams); + + submissionParams = buildSubmissionParams(session, questionNumber, Intent.FULL_DETAIL); + verifyHttpParameterFailure(submissionParams); + + ______TS("Failure: no request body"); + loginStudent("student1InCourse1"); + + questionNumber = 2; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); + verifyHttpRequestBodyFailure(null, submissionParams); + + ______TS("Failure: request body has no recipient"); + loginInstructor("instructor1OfCourse1"); + + questionNumber = 4; + submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + + // Null recipient + List nullEmail = Collections.singletonList(null); + FeedbackResponsesRequest requestBody = buildRequestBody(nullEmail); + verifyInvalidOperation(requestBody, submissionParams); + + // Empty String recipient + requestBody = buildRequestBody(Collections.singletonList("")); + verifyInvalidOperation(requestBody, submissionParams); + + ______TS("Success: question has no existing responses"); + Instructor instructorGiver = loginInstructor("instructor1OfCourse1"); + + questionNumber = 7; + FeedbackQuestion question = getQuestion(session, questionNumber); + submissionParams = buildSubmissionParams(question, Intent.INSTRUCTOR_SUBMISSION); + + List instructorRecipients = Collections.singletonList(instructorGiver); + requestBody = buildRequestBodyWithInstructorRecipients(instructorRecipients); + + List outputResponses = callExecute(requestBody, submissionParams); + validateOutputForInstructorRecipients(outputResponses, instructorGiver.getEmail(), instructorRecipients); + validateInstructorDatabaseByEmail(session, question, instructorGiver.getEmail(), instructorRecipients); + + ______TS("Success: instructor is a valid giver of the question to student team"); + instructorGiver = loginInstructor("instructor1OfCourse1"); + + questionNumber = 8; + question = getQuestion(session, questionNumber); + submissionParams = buildSubmissionParams(question, Intent.INSTRUCTOR_SUBMISSION); + + List studentRecipients = getStudents("student2InCourse1", "student3InCourse1"); + requestBody = buildRequestBodyWithStudentRecipientsTeam(studentRecipients); + + outputResponses = callExecute(requestBody, submissionParams); + validateOutputForStudentRecipientsByTeam(outputResponses, instructorGiver.getEmail(), studentRecipients); + validateStudentDatabaseByTeam(session, question, instructorGiver.getEmail(), studentRecipients); + + ______TS("Success: question has existing responses"); + Student studentGiver = loginStudent("student1InCourse1"); + + questionNumber = 2; + question = getQuestion(session, questionNumber); + submissionParams = buildSubmissionParams(question, Intent.STUDENT_SUBMISSION); + + studentRecipients = getStudents("student3InCourse1"); + requestBody = buildRequestBodyWithStudentRecipientsEmail(studentRecipients); + + outputResponses = callExecute(requestBody, submissionParams); + validateOutputForStudentRecipientsByEmail(outputResponses, studentGiver.getEmail(), studentRecipients); + validateStudentDatabaseByEmail(session, question, studentGiver.getEmail(), studentRecipients); + + ______TS("Failure: student is a invalid giver of the question"); + questionNumber = 6; + question = getQuestion(session, questionNumber); + submissionParams = buildSubmissionParams(question, Intent.STUDENT_SUBMISSION); + + studentRecipients = getStudents("student2InCourse1"); + requestBody = buildRequestBodyWithStudentRecipientsTeam(studentRecipients); + + verifyInvalidOperation(requestBody, submissionParams); + + ______TS("Success: too many recipients"); + studentGiver = loginStudent("student4InCourse1"); + + questionNumber = 9; + question = getQuestion(session, questionNumber); + submissionParams = buildSubmissionParams(question, Intent.STUDENT_SUBMISSION); + + studentRecipients = getStudents("student2InCourse1", "student3InCourse1"); + requestBody = buildRequestBodyWithStudentRecipientsEmail(studentRecipients); + + outputResponses = callExecute(requestBody, submissionParams); + validateOutputForStudentRecipientsByEmail(outputResponses, studentGiver.getEmail(), studentRecipients); + validateStudentDatabaseByEmail(session, question, studentGiver.getEmail(), studentRecipients); + } +} diff --git a/src/it/resources/data/typicalDataBundle.json b/src/it/resources/data/typicalDataBundle.json index a04d0ef7193..58ac4fa1a51 100644 --- a/src/it/resources/data/typicalDataBundle.json +++ b/src/it/resources/data/typicalDataBundle.json @@ -603,6 +603,21 @@ "name": "student3 In Course1", "comments": "" }, + "student4InCourse1": { + "id": "00000000-0000-4000-8000-000000000611", + "account": { + "id": "00000000-0000-4000-8000-000000000104" + }, + "course": { + "id": "course-1" + }, + "team": { + "id": "00000000-0000-4000-8000-000000000305" + }, + "email": "student4@teammates.tmt", + "name": "student4 In Course1", + "comments": "This student is not in the same team as others in course 1" + }, "student1InCourse2": { "id": "00000000-0000-4000-8000-000000000604", "course": { @@ -689,21 +704,6 @@ "email": "studentOfArchivedCourse@teammates.tmt", "name": "Student In Archived Course", "comments": "" - }, - "student4InCourse1": { - "id": "00000000-0000-4000-8000-000000000611", - "account": { - "id": "00000000-0000-4000-8000-000000000104" - }, - "course": { - "id": "course-1" - }, - "team": { - "id": "00000000-0000-4000-8000-000000000305" - }, - "email": "student4@teammates.tmt", - "name": "student4 In Course1", - "comments": "comment for student4Course1" } }, "feedbackSessions": { @@ -1018,7 +1018,7 @@ "questionType": "TEXT" }, "description": "Feedback question with no responses", - "questionNumber": 5, + "questionNumber": 6, "giverType": "SELF", "recipientType": "NONE", "numOfEntitiesToGiveFeedbackTo": -100, @@ -1026,6 +1026,62 @@ "showGiverNameTo": ["INSTRUCTORS"], "showRecipientNameTo": ["INSTRUCTORS"] }, + "qn7InSession1InCourse1": { + "id": "00000000-0000-4000-8000-000000000807", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000701" + }, + "questionDetails": { + "recommendedLength": 100, + "questionText": "This is question 7, a text question.", + "questionType": "TEXT" + }, + "description": "This is a text question.", + "questionNumber": 7, + "giverType": "SELF", + "recipientType": "SELF", + "numOfEntitiesToGiveFeedbackTo": -100, + "showResponsesTo": ["INSTRUCTORS"], + "showGiverNameTo": ["INSTRUCTORS"], + "showRecipientNameTo": ["INSTRUCTORS"] + }, + "qn8InSession1InCourse1": { + "id": "00000000-0000-4000-8000-000000000808", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000701" + }, + "questionDetails": { + "recommendedLength": 100, + "questionText": "This is question 8, a text question.", + "questionType": "TEXT" + }, + "description": "This is a text question.", + "questionNumber": 8, + "giverType": "INSTRUCTORS", + "recipientType": "TEAMS_EXCLUDING_SELF", + "numOfEntitiesToGiveFeedbackTo": 1, + "showResponsesTo": ["RECEIVER"], + "showGiverNameTo": ["RECEIVER"], + "showRecipientNameTo": ["RECEIVER"] + }, + "qn9InSession1InCourse1": { + "id": "00000000-0000-4000-8000-000000000809", + "feedbackSession": { + "id": "00000000-0000-4000-8000-000000000701" + }, + "questionDetails": { + "questionType": "TEXT", + "questionText": "What is the best selling point of your product?" + }, + "description": "This is a text question.", + "questionNumber": 9, + "giverType": "STUDENTS", + "recipientType": "STUDENTS_EXCLUDING_SELF", + "numOfEntitiesToGiveFeedbackTo": 1, + "showResponsesTo": ["INSTRUCTORS"], + "showGiverNameTo": ["INSTRUCTORS"], + "showRecipientNameTo": ["INSTRUCTORS"] + }, "qn1InSession2InCourse1": { "id": "00000000-0000-4000-8001-000000000800", "feedbackSession": { diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index 659f27750c5..eb2698cd9d7 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -474,7 +474,7 @@ public void deleteDeadlineExtension(DeadlineExtension de) { } /** - * Fetch the deadline extension for a given user and session feedback. + * Fetch the deadline extension end time for a given user and session feedback. * * @return deadline extension instant if exists, else the default end time instant * for the session feedback. @@ -484,7 +484,7 @@ public Instant getDeadlineForUser(FeedbackSession session, User user) { } /** - * Fetch the deadline extension for a given user and session feedback. + * Fetch the deadline extension end time for a given user and session feedback. * * @return deadline extension instant if exists, else return null since no deadline extensions. */ @@ -492,6 +492,15 @@ public Instant getExtendedDeadlineForUser(FeedbackSession session, User user) { return deadlineExtensionsLogic.getExtendedDeadlineForUser(session, user); } + /** + * Fetch the deadline extension entity for a given user and session feedback. + * + * @return deadline extension entity if exists, else return null. + */ + public DeadlineExtension getDeadlineExtensionEntityForUser(FeedbackSession session, User user) { + return deadlineExtensionsLogic.getDeadlineExtensionEntityForUser(session, user); + } + /** * Gets a list of deadline extensions with endTime coming up soon * and possibly need a closing email to be sent. @@ -1305,6 +1314,13 @@ public List getFeedbackQuestionsForSession(FeedbackSession fee return feedbackQuestionsLogic.getFeedbackQuestionsForSession(feedbackSession); } + /** + * Gets the unique feedback question based on sessionId and questionNumber. + */ + public FeedbackQuestion getFeedbackQuestionForSessionQuestionNumber(UUID sessionId, int questionNumber) { + return feedbackQuestionsLogic.getFeedbackQuestionForSessionQuestionNumber(sessionId, questionNumber); + } + /** * Gets a list of all questions for the given session that * students can view/submit. @@ -1599,6 +1615,16 @@ public List getFeedbackResponsesForRecipientForCourse(String c return feedbackResponsesLogic.getFeedbackResponsesForRecipientForCourse(courseId, recipientEmail); } + /** + * Gets all feedback responses from a specific giver and recipient for a course. + */ + public List getFeedbackResponsesFromGiverAndRecipientForCourse(String courseId, String giverEmail, + String recipientEmail) { + + return feedbackResponsesLogic.getFeedbackResponsesFromGiverAndRecipientForCourse(courseId, giverEmail, + recipientEmail); + } + /** * Gets all feedback response comments for a feedback response. */ diff --git a/src/main/java/teammates/sqllogic/core/DeadlineExtensionsLogic.java b/src/main/java/teammates/sqllogic/core/DeadlineExtensionsLogic.java index c77cb255cc2..c27f56f9c5b 100644 --- a/src/main/java/teammates/sqllogic/core/DeadlineExtensionsLogic.java +++ b/src/main/java/teammates/sqllogic/core/DeadlineExtensionsLogic.java @@ -40,7 +40,7 @@ void initLogicDependencies(DeadlineExtensionsDb deadlineExtensionsDb, FeedbackSe } /** - * Get extended deadline for this session and user if it exists, otherwise get the deadline of the session. + * Get extended deadline end time for this session and user if it exists, otherwise get the deadline of the session. */ public Instant getDeadlineForUser(FeedbackSession session, User user) { Instant extendedDeadline = @@ -54,7 +54,7 @@ public Instant getDeadlineForUser(FeedbackSession session, User user) { } /** - * Get extended deadline for this session and user if it exists, otherwise return null. + * Get extended deadline end time for this session and user if it exists, otherwise return null. */ public Instant getExtendedDeadlineForUser(FeedbackSession feedbackSession, User user) { DeadlineExtension deadlineExtension = @@ -66,6 +66,13 @@ public Instant getExtendedDeadlineForUser(FeedbackSession feedbackSession, User return deadlineExtension.getEndTime(); } + /** + * Get deadline entity for this session and user if it exists, otherwise return null. + */ + public DeadlineExtension getDeadlineExtensionEntityForUser(FeedbackSession feedbackSession, User user) { + return deadlineExtensionsDb.getDeadlineExtension(user.getId(), feedbackSession.getId()); + } + /** * Creates a deadline extension. * diff --git a/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java index 7ccf253a0e0..88923417d7d 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java @@ -113,6 +113,13 @@ public List getFeedbackQuestionsForSession(FeedbackSession fee return questions; } + /** + * Gets the unique feedback question based on sessionId and questionNumber. + */ + public FeedbackQuestion getFeedbackQuestionForSessionQuestionNumber(UUID sessionId, int questionNumber) { + return fqDb.getFeedbackQuestionForSessionQuestionNumber(sessionId, questionNumber); + } + /** * Checks if there are any questions for the given session that instructors can view/submit. */ diff --git a/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java b/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java index bd2b6b43072..d20038d5403 100644 --- a/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java +++ b/src/main/java/teammates/sqllogic/core/FeedbackResponsesLogic.java @@ -206,24 +206,14 @@ public FeedbackResponse updateFeedbackResponseCascade(FeedbackResponse feedbackR FeedbackResponse oldResponse = frDb.getFeedbackResponse(feedbackResponse.getId()); FeedbackResponse newResponse = frDb.updateFeedbackResponse(feedbackResponse); - boolean isGiverSectionChanged = !oldResponse.getGiverSection().equals(newResponse.getGiverSection()); - boolean isRecipientSectionChanged = !oldResponse.getRecipientSection().equals(newResponse.getRecipientSection()); - - if (isGiverSectionChanged || isRecipientSectionChanged) { - List oldResponseComments = - frcLogic.getFeedbackResponseCommentForResponse(oldResponse.getId()); - for (FeedbackResponseComment oldResponseComment : oldResponseComments) { - if (isGiverSectionChanged) { - oldResponseComment.setGiverSection(newResponse.getGiverSection()); - } + List oldResponseComments = + frcLogic.getFeedbackResponseCommentForResponse(oldResponse.getId()); - if (isRecipientSectionChanged) { - oldResponseComment.setRecipientSection(newResponse.getRecipientSection()); - } - - frcLogic.updateFeedbackResponseComment(oldResponseComment); - } + for (FeedbackResponseComment oldResponseComment : oldResponseComments) { + oldResponseComment.setGiverSection(newResponse.getGiverSection()); + oldResponseComment.setRecipientSection(newResponse.getRecipientSection()); + frcLogic.updateFeedbackResponseComment(oldResponseComment); } return newResponse; @@ -303,6 +293,18 @@ public List getFeedbackResponsesForRecipientForCourse( return frDb.getFeedbackResponsesForRecipientForCourse(courseId, recipient); } + /** + * Gets all responses from a specific giver and recipient for a course. + */ + public List getFeedbackResponsesFromGiverAndRecipientForCourse( + String courseId, String giverEmail, String recipientEmail) { + assert courseId != null; + assert giverEmail != null; + assert recipientEmail != null; + + return frDb.getFeedbackResponsesForGiverAndRecipientForCourse(courseId, giverEmail, recipientEmail); + } + /** * Gets all responses given by a user for a question. */ diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java index ba4ac18b394..cee43672353 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java @@ -82,6 +82,22 @@ public List getFeedbackQuestionsForSession(UUID fdId) { return HibernateUtil.createQuery(cq).getResultList(); } + /** + * Gets the unique feedback question based on sessionId and questionNumber. + */ + public FeedbackQuestion getFeedbackQuestionForSessionQuestionNumber(UUID sessionId, int questionNumber) { + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(FeedbackQuestion.class); + Root fqRoot = cq.from(FeedbackQuestion.class); + Join fqJoin = fqRoot.join("feedbackSession"); + cq.select(fqRoot).where( + cb.and( + cb.equal(fqJoin.get("id"), sessionId), + cb.equal(fqRoot.get("questionNumber"), questionNumber) + )); + return HibernateUtil.createQuery(cq).getResultStream().findFirst().orElse(null); + } + /** * Gets a list of feedback questions by {@code feedbackSession} and {@code giverType}. * diff --git a/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java b/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java index 5dcf7ab375e..9afb50f7a45 100644 --- a/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java +++ b/src/main/java/teammates/storage/sqlapi/FeedbackResponsesDb.java @@ -90,6 +90,27 @@ public List getFeedbackResponsesForRecipientForCourse(String c return HibernateUtil.createQuery(cr).getResultList(); } + /** + * Gets all responses with a specific giver and recipient in a course. + */ + public List getFeedbackResponsesForGiverAndRecipientForCourse(String courseId, String giver, + String recipient) { + CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder(); + CriteriaQuery cr = cb.createQuery(FeedbackResponse.class); + Root frRoot = cr.from(FeedbackResponse.class); + Join fqJoin = frRoot.join("feedbackQuestion"); + Join fsJoin = fqJoin.join("feedbackSession"); + Join cJoin = fsJoin.join("course"); + + cr.select(frRoot) + .where(cb.and( + cb.equal(cJoin.get("id"), courseId), + cb.equal(frRoot.get("recipient"), recipient), + cb.equal(frRoot.get("giver"), giver))); + + return HibernateUtil.createQuery(cr).getResultList(); + } + /** * Creates a feedbackResponse. */ diff --git a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java index 78306541c18..d3084f30ee1 100644 --- a/src/main/java/teammates/storage/sqlentity/FeedbackSession.java +++ b/src/main/java/teammates/storage/sqlentity/FeedbackSession.java @@ -151,7 +151,7 @@ public FeedbackSession getCopy() { endTime, sessionVisibleFromTime, resultsVisibleFromTime, gracePeriod, isOpeningEmailEnabled, isClosingEmailEnabled, isPublishedEmailEnabled ); - + fs.setId(getId()); fs.setCreatedAt(getCreatedAt()); fs.setUpdatedAt(getUpdatedAt()); fs.setDeletedAt(getDeletedAt()); @@ -235,6 +235,10 @@ public void setCourse(Course course) { this.course = course; } + public String getCourseId() { + return course.getId(); + } + public String getName() { return name; } @@ -490,7 +494,7 @@ public boolean isWaitingToOpen() { public boolean isOpenedGivenExtendedDeadline(Instant extendedDeadline) { Instant now = Instant.now(); return (now.isAfter(startTime) || now.equals(startTime)) - && now.isBefore(extendedDeadline.plus(gracePeriod)) || now.isBefore(endTime.plus(gracePeriod)); + && (now.isBefore(extendedDeadline.plus(gracePeriod)) || now.isBefore(endTime.plus(gracePeriod))); } /** diff --git a/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java b/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java index 7c3b31931d5..f6997f58d54 100644 --- a/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java +++ b/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java @@ -1,5 +1,7 @@ package teammates.ui.webapi; +import java.time.Instant; + import teammates.common.datatransfer.FeedbackParticipantType; import teammates.common.datatransfer.attributes.FeedbackQuestionAttributes; import teammates.common.datatransfer.attributes.FeedbackSessionAttributes; @@ -12,6 +14,7 @@ import teammates.storage.sqlentity.Instructor; import teammates.storage.sqlentity.Section; import teammates.storage.sqlentity.Student; +import teammates.storage.sqlentity.User; /** * The basic action for feedback submission. @@ -407,10 +410,13 @@ void verifySessionOpenExceptForModeration(FeedbackSessionAttributes feedbackSess * *

    If it is moderation request, omit the check. */ - void verifySessionOpenExceptForModeration(FeedbackSession feedbackSession) throws UnauthorizedAccessException { + void verifySessionOpenExceptForModeration(FeedbackSession feedbackSession, User user) + throws UnauthorizedAccessException { String moderatedPerson = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON); + Instant deadlineExtension = sqlLogic.getDeadlineForUser(feedbackSession, user); - if (StringHelper.isEmpty(moderatedPerson) && !(feedbackSession.isOpened() || feedbackSession.isInGracePeriod())) { + if (StringHelper.isEmpty(moderatedPerson) && !(feedbackSession.isOpenedGivenExtendedDeadline(deadlineExtension) + || feedbackSession.isInGracePeriodGivenExtendedDeadline(deadlineExtension))) { throw new UnauthorizedAccessException("The feedback session is not available for submission", true); } } diff --git a/src/main/java/teammates/ui/webapi/CreateFeedbackResponseCommentAction.java b/src/main/java/teammates/ui/webapi/CreateFeedbackResponseCommentAction.java index a7e4deeb41c..be68ba58550 100644 --- a/src/main/java/teammates/ui/webapi/CreateFeedbackResponseCommentAction.java +++ b/src/main/java/teammates/ui/webapi/CreateFeedbackResponseCommentAction.java @@ -87,7 +87,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { session = session.getCopyForUser(student.getEmail()); gateKeeper.verifyAnswerableForStudent(feedbackQuestion); - verifySessionOpenExceptForModeration(session); + verifySessionOpenExceptForModeration(session, student); verifyInstructorCanSeeQuestionIfInModeration(feedbackQuestion); verifyNotPreview(); @@ -103,7 +103,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { session = session.getCopyForUser(instructorAsFeedbackParticipant.getEmail()); gateKeeper.verifyAnswerableForInstructor(feedbackQuestion); - verifySessionOpenExceptForModeration(session); + verifySessionOpenExceptForModeration(session, instructorAsFeedbackParticipant); verifyInstructorCanSeeQuestionIfInModeration(feedbackQuestion); verifyNotPreview(); diff --git a/src/main/java/teammates/ui/webapi/DeleteFeedbackResponseCommentAction.java b/src/main/java/teammates/ui/webapi/DeleteFeedbackResponseCommentAction.java index 5ca18c8f252..c70eb9d2291 100644 --- a/src/main/java/teammates/ui/webapi/DeleteFeedbackResponseCommentAction.java +++ b/src/main/java/teammates/ui/webapi/DeleteFeedbackResponseCommentAction.java @@ -110,7 +110,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { checkAccessControlForStudentFeedbackSubmission(student, session); session = session.getCopyForUser(student.getEmail()); - verifySessionOpenExceptForModeration(session); + verifySessionOpenExceptForModeration(session, student); gateKeeper.verifyOwnership(comment, question.getGiverType() == FeedbackParticipantType.TEAMS ? student.getTeamName() : student.getEmail()); @@ -124,7 +124,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { checkAccessControlForInstructorFeedbackSubmission(instructorAsFeedbackParticipant, session); session = session.getCopyForUser(instructorAsFeedbackParticipant.getEmail()); - verifySessionOpenExceptForModeration(session); + verifySessionOpenExceptForModeration(session, instructorAsFeedbackParticipant); gateKeeper.verifyOwnership(comment, instructorAsFeedbackParticipant.getEmail()); break; case INSTRUCTOR_RESULT: diff --git a/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java b/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java index 9604462e50d..f384cb9a8f4 100644 --- a/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java +++ b/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java @@ -88,20 +88,20 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { gateKeeper.verifyAnswerableForStudent(feedbackQuestion); Student student = getSqlStudentOfCourseFromRequest(feedbackQuestion.getCourseId()); if (student == null) { - throw new EntityNotFoundException("Student does not exist."); + throw new UnauthorizedAccessException("Trying to access system using a non-existent student entity"); } feedbackSession = feedbackSession.getCopyForUser(student.getEmail()); - verifySessionOpenExceptForModeration(feedbackSession); + verifySessionOpenExceptForModeration(feedbackSession, student); checkAccessControlForStudentFeedbackSubmission(student, feedbackSession); break; case INSTRUCTOR_SUBMISSION: gateKeeper.verifyAnswerableForInstructor(feedbackQuestion); Instructor instructor = getSqlInstructorOfCourseFromRequest(feedbackQuestion.getCourseId()); if (instructor == null) { - throw new EntityNotFoundException("Instructor does not exist."); + throw new UnauthorizedAccessException("Trying to access system using a non-existent instructor entity"); } feedbackSession = feedbackSession.getCopyForUser(instructor.getEmail()); - verifySessionOpenExceptForModeration(feedbackSession); + verifySessionOpenExceptForModeration(feedbackSession, instructor); checkAccessControlForInstructorFeedbackSubmission(instructor, feedbackSession); break; case INSTRUCTOR_RESULT: diff --git a/src/main/java/teammates/ui/webapi/UpdateFeedbackResponseCommentAction.java b/src/main/java/teammates/ui/webapi/UpdateFeedbackResponseCommentAction.java index ac11fb65571..a5f5ba14143 100644 --- a/src/main/java/teammates/ui/webapi/UpdateFeedbackResponseCommentAction.java +++ b/src/main/java/teammates/ui/webapi/UpdateFeedbackResponseCommentAction.java @@ -128,7 +128,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { session = session.getCopyForUser(student.getEmail()); gateKeeper.verifyAnswerableForStudent(question); - verifySessionOpenExceptForModeration(session); + verifySessionOpenExceptForModeration(session, student); verifyInstructorCanSeeQuestionIfInModeration(question); verifyNotPreview(); @@ -145,7 +145,7 @@ void checkSpecificAccessControl() throws UnauthorizedAccessException { session = session.getCopyForUser(instructorAsFeedbackParticipant.getEmail()); gateKeeper.verifyAnswerableForInstructor(question); - verifySessionOpenExceptForModeration(session); + verifySessionOpenExceptForModeration(session, instructorAsFeedbackParticipant); verifyInstructorCanSeeQuestionIfInModeration(question); verifyNotPreview(); diff --git a/src/test/java/teammates/ui/webapi/SubmitFeedbackResponsesActionTest.java b/src/test/java/teammates/ui/webapi/SubmitFeedbackResponsesActionTest.java index 4725d0f0ff0..0254a69a884 100644 --- a/src/test/java/teammates/ui/webapi/SubmitFeedbackResponsesActionTest.java +++ b/src/test/java/teammates/ui/webapi/SubmitFeedbackResponsesActionTest.java @@ -418,7 +418,7 @@ public void testAccessControl_submissionIsNotOpen_shouldFail() throws Exception setStudentDeadline(session, student, 30); int questionNumber = 2; - String[] submissionParams = buildSubmissionParams(session, questionNumber, Intent.INSTRUCTOR_SUBMISSION); + String[] submissionParams = buildSubmissionParams(session, questionNumber, Intent.STUDENT_SUBMISSION); verifyCannotAccess(submissionParams); } @@ -542,7 +542,7 @@ public void testAccessControl_studentSubmissionLoggedInAsAdmin_shouldFail() thro } @Test - public void testAccessControl_studentSubmissionLoggedInAsAdminMasqueradeAsStudent_shouldFail() throws Exception { + public void testAccessControl_studentSubmissionLoggedInAsAdminMasqueradeAsStudent_shouldAllow() throws Exception { FeedbackSessionAttributes session = getSession("gracePeriodSession"); StudentAttributes student = getStudent("student1InCourse1"); setEndTime(session, 1); From 1ea04f409706451501fbe869c6ea1164bd065f02 Mon Sep 17 00:00:00 2001 From: emrekenar <76282148+emrekenar@users.noreply.github.com> Date: Sun, 12 May 2024 02:35:19 +0200 Subject: [PATCH 92/95] [#12900] Gradle task componentTests should not stop entirely when only one task fails (#12963) --- .github/workflows/component.yml | 2 +- .github/workflows/jdk17.yml | 2 +- .github/workflows/jdk21.yml | 2 +- docs/development.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml index 77a246454d5..4cb3261a8ab 100644 --- a/.github/workflows/component.yml +++ b/.github/workflows/component.yml @@ -93,7 +93,7 @@ jobs: run: docker-compose run -d -p 8983:8983 solr - name: Run Backend Tests run: | - ./gradlew createConfigs componentTests + ./gradlew createConfigs componentTests --continue ./gradlew jacocoReport - name: Generate Types run: ./gradlew generateTypes diff --git a/.github/workflows/jdk17.yml b/.github/workflows/jdk17.yml index 7b50447b7aa..2b6fc3b987f 100644 --- a/.github/workflows/jdk17.yml +++ b/.github/workflows/jdk17.yml @@ -31,4 +31,4 @@ jobs: - name: Run Solr search service run: docker-compose run -d -p 8983:8983 solr - name: Run Backend Tests - run: ./gradlew createConfigs componentTests + run: ./gradlew createConfigs componentTests --continue diff --git a/.github/workflows/jdk21.yml b/.github/workflows/jdk21.yml index cb551fc44fa..6b4eecd021e 100644 --- a/.github/workflows/jdk21.yml +++ b/.github/workflows/jdk21.yml @@ -31,4 +31,4 @@ jobs: - name: Run Solr search service run: docker-compose run -d -p 8983:8983 solr - name: Run Backend Tests - run: ./gradlew createConfigs componentTests + run: ./gradlew createConfigs componentTests --continue diff --git a/docs/development.md b/docs/development.md index aec8c3696ca..864934222a3 100644 --- a/docs/development.md +++ b/docs/development.md @@ -326,7 +326,7 @@ Back-end component tests follow this configuration: Test suite | Command | Results can be viewed in ---|---|--- -`Component tests` | `./gradlew componentTests` | `{project folder}/build/reports/tests/componentTests/index.html` +`Component tests` | `./gradlew componentTests --continue` | `{project folder}/build/reports/tests/componentTests/index.html` Any individual component test | `./gradlew componentTests --tests TestClassName` | `{project folder}/build/reports/tests/componentTests/index.html` You can generate the coverage data with `jacocoReport` task after running tests, e.g.: From 06bfafdc33bcff2cebaf0907508aacfde0501b8d Mon Sep 17 00:00:00 2001 From: FergusMok Date: Mon, 13 May 2024 02:23:09 +0800 Subject: [PATCH 93/95] [#12048] Remove null default section (#13040) * Add changes * Add missing --------- Co-authored-by: Nicolas <25302138+NicolasCwy@users.noreply.github.com> Co-authored-by: Wilson Kurniawan --- src/main/java/teammates/common/util/Const.java | 3 --- src/main/java/teammates/sqllogic/api/Logic.java | 9 +++++++++ .../ui/webapi/BasicFeedbackSubmissionAction.java | 12 ++++++------ .../ui/webapi/SubmitFeedbackResponsesAction.java | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/teammates/common/util/Const.java b/src/main/java/teammates/common/util/Const.java index dc9659f867b..fa5baa89552 100644 --- a/src/main/java/teammates/common/util/Const.java +++ b/src/main/java/teammates/common/util/Const.java @@ -5,8 +5,6 @@ import java.time.Duration; import java.time.Instant; -import teammates.storage.sqlentity.Section; - /** * Stores constants that are widely used across classes. * this class contains several nested classes, each containing a specific @@ -27,7 +25,6 @@ public final class Const { public static final int SECTION_SIZE_LIMIT = 100; public static final String DEFAULT_SECTION = "None"; - public static final Section DEFAULT_SQL_SECTION = null; public static final String UNKNOWN_INSTITUTION = "Unknown Institution"; diff --git a/src/main/java/teammates/sqllogic/api/Logic.java b/src/main/java/teammates/sqllogic/api/Logic.java index eb2698cd9d7..b5181018563 100644 --- a/src/main/java/teammates/sqllogic/api/Logic.java +++ b/src/main/java/teammates/sqllogic/api/Logic.java @@ -22,6 +22,7 @@ import teammates.common.exception.InvalidParametersException; import teammates.common.exception.SearchServiceException; import teammates.common.exception.StudentUpdateException; +import teammates.common.util.Const; import teammates.sqllogic.core.AccountRequestsLogic; import teammates.sqllogic.core.AccountsLogic; import teammates.sqllogic.core.CoursesLogic; @@ -1089,6 +1090,14 @@ public List getStudentsByTeamName(String teamName, String courseId) { return usersLogic.getStudentsForTeam(teamName, courseId); } + /** + * Returns the default SQL section. + * If it does not exist, create and return it. + */ + public Section getDefaultSectionOrCreate(String courseId) { + return getSectionOrCreate(courseId, Const.DEFAULT_SECTION); + } + /** * Gets a team by associated {@code courseId} and {@code sectionName}. */ diff --git a/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java b/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java index f6997f58d54..b4844b55feb 100644 --- a/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java +++ b/src/main/java/teammates/ui/webapi/BasicFeedbackSubmissionAction.java @@ -434,35 +434,35 @@ Section getRecipientSection( switch (giverType) { case INSTRUCTORS: case SELF: - return Const.DEFAULT_SQL_SECTION; + return sqlLogic.getDefaultSectionOrCreate(courseId); case TEAMS: case TEAMS_IN_SAME_SECTION: Section section = sqlLogic.getSectionByCourseIdAndTeam(courseId, recipientIdentifier); - return section == null ? Const.DEFAULT_SQL_SECTION : section; + return section == null ? sqlLogic.getDefaultSectionOrCreate(courseId) : section; case STUDENTS: case STUDENTS_IN_SAME_SECTION: Student student = sqlLogic.getStudentForEmail(courseId, recipientIdentifier); - return student == null ? Const.DEFAULT_SQL_SECTION : student.getSection(); + return student == null ? sqlLogic.getDefaultSectionOrCreate(courseId) : student.getSection(); default: assert false : "Invalid giver type " + giverType + " for recipient type " + recipientType; return null; } case INSTRUCTORS: case NONE: - return Const.DEFAULT_SQL_SECTION; + return sqlLogic.getDefaultSectionOrCreate(courseId); case TEAMS: case TEAMS_EXCLUDING_SELF: case TEAMS_IN_SAME_SECTION: case OWN_TEAM: Section section = sqlLogic.getSectionByCourseIdAndTeam(courseId, recipientIdentifier); - return section == null ? Const.DEFAULT_SQL_SECTION : section; + return section == null ? sqlLogic.getDefaultSectionOrCreate(courseId) : section; case STUDENTS: case STUDENTS_EXCLUDING_SELF: case STUDENTS_IN_SAME_SECTION: case OWN_TEAM_MEMBERS: case OWN_TEAM_MEMBERS_INCLUDING_SELF: Student student = sqlLogic.getStudentForEmail(courseId, recipientIdentifier); - return student == null ? Const.DEFAULT_SQL_SECTION : student.getSection(); + return student == null ? sqlLogic.getDefaultSectionOrCreate(courseId) : student.getSection(); default: assert false : "Unknown recipient type " + recipientType; return null; diff --git a/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java b/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java index f384cb9a8f4..897f39d9d88 100644 --- a/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java +++ b/src/main/java/teammates/ui/webapi/SubmitFeedbackResponsesAction.java @@ -205,7 +205,7 @@ public JsonResult execute() throws InvalidHttpRequestBodyException, InvalidOpera case INSTRUCTOR_SUBMISSION: Instructor instructor = getSqlInstructorOfCourseFromRequest(feedbackQuestion.getCourseId()); giverIdentifier = instructor.getEmail(); - giverSection = Const.DEFAULT_SQL_SECTION; + giverSection = sqlLogic.getDefaultSectionOrCreate(courseId); existingResponses = sqlLogic.getFeedbackResponsesFromInstructorForQuestion(feedbackQuestion, instructor); recipientsOfTheQuestion = sqlLogic.getRecipientsOfQuestion(feedbackQuestion, instructor, null); sqlLogic.populateFieldsToGenerateInQuestion(feedbackQuestion, From 7b75dad1a685a73ab03c0254439027952bb28ab1 Mon Sep 17 00:00:00 2001 From: DS Date: Wed, 12 Jun 2024 00:08:07 +0800 Subject: [PATCH 94/95] [#13126] Fix failing component test cases (#13127) * Fix failing test cases * Update test logs with unique sorting order * Revert AccountRequestDbIT --- .../webapi/UpdateAccountRequestActionIT.java | 2 + .../UpdateFeedbackSessionLogsActionIT.java | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java index f5932deaf99..7687f80813f 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateAccountRequestActionIT.java @@ -257,6 +257,8 @@ protected void tearDown() { for (AccountRequest ar : accountRequests) { logic.deleteAccountRequest(ar.getId()); } + + logic.deleteAccount(getTypicalAccount().getGoogleId()); HibernateUtil.commitTransaction(); } } diff --git a/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java index b6f2a8b1f47..8c5a0c6f21d 100644 --- a/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java +++ b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackSessionLogsActionIT.java @@ -82,47 +82,52 @@ String getRequestMethod() { @Override protected void testExecute() { ______TS("No spam all logs added"); + + // Gap is larger than spam filter + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); + mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), + session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), + startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + // Different Types + long padding = 3 * SPAM_FILTER; mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(100).toEpochMilli()); + startTime.plusMillis(padding).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.SUBMISSION.getLabel(), - startTime.plusSeconds(100).toEpochMilli()); + startTime.plusMillis(padding + 1).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.VIEW_RESULT.getLabel(), - startTime.plusSeconds(100).toEpochMilli()); + startTime.plusMillis(padding + 2).toEpochMilli()); // Different feedback sessions + padding = 5 * SPAM_FILTER; mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(200).toEpochMilli()); + startTime.plusMillis(padding).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session2InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(200).toEpochMilli()); + startTime.plusMillis(padding + 1).toEpochMilli()); // Different Student + padding = 7 * SPAM_FILTER; mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + startTime.plusMillis(padding).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student2InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(300).toEpochMilli()); + startTime.plusMillis(padding + 1).toEpochMilli()); // Different course + padding = 9 * SPAM_FILTER; mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(400).toEpochMilli()); + startTime.plusMillis(padding).toEpochMilli()); mockLogsProcessor.insertFeedbackSessionLog(course3.getId(), student1InCourse3.getId(), session1InCourse3.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusSeconds(400).toEpochMilli()); - - // Gap is larger than spam filter - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), startTime.toEpochMilli()); - mockLogsProcessor.insertFeedbackSessionLog(course1.getId(), student1InCourse1.getId(), - session1InCourse1.getId(), FeedbackSessionLogType.ACCESS.getLabel(), - startTime.plusMillis(SPAM_FILTER + 1).toEpochMilli()); + startTime.plusMillis(padding + 1).toEpochMilli()); UpdateFeedbackSessionLogsAction action = getAction(); getJsonResult(action); From 5ed1cf78b8296a019d913cc2bf447f8bcb949ee9 Mon Sep 17 00:00:00 2001 From: Wilson Kurniawan Date: Wed, 12 Jun 2024 00:46:19 +0800 Subject: [PATCH 95/95] [#13126] Update timezone db (#13128) --- package-lock.json | 8 ++++---- package.json | 2 +- src/main/resources/tzdb.dat | Bin 103785 -> 104163 bytes src/web/data/timezone.json | 34 +++++++++++++++++----------------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd4404372a1..6267ea605d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "firebase": "^10.7.2", "handsontable": "^14.1.0", "intersection-observer": "^0.12.2", - "moment-timezone": "^0.5.43", + "moment-timezone": "^0.5.45", "ng-dynamic-component": "^10.7.0", "ng-in-viewport": "^16.1.0", "ngx-captcha": "^13.0.0", @@ -16487,9 +16487,9 @@ } }, "node_modules/moment-timezone": { - "version": "0.5.43", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", - "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", + "version": "0.5.45", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz", + "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==", "dependencies": { "moment": "^2.29.4" }, diff --git a/package.json b/package.json index 44d1ed81d8c..cbb8c5b3689 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "firebase": "^10.7.2", "handsontable": "^14.1.0", "intersection-observer": "^0.12.2", - "moment-timezone": "^0.5.43", + "moment-timezone": "^0.5.45", "ng-dynamic-component": "^10.7.0", "ng-in-viewport": "^16.1.0", "ngx-captcha": "^13.0.0", diff --git a/src/main/resources/tzdb.dat b/src/main/resources/tzdb.dat index 58af8972e7836ac1c3d0d58cd2ab441c9de83b8d..05c8317386aef05ff84548d5d6268ee7ffd3fb93 100644 GIT binary patch delta 2695 zcmeHIYgm(45}x-+xQU1b6)8m)4Cm_0n1|wTNx4jY`$l`xUKNgY00}KF{v6fA-)0*nH3XojEh} z&dhga&XddAz0dFP4gz^iFU&|MkR&M~X~^7NLCd0`cDxj|ae@fk?~pAvMu(s6IUq0m zmZ81+T-VE*?i7jB?PLF*z z8goMPtP6@>zhG!@zq+8+)5<25CBmt(*cZPMtdDV=sxP`*N}Hqzajb3nqIPEAv@rp>MGV%PRp zXjN+M3aQp&)b4O(HxtK3YL zTiuoC>{TK9D!H;MQB_qetFk()w#%wMc2~97t0QdH2~?fosn*M?-_}<5SeSsx&9*&FM<>vmUeEW&Y4We z6}FmPu9^mSO{225leBiEvNpq6n=h-awbdR_*B-Lfo>DuyULOOCGRDi2d&4hW68JAo z3+rgw#g3*8cPzc}|EB%VG_A{>w0}0OB^q*zwj~~NM_tPSKTAgAK*z#1TY%567unYu z;E!G*zh2YSEkS&DJHR(H!8+U@7T+fpi|k|wBci_DA8S?^8W2jKAdC@CF7%>zAf-d=QQkkLN$Wkk|`^rHii(`V>UI}t^nBbp9k0DXahbO~v69JwA=HSWbR5H|3BwJv4Jn*#1f9T0`WmV94HWb(M$t)(rrj7r z-$BVpqf%+FVO?6B5zdEFQ}r2sAibR12eUuh904o+VMy3_{#uRLtqU$ zVJ*C{4idZqZ&=`iSDCXOzSsaiSmBS?&>62I0B@iRHX;x zLhu&4<83ByVbn3+Vf>k~m9Y&yupK?|E<*7h!mtD3*oj{F3m@kDkYX3x|B47W&>J71 z4?ctpe`8xcf5=DZi;vlVHzM(OUY%5rJ-jxcA3lK`1{eC{Qx^6j3i~+del{N9fS(~6 zpJMr@6p07=p8q8_>)Z|G=bk7>e^4h6@;uACZEen0S#3yTta(T+|iDRX&Yt zjO&aW^Z{=2^xPugHb&qMk75gt;9cI|!$|zh_vAjWtw_ZK*8Rf!hdkOI9_=>D$0Hu= zb{G_bC`f?r34u|f6Dfrk%@Y!OPI%K=;e*k_mr{ivZ4>?&BRWGV0$AS#X(EtqUFl^J zME6BEq>HC8RsLr0f@g9MKz-L>~hbLdMR0 zkt-rGS@gpcA;(nFAJaq>@LW!qE8nuaZNW@sEL?6Vj?{hSrj6&DOlvtFfoaeL@uR^$+SpJ;jfxXxndeAL>`~kbeb(@ paA7lo6Jhk6uBs_y_(hh;RS^ delta 2482 zcmeHH`(M;$7Cz6*UC=O4xePko1#jF$1e5_$5K%EuE{!?6?xveru3QFic4xE&W|%F} zQODIurp!`TUD+{7cQml5yjDP7YBb8s8wv=S+6WzN_p_h=g8gOZ`*}X^d7pEh^S<*v z=X|g3cfPsT*%RcLSCpPcAg7q9nAoKao~y&K#PUkm_DrD&u}ELmg!>&%*q!UwtsWRS zUC`Y}L=y)Fe;b NiM+;u)8^w>$OWp|sdlY3t(B+UhKwuX~LiO&@||#go|Wnrxq3 z<8t-D!0qJ^>`aFm0*NlMXCI^0w` zM^UP@msUwjP1e%3j?%}rGIuHqO)irw%GOHC>N?8yTg$F%l+Jdgw^SLQtXxIP+GOQ6 zQXaP|A85)wCFKFK^4YfXoV8TG*NMI|b^E<|=o2 zm5-+CHB;3NMYXr8I?!AlEw5f7tu|V#-_cYbu~qk)YXVF)6BIS+_8OJ6W~Zv=pt6c72m}pGkY9Nqa@5^O5OdRJs(i?s>b;+@yQgs%z2cx>U6hvf3n5 zZDvz#rKz@|srI<7_MER-?;z19%Jk`0eV#_IH|bjx`co$Tg(geJ-4q0i=}}wP9f;bh zb?pCDrF;h~b$zf>v6lT^|F6{lv{DOuQ(@TF7Y?bRr_bAPzRwR*OHW^mo28?FyGP6~ zL+bMHA=SzgR_5ehcFhaSEa=%(xa6WD{ty>4=`BwlR|e1HBx8d+41*KPtYN_=FQdW( z{*5XR)U8!-h7TQwFT;=Chd;dy2{j>rnlYMoVGJ1{r4tBb1kncw=5JC6wIGxZ@Ymua zgww|uOP?TuP9l;{VH~}I@pKv!=nN)OJtomvMA11!)2E2xT(M+99DRn#^f}_G6;sr- z2MK)GRBA&awIhkXKr)@jG`fK4bQCFc5i&+9T|ydti5Yx>bovT28MA0JGRTHZK6Ex+ zMiyPc96l(UzQ$bYz&!c}^XXgU&{Zs;@9+#=LoOqawqPNBk44<>%kt?u3fL&58z`ci zc$RKKPPeg`I`JIum(U$3=q`RkUHC2AOQ{>bqaOU8*XQXTmT}B-_Wyx;@dE2su>M8n zR&wl1?0=d0Rn%$x<9c{G^`VS@FzVJLTzwyFDI4qPN4&xX{R=sxiXNhx9-)SzrJtZ9 zJ8J1M^wf{P(g0os;WYs3Ay5YgY=9#+!U+aAV-ssO!v$O53M1UG6+`ehxMLeUupL8T z!Z5s!r?3N_sK;=a)p#0jzzc7}8#`J27GoFVZN@u{-HbgLfxQ@szhe~k!3X={iv#e( zKluF}gg+YC|4&F@K>!Y6G~UG+9A;l5|B?3~#SxA_ia`8}S1UE*7_Y|>g!d5)brV9+ z%*F|X;sZ|lAv;?*;YSF=#|XzKEIf&^IE4tDMkLN~x1HtW=Xn1q$A88b_#ETVit%W} z1hn(|1@q@I5f?BC7umjqD16D9uMiCzVsM!+cm=We8o_FG@QuG=(YJ`hRZPZrh{rWd z!S^h@&KJAE{+oQMTa4TMHaZ!17?|rhN2sCl5fKB#1l(s80wa3kQ-3M_MYJXqj-PI^lw8!j+PQ8|@K8 zFkQGKMR+hj6f!Z4eNWM=!jtZc;YbxvBTaZ=hVVwZ7=f8$BxZ?G$Phlr6uy`({E#L5 z84`{Qz#K6e*igY-MnUITFa26R@EHbH4%%(>oi@e1g@)Fq;FXmE=m`7=1KCKiv q$TIe9gx9EfViAYsGYSwX3h|sMqDR!*=x@McINZdnM&%~FD1HVZ9ZahL diff --git a/src/web/data/timezone.json b/src/web/data/timezone.json index c0b07f51885..c33ebc789d9 100644 --- a/src/web/data/timezone.json +++ b/src/web/data/timezone.json @@ -1,5 +1,5 @@ { - "version": "2023c", + "version": "2024a", "zones": [ "Africa/Abidjan|LMT GMT|g.8 0|01|-2ldXH.Q|48e5", "Africa/Nairobi|LMT +0230 EAT +0245|-2r.g -2u -30 -2J|012132|-2ua2r.g N6nV.g 3Fbu h1cu dzbJ|47e5", @@ -53,7 +53,7 @@ "America/Cayenne|LMT -04 -03|3t.k 40 30|012|-2mrwu.E 2gWou.E|58e3", "America/Chicago|LMT CST CDT EST CWT CPT|5O.A 60 50 50 50 50|012121212121212121212121212121212121213121212121214512121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-3tFG0 1nEe0 1nX0 11B0 1nX0 1wp0 TX0 WN0 1qL0 1cN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 11B0 1Hz0 14p0 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 RB0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|92e5", "America/Chihuahua|LMT MST CST MDT CDT|74.k 70 60 60 50|0121312424231313131313131313131313131313131313131313131313132|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|81e4", - "America/Ciudad_Juarez|LMT MST CST MDT CDT|75.U 70 60 60 50|0121312424231313131313131313131313131313131313131313131313132131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 cm0 EP0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0|", + "America/Ciudad_Juarez|LMT MST CST MDT CDT|75.U 70 60 60 50|01213124242313131313131313131313131313131313131313131313131321313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 cm0 EP0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Costa_Rica|LMT SJMT CST CDT|5A.d 5A.d 60 50|01232323232|-3eLun.L 1fyo0 2lu0n.L Db0 1Kp0 Db0 pRB0 15b0 1kp0 mL0|12e5", "America/Phoenix|LMT MST MDT MWT|7s.i 70 60 60|012121313121|-3tFF0 1nEe0 1nX0 11B0 1nX0 SgN0 4Al1 Ap0 1db0 SWqX 1cL0|42e5", "America/Cuiaba|LMT -04 -03|3I.k 40 30|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2glwf.E HdLf.E 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 4a10 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1HB0 FX0|54e4", @@ -81,10 +81,10 @@ "America/Hermosillo|LMT MST CST MDT PST|7n.Q 70 60 60 80|0121312141313131|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0|64e4", "America/Indiana/Knox|LMT CST CDT CWT CPT EST|5K.u 60 50 50 50 50|01212134121212121212121212121212121212151212121212121212121212121212121212121212121212121252121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 11z0 1o10 11z0 1o10 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 3Cn0 8wp0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 z8o0 1o00 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Indiana/Marengo|LMT CST CDT CWT CPT EST EDT|5J.n 60 50 50 50 50 40|01212134121212121212121215656565656525656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 dyN0 11z0 6fd0 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 jrz0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1VA0 LA0 1BX0 1e6p0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", - "America/Indiana/Petersburg|LMT CST CDT CWT CPT EST EDT|5N.7 60 50 50 50 50 40|01212134121212121212121212121512121212121212121212125212565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 njX0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 3Fb0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 19co0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", + "America/Indiana/Petersburg|LMT CST CDT CWT CPT EST EDT|5N.7 60 50 50 50 50 40|012121341212121212121212121215121212121212121212121252125656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 njX0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 3Fb0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 19co0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Indiana/Tell_City|LMT CST CDT CWT CPT EST EDT|5L.3 60 50 50 50 50 40|012121341212121212121212121512165652121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 njX0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 8wn0 1cN0 1cL0 1cN0 1cK0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Indiana/Vevay|LMT CST CDT CWT CPT EST EDT|5E.g 60 50 50 50 50 40|0121213415656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 kPB0 Awn0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1lnd0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", - "America/Indiana/Vincennes|LMT CST CDT CWT CPT EST EDT|5O.7 60 50 50 50 50 40|01212134121212121212121212121212156565212565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 g0p0 11z0 1o10 11z0 1qL0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 caL0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", + "America/Indiana/Vincennes|LMT CST CDT CWT CPT EST EDT|5O.7 60 50 50 50 50 40|012121341212121212121212121212121565652125656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 g0p0 11z0 1o10 11z0 1qL0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 caL0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Indiana/Winamac|LMT CST CDT CWT CPT EST EDT|5K.p 60 50 50 50 50 40|012121341212121212121212121212121212121565652165656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFG0 1nEe0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 jrz0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1za0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Inuvik|-00 PST PDT MDT MST|0 80 70 60 70|01212121212121213434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434|-FnA0 L3K0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cK0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|35e2", "America/Iqaluit|-00 EWT EPT EST EDT CST CDT|0 40 40 50 40 60 50|0123434343434343434343434343434343434343434343434343434343456343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-16K00 7nX0 iv0 14HB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11C0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|67e2", @@ -105,15 +105,15 @@ "America/Merida|LMT CST EST CDT|5W.s 60 50 50|0121313131313131313131313131313131313131313131313131313131|-1UQG0 2q2o0 2hz0 wu30 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|11e5", "America/Metlakatla|LMT LMT PST PWT PPT PDT AKST AKDT|-fd.G 8K.i 80 70 70 70 90 80|0123425252525252525252525252525252526767672676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-48Pzs.L 1jVwf.5 1EX1d.G 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1hU10 Rd0 1zb0 Op0 1zb0 Op0 1zb0 uM0 jB0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|14e2", "America/Mexico_City|LMT MST CST MDT CDT CWT|6A.A 70 60 60 50 50|012131242425242424242424242424242424242424242424242424242424242424242|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 gEn0 TX0 3xd0 Jb0 6zB0 SL0 e5d0 17b0 1Pff0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|20e6", - "America/Miquelon|LMT AST -03 -02|3I.E 40 30 20|012323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2mKkf.k 2LTAf.k gQ10 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|61e2", + "America/Miquelon|LMT AST -03 -02|3I.E 40 30 20|012323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2mxUf.k 2LHcf.k gQ10 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|61e2", "America/Moncton|LMT EST AST ADT AWT APT|4j.8 50 40 30 30 30|0123232323232323232323245232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-3txvE.Q J4ME.Q CwN0 1in0 zAo0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1K10 Lz0 1zB0 NX0 1u10 Wn0 S20 8x50 iu0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 3Cp0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14n1 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 ReX 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|64e3", "America/Monterrey|LMT CST CDT|6F.g 60 50|0121212121212121212121212121212121212121212121212121212121|-1UQG0 2FjC0 1nX0 i6p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0|41e5", "America/Montevideo|LMT MMT -04 -03 -0330 -0230 -02 -0130|3I.P 3I.P 40 30 3u 2u 20 1u|012343434343434343434343435353636353636375363636363636363636363636363636363636363636363|-2tRUf.9 sVc0 8jcf.9 1db0 1dcu 1cLu 1dcu 1cLu ircu 11zu 1o0u 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 1qMu WLu 1fAu 1cLu 1o0u 11zu NAu 3jXu zXu Dq0u 19Xu pcu jz0 cm10 19X0 6tB0 1fbu 3o0u jX0 4vB0 xz0 3Cp0 mmu 1a10 IMu Db0 4c10 uL0 1Nd0 An0 1SN0 uL0 mp0 28L0 iPB0 un0 1SN0 xz0 1zd0 Lz0 1zd0 Rb0 1zd0 On0 1wp0 Rb0 s8p0 1fB0 1ip0 11z0 1ld0 14n0 1o10 11z0 1o10 11z0 1o10 14n0 1ld0 14n0 1ld0 14n0 1o10 11z0 1o10 11z0 1o10 11z0|17e5", - "America/Toronto|LMT EST EDT EWT EPT|5h.w 50 40 40 40|012121212121212121212121212121212121212121212123412121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-32B6G.s UFdG.s 1in0 11Wu 1nzu 1fD0 WJ0 1wr0 Nb0 1Ap0 On0 1zd0 On0 1wp0 TX0 1tB0 TX0 1tB0 TX0 1tB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 4kM0 8x40 iv0 1o10 11z0 1nX0 11z0 1o10 11z0 1o10 1qL0 11D0 1nX0 11B0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|65e5", + "America/Toronto|LMT EST EDT EWT EPT|5h.w 50 40 40 40|012121212121212121212121212121212121212121212123412121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-32B6G.s UFdG.s 1in0 11Wu 1nzu 1fD0 WJ0 1wr0 Nb0 1Ap0 On0 1zd0 On0 1wp0 TX0 1tB0 TX0 1tB0 TX0 1tB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 4kM0 8x40 iv0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1qL0 11B0 1nX0 11B0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|65e5", "America/New_York|LMT EST EDT EWT EPT|4U.2 50 40 40 40|012121212121212121212121212121212121212121212121213412121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-3tFH0 1nEe0 1nX0 11B0 1nX0 11B0 1qL0 1a10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 RB0 8x40 iv0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|21e6", "America/Nome|LMT LMT NST NWT NPT BST BDT YST AKST AKDT|-cW.m b1.C b0 a0 a0 b0 a0 90 90 80|01234256565656565656565656565656565678989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898989898|-48Pzs.L 1jVyu.p 1EX1W.m 8wW0 iB0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cl0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|38e2", "America/Noronha|LMT -02 -01|29.E 20 10|0121212121212121212121212121212121212121|-2glxO.k HdKO.k 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 2L0 2pB0 On0|30e2", - "America/North_Dakota/Beulah|LMT MST MDT MWT MPT CST CDT|6L.7 70 60 60 60 60 50|012121341212121212121212121212121212121212121212121212121212121212121212121212121212121212121212565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFF0 1nEe0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0|", + "America/North_Dakota/Beulah|LMT MST MDT MWT MPT CST CDT|6L.7 70 60 60 60 60 50|0121213412121212121212121212121212121212121212121212121212121212121212121212121212121212121212125656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFF0 1nEe0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/North_Dakota/Center|LMT MST MDT MWT MPT CST CDT|6J.c 70 60 60 60 60 50|0121213412121212121212121212121212121212121212121212121212125656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFF0 1nEe0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14o0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/North_Dakota/New_Salem|LMT MST MDT MWT MPT CST CDT|6J.D 70 60 60 60 60 50|0121213412121212121212121212121212121212121212121212121212121212121212121212121212565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-3tFF0 1nEe0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14o0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|", "America/Ojinaga|LMT MST CST MDT CDT|6V.E 70 60 60 50|0121312424231313131313131313131313131313131313131313131313132424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1wn0 Rc0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e3", @@ -131,7 +131,7 @@ "America/Santiago|LMT SMT -05 -04 -03|4G.J 4G.J 50 40 30|0121313232323232323432343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434|-3eLvh.f MJc0 fJAh.f 5knG.J 1Vzh.f jRAG.J 1pbh.f 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 nHX0 op0 9Bz0 hX0 1q10 ko0 Qeo0 WL0 1zd0 On0 1ip0 11z0 1o10 11z0 1qN0 WL0 1ld0 14n0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 46n0 Ap0 1Nb0 Ap0 1Nb0 Ap0 1zb0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0|62e5", "America/Santo_Domingo|LMT SDMT EST EDT -0430 AST|4D.A 4E 50 40 4u 40|012324242424242525|-3eLvk.o 1Jic0.o 1lJMk Mn0 6sp0 Lbu 1Cou yLu 1RAu wLu 1QMu xzu 1Q0u xXu 1PAu 13jB0 e00|29e5", "America/Sao_Paulo|LMT -03 -02|36.s 30 20|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2glwR.w HdKR.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 pTd0 PX0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 1C10 Lz0 1Ip0 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1HB0 FX0|20e6", - "America/Scoresbysund|LMT -02 -01 +00|1r.Q 20 10 0|0121323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2a5Ww.8 2z5ew.8 1a00 1cK0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00|452", + "America/Scoresbysund|LMT -02 -01 +00|1r.Q 20 10 0|012132323232323232323232323232323232323232323232323232323232323232323232323232323232323232121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a5Ww.8 2z5ew.8 1a00 1cK0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 2pA0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00|452", "America/Sitka|LMT LMT PST PWT PPT PDT YST AKST AKDT|-eW.L 91.d 80 70 70 70 90 90 80|0123425252525252525252525252525252567878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787|-48Pzs.L 1jVwu 1EX0W.L 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 co0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|90e2", "America/St_Johns|LMT NST NDT NST NDT NWT NPT NDDT|3u.Q 3u.Q 2u.Q 3u 2u 2u 2u 1u|012121212121212121212121212121212121213434343434343435634343434343434343434343434343434343434343434343434343434343434343434343434343434343437343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-3tokt.8 1l020 14L0 1nB0 1in0 1gm0 Dz0 1JB0 1cL0 1cN0 1cL0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 1cL0 1cN0 1cL0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 1cL0 1fB0 19X0 1fB0 19X0 10O0 eKX.8 19X0 1iq0 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 WL0 1qN0 WL0 1qN0 7UHu itu 1tB0 WL0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1tB0 WL0 1ld0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14n1 1lb0 14p0 1nW0 11C0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zcX Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|11e4", "America/Swift_Current|LMT MST MDT MWT MPT CST|7b.k 70 60 60 60 60|012134121212121212121215|-2AD4M.E uHdM.E 1in0 UGp0 8x20 ix0 1o10 17b0 1ip0 11z0 1o10 11z0 1o10 11z0 isN0 1cL0 3Cp0 1cL0 1cN0 11z0 1qN0 WL0 pMp0|16e3", @@ -140,7 +140,7 @@ "America/Vancouver|LMT PST PDT PWT PPT|8c.s 80 70 70 70|01213412121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-3tofL.w 1nspL.w 1in0 UGp0 8x10 iy0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e5", "America/Whitehorse|LMT YST YDT YWT YPT YDDT PST PDT MST|90.c 90 80 80 80 70 80 70 70|0121213415167676767676767676767676767676767676767676767676767676767676767676767676767676767678|-2MSeX.M GWpX.M 1in0 1o10 13V0 Ser0 8x00 iz0 LCL0 1fA0 LA0 ytd0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1z90|23e3", "America/Yakutat|LMT LMT YST YWT YPT YDT AKST AKDT|-eF.5 9i.T 90 80 80 80 90 80|0123425252525252525252525252525252526767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-48Pzs.L 1jVwL.G 1EX1F.5 8x00 iz0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cn0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|642", - "Antarctica/Casey|-00 +08 +11|0 -80 -b0|0121212121212|-2q00 1DjS0 T90 40P0 KL0 blz0 3m10 1o30 14k0 1kr0 12l0 1o01|10", + "Antarctica/Casey|-00 +08 +11|0 -80 -b0|012121212121212121|-2q00 1DjS0 T90 40P0 KL0 blz0 3m10 1o30 14k0 1kr0 12l0 1o01 14kX 1lf1 14kX 1lf1 13bX|10", "Antarctica/Davis|-00 +07 +05|0 -70 -50|01012121|-vyo0 iXt0 alj0 1D7v0 VB0 3Wn0 KN0|70", "Pacific/Port_Moresby|LMT PMMT +10|-9M.E -9M.w -a0|012|-3D8VM.E AvA0.8|25e4", "Antarctica/Macquarie|-00 AEST AEDT|0 -a0 -b0|0121012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2OPc0 Fb40 1a00 4SK0 1ayy0 Lvs0 1cM0 1o00 Rc0 1wo0 Rc0 1wo0 U00 1wo0 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 3Co0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0|1", @@ -150,9 +150,9 @@ "Antarctica/Rothera|-00 -03|0 30|01|gOo0|130", "Asia/Riyadh|LMT +03|-36.Q -30|01|-TvD6.Q|57e5", "Antarctica/Troll|-00 +00 +02|0 0 -20|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|1puo0 hd0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00|40", - "Asia/Urumqi|LMT +06|-5O.k -60|01|-1GgtO.k|32e5", + "Antarctica/Vostok|-00 +07 +05|0 -70 -50|01012|-tjA0 1rWh0 1Nj0 1aTv0|25", "Europe/Berlin|LMT CET CEST CEMT|-R.s -10 -20 -30|012121212121212321212321212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-36RcR.s UbWR.s 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 kL0 Nc0 m10 WM0 1ao0 1cp0 dX0 jz0 Dd0 1io0 17c0 1fA0 1a00 1ehA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00|41e5", - "Asia/Almaty|LMT +05 +06 +07|-57.M -50 -60 -70|012323232323232323232321232323232323232323232323232|-1Pc57.M eUo7.M 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0|15e5", + "Asia/Almaty|LMT +05 +06 +07|-57.M -50 -60 -70|0123232323232323232323212323232323232323232323232321|-1Pc57.M eUo7.M 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 L4m0|15e5", "Asia/Amman|LMT EET EEST +03|-2n.I -20 -30 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212123|-1yW2n.I 1HiMn.I KL0 1oN0 11b0 1oN0 11b0 1pd0 1dz0 1cp0 11b0 1op0 11b0 fO10 1db0 1e10 1cL0 1cN0 1cL0 1cN0 1fz0 1pd0 10n0 1ld0 14n0 1hB0 15b0 1ip0 19X0 1cN0 1cL0 1cN0 17b0 1ld0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1So0 y00 1fc0 1dc0 1co0 1dc0 1cM0 1cM0 1cM0 1o00 11A0 1lc0 17c0 1cM0 1cM0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 4bX0 Dd0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 LA0 1C00|25e5", "Asia/Anadyr|LMT +12 +13 +14 +11|-bN.U -c0 -d0 -e0 -b0|01232121212121212121214121212121212121212121212121212121212141|-1PcbN.U eUnN.U 23CL0 1db0 2q10 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 2sp0 WM0|13e3", "Asia/Aqtau|LMT +04 +05 +06|-3l.4 -40 -50 -60|012323232323232323232123232312121212121212121212|-1Pc3l.4 eUnl.4 24PX0 2pX0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0|15e4", @@ -178,9 +178,9 @@ "Asia/Dubai|LMT +04|-3F.c -40|01|-21JfF.c|39e5", "Asia/Dushanbe|LMT +05 +06 +07|-4z.c -50 -60 -70|012323232323232323232321|-1Pc4z.c eUnz.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2hB0|76e4", "Asia/Famagusta|LMT EET EEST +03|-2f.M -20 -30 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212312121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1Vc2f.M 2a3cf.M 1cL0 1qp0 Xz0 19B0 19X0 1fB0 1db0 1cp0 1cL0 1fB0 19X0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1o30 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 15U0 2Ks0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00|", - "Asia/Gaza|LMT EET EEST IST IDT|-2h.Q -20 -30 -20 -30|01212121212121212121212121212121212343434343434343434343434343434312121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2MBCh.Q 1Azeh.Q MM0 iM0 4JA0 10o0 1pA0 10M0 1pA0 16o0 1jA0 16o0 1jA0 pBa0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 bXB0 gM0 8Q00 IM0 1wo0 TX0 1HB0 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 11z0 1o10 14o0 1lA1 SKX 1xd1 MKX 1AN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nA0 1210 1qL0 WN0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 1cN0 1cL0 17d0 1in0 14p0 1lb0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1lb0 14p0 1in0 17d0 1cL0 1cN0 19X0 e10 2L0 WN0 14n0 gN0 5z0 11B0 WL0 e10 bb0 11B0 TX0 e10 dX0 11B0 On0 gN0 gL0 11B0 Lz0 e10 pb0 WN0 IL0 e10 rX0 WN0 Db0 gN0 uL0 11B0 xz0 e10 An0 11B0 rX0 gN0 Db0 11B0 pb0 e10 Lz0 WN0 mn0 e10 On0 WN0 gL0 gN0 Rb0 11B0 bb0 e10 WL0 11B0 5z0 gN0 11z0 11B0 2L0 gN0 14n0 1fB0 1cL0 1a10 1fz0 14p0 1lb0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1nX0 14p0 1in0 17d0 1fz0 1a10 19X0 1fB0 17b0 e10 28L0 e10 25X0 gN0 25X0 e10 gL0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0|18e5", - "Asia/Hebron|LMT EET EEST IST IDT|-2k.n -20 -30 -20 -30|0121212121212121212121212121212121234343434343434343434343434343431212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2MBCk.n 1Azek.n MM0 iM0 4JA0 10o0 1pA0 10M0 1pA0 16o0 1jA0 16o0 1jA0 pBa0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 bXB0 gM0 8Q00 IM0 1wo0 TX0 1HB0 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 12L0 1mN0 14o0 1lc0 Tb0 1xd1 MKX bB0 cn0 1cN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nA0 1210 1qL0 WN0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 1cN0 1cL0 17d0 1in0 14p0 1lb0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1lb0 14p0 1in0 17d0 1cL0 1cN0 19X0 e10 2L0 WN0 14n0 gN0 5z0 11B0 WL0 e10 bb0 11B0 TX0 e10 dX0 11B0 On0 gN0 gL0 11B0 Lz0 e10 pb0 WN0 IL0 e10 rX0 WN0 Db0 gN0 uL0 11B0 xz0 e10 An0 11B0 rX0 gN0 Db0 11B0 pb0 e10 Lz0 WN0 mn0 e10 On0 WN0 gL0 gN0 Rb0 11B0 bb0 e10 WL0 11B0 5z0 gN0 11z0 11B0 2L0 gN0 14n0 1fB0 1cL0 1a10 1fz0 14p0 1lb0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1nX0 14p0 1in0 17d0 1fz0 1a10 19X0 1fB0 17b0 e10 28L0 e10 25X0 gN0 25X0 e10 gL0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0|25e4", - "Asia/Ho_Chi_Minh|LMT PLMT +07 +08 +09|-76.u -76.u -70 -80 -90|0123423232|-2yC76.u bK00 1h7b6.u 5lz0 18o0 3Oq0 k5b0 aW00 BAM0|90e5", + "Asia/Gaza|LMT EET EEST IST IDT|-2h.Q -20 -30 -20 -30|0121212121212121212121212121212121234343434343434343434343434343431212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2MBCh.Q 1Azeh.Q MM0 iM0 4JA0 10o0 1pA0 10M0 1pA0 16o0 1jA0 16o0 1jA0 pBa0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 bXB0 gM0 8Q00 IM0 1wo0 TX0 1HB0 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 11z0 1o10 14o0 1lA1 SKX 1xd1 MKX 1AN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nA0 1210 1qL0 WN0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 1cN0 1cL0 1a10 1fz0 17d0 1in0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1lb0 14p0 1in0 17d0 1cL0 1cN0 19X0 1fB0 14n0 jB0 2L0 11B0 WL0 gN0 8n0 11B0 TX0 gN0 bb0 11B0 On0 jB0 dX0 11B0 Lz0 gN0 mn0 WN0 IL0 gN0 pb0 WN0 Db0 jB0 rX0 11B0 xz0 gN0 xz0 11B0 rX0 jB0 An0 11B0 pb0 gN0 IL0 WN0 mn0 gN0 Lz0 WN0 gL0 jB0 On0 11B0 bb0 gN0 TX0 11B0 5z0 jB0 WL0 11B0 2L0 jB0 11z0 1ip0 19X0 1cN0 1cL0 17d0 1in0 14p0 1lb0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1nX0 14p0 1in0 17d0 1fz0 1a10 19X0 1fB0 17b0 gN0 2L0 WN0 14n0 gN0 5z0 WN0 WL0 jB0 8n0 11B0 Rb0 gN0 dX0 11B0 Lz0 jB0 gL0 11B0 IL0 jB0 mn0 WN0 FX0 gN0 rX0 WN0 An0 jB0 uL0 11B0 uL0 gN0 An0 11B0 rX0 gN0 Db0 11B0 mn0 jB0 FX0 11B0 jz0 gN0 On0 WN0 dX0 jB0 Rb0 WN0 bb0 jB0 TX0 11B0 5z0 gN0 11z0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0|18e5", + "Asia/Hebron|LMT EET EEST IST IDT|-2k.n -20 -30 -20 -30|012121212121212121212121212121212123434343434343434343434343434343121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2MBCk.n 1Azek.n MM0 iM0 4JA0 10o0 1pA0 10M0 1pA0 16o0 1jA0 16o0 1jA0 pBa0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 bXB0 gM0 8Q00 IM0 1wo0 TX0 1HB0 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 12L0 1mN0 14o0 1lc0 Tb0 1xd1 MKX bB0 cn0 1cN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nA0 1210 1qL0 WN0 1qL0 WN0 1qL0 11c0 1on0 11B0 1o00 11A0 1qo0 XA0 1qp0 1cN0 1cL0 1a10 1fz0 17d0 1in0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1lb0 14p0 1in0 17d0 1cL0 1cN0 19X0 1fB0 14n0 jB0 2L0 11B0 WL0 gN0 8n0 11B0 TX0 gN0 bb0 11B0 On0 jB0 dX0 11B0 Lz0 gN0 mn0 WN0 IL0 gN0 pb0 WN0 Db0 jB0 rX0 11B0 xz0 gN0 xz0 11B0 rX0 jB0 An0 11B0 pb0 gN0 IL0 WN0 mn0 gN0 Lz0 WN0 gL0 jB0 On0 11B0 bb0 gN0 TX0 11B0 5z0 jB0 WL0 11B0 2L0 jB0 11z0 1ip0 19X0 1cN0 1cL0 17d0 1in0 14p0 1lb0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1nX0 14p0 1in0 17d0 1fz0 1a10 19X0 1fB0 17b0 gN0 2L0 WN0 14n0 gN0 5z0 WN0 WL0 jB0 8n0 11B0 Rb0 gN0 dX0 11B0 Lz0 jB0 gL0 11B0 IL0 jB0 mn0 WN0 FX0 gN0 rX0 WN0 An0 jB0 uL0 11B0 uL0 gN0 An0 11B0 rX0 gN0 Db0 11B0 mn0 jB0 FX0 11B0 jz0 gN0 On0 WN0 dX0 jB0 Rb0 WN0 bb0 jB0 TX0 11B0 5z0 gN0 11z0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0|25e4", + "Asia/Ho_Chi_Minh|LMT PLMT +07 +08 +09|-76.u -76.u -70 -80 -90|0123423232|-2yC76.u bK00 1h7b6.u 5lz0 18o0 3Oq0 k5c0 aVX0 BAM0|90e5", "Asia/Hong_Kong|LMT HKT HKST HKWT JST|-7A.G -80 -90 -8u -90|0123412121212121212121212121212121212121212121212121212121212121212121|-2CFH0 1taO0 Hc0 xUu 9tBu 11z0 1tDu Rc0 1wo0 11A0 1cM0 11A0 1o00 11A0 1o00 11A0 1o00 14o0 1o00 11A0 1nX0 U10 1tz0 U10 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1wn0 Rd0 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 17d0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 s10 1Vz0 1cN0 1cL0 1cN0 1cL0 6fd0 14n0|73e5", "Asia/Hovd|LMT +06 +07 +08|-66.A -60 -70 -80|012323232323232323232323232323232323232323232323232|-2APG6.A 2Uko6.A cKn0 1db0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 kEp0 1cJ0 1cP0 1cJ0|81e3", "Asia/Irkutsk|LMT IMT +07 +08 +09|-6V.5 -6V.5 -70 -80 -90|012343434343434343434343234343434343434343434343434343434343434343|-3D8SV.5 1Bxc0 pjXV.5 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|60e4", @@ -191,6 +191,7 @@ "Asia/Kabul|LMT +04 +0430|-4A.M -40 -4u|012|-3eLEA.M 2dTcA.M|46e5", "Asia/Kamchatka|LMT +11 +12 +13|-ay.A -b0 -c0 -d0|012323232323232323232321232323232323232323232323232323232323212|-1SLKy.A ivXy.A 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 2sp0 WM0|18e4", "Asia/Karachi|LMT +0530 +0630 +05 PKT PKST|-4s.c -5u -6u -50 -50 -60|012134545454|-2xoss.c 1qOKW.c 7zX0 eup0 LqMu 1fy00 1cL0 dK10 11b0 1610 1jX0|24e6", + "Asia/Urumqi|LMT +06|-5O.k -60|01|-1GgtO.k|32e5", "Asia/Kathmandu|LMT +0530 +0545|-5F.g -5u -5J|012|-21JhF.g 2EGMb.g|12e5", "Asia/Khandyga|LMT +08 +09 +10 +11|-92.d -80 -90 -a0 -b0|0123232323232323232323212323232323232323232323232343434343434343432|-21Q92.d pAp2.d 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 qK0 yN0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 17V0 7zD0|66e2", "Asia/Krasnoyarsk|LMT +06 +07 +08|-6b.q -60 -70 -80|01232323232323232323232123232323232323232323232323232323232323232|-21Hib.q prAb.q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|10e5", @@ -206,7 +207,7 @@ "Asia/Oral|LMT +03 +05 +06 +04|-3p.o -30 -50 -60 -40|01232323232323232424242424242424242424242424242|-1Pc3p.o eUop.o 23CK0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 2pB0 1cM0 1fA0 1cM0 1cM0 IM0 1EM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0|27e4", "Asia/Pontianak|LMT PMT +0730 +09 +08 WITA WIB|-7h.k -7h.k -7u -90 -80 -80 -70|012324256|-2ua7h.k XE00 munL.k 8Rau 6kpu 4PXu xhcu Wqnu|23e4", "Asia/Pyongyang|LMT KST JST KST|-8n -8u -90 -90|012313|-2um8n 97XR 1lTzu 2Onc0 6BA0|29e5", - "Asia/Qostanay|LMT +04 +05 +06|-4e.s -40 -50 -60|012323232323232323232123232323232323232323232323|-1Pc4e.s eUoe.s 23CL0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0|", + "Asia/Qostanay|LMT +04 +05 +06|-4e.s -40 -50 -60|0123232323232323232321232323232323232323232323232|-1Pc4e.s eUoe.s 23CL0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 Mv90|", "Asia/Qyzylorda|LMT +04 +05 +06|-4l.Q -40 -50 -60|01232323232323232323232323232323232323232323232|-1Pc4l.Q eUol.Q 23CL0 3Db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 3ao0 1EM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 zQl0|73e4", "Asia/Rangoon|LMT RMT +0630 +09|-6o.L -6o.L -6u -90|01232|-3D8So.L 1BnA0 SmnS.L 7j9u|48e5", "Asia/Sakhalin|LMT +09 +11 +12 +10|-9u.M -90 -b0 -c0 -a0|01232323232323232323232423232323232424242424242424242424242424242|-2AGVu.M 1BoMu.M 1qFa0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2pB0 IM0 rX0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 2pB0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0 3rd0|58e4", @@ -509,7 +510,6 @@ "Asia/Thimphu|Asia/Thimbu", "Asia/Tokyo|Japan", "Asia/Ulaanbaatar|Asia/Ulan_Bator", - "Asia/Urumqi|Antarctica/Vostok", "Asia/Urumqi|Asia/Kashgar", "Atlantic/Faroe|Atlantic/Faeroe", "Australia/Adelaide|Australia/South", @@ -609,7 +609,7 @@ "AL|Europe/Tirane", "AM|Asia/Yerevan", "AO|Africa/Lagos Africa/Luanda", - "AQ|Antarctica/Casey Antarctica/Davis Antarctica/Mawson Antarctica/Palmer Antarctica/Rothera Antarctica/Troll Asia/Urumqi Pacific/Auckland Pacific/Port_Moresby Asia/Riyadh Antarctica/McMurdo Antarctica/DumontDUrville Antarctica/Syowa Antarctica/Vostok", + "AQ|Antarctica/Casey Antarctica/Davis Antarctica/Mawson Antarctica/Palmer Antarctica/Rothera Antarctica/Troll Antarctica/Vostok Pacific/Auckland Pacific/Port_Moresby Asia/Riyadh Antarctica/McMurdo Antarctica/DumontDUrville Antarctica/Syowa", "AR|America/Argentina/Buenos_Aires America/Argentina/Cordoba America/Argentina/Salta America/Argentina/Jujuy America/Argentina/Tucuman America/Argentina/Catamarca America/Argentina/La_Rioja America/Argentina/San_Juan America/Argentina/Mendoza America/Argentina/San_Luis America/Argentina/Rio_Gallegos America/Argentina/Ushuaia", "AS|Pacific/Pago_Pago", "AT|Europe/Vienna",