[#11810] Remove archive courses feature

src/client/java/teammates/client/scripts/DataMigrationForInstructorNullIsArchivedField.java → src/client/java/teammates/client/scripts/DataMigrationToRemoveIsArchivedField.java

@@ -7,12 +7,12 @@
 import teammates.storage.entity.Instructor;
 
 /**
- * Script to change all null value to false in the isArchived field for Instructor entity.
+ * Script to remove the isArchived field for Instructor entity.
  */
-public class DataMigrationForInstructorNullIsArchivedField extends DataMigrationEntitiesBaseScript<Instructor> {
+public class DataMigrationToRemoveIsArchivedField extends DataMigrationEntitiesBaseScript<Instructor> {
 
  public static void main(String[] args) {
- new DataMigrationForInstructorNullIsArchivedField().doOperationRemotely();
+ new DataMigrationToRemoveIsArchivedField().doOperationRemotely();
  }
 
  @Override
@@ -30,17 +30,14 @@ protected boolean isMigrationNeeded(Instructor instructor) {
  try {
  Field isArchivedField = instructor.getClass().getDeclaredField("isArchived");
  isArchivedField.setAccessible(true);
- return isArchivedField.get(instructor) == null;
+ return isArchivedField.get(instructor) != null;
  } catch (ReflectiveOperationException e) {
- return true;
+ return false;
  }
  }
 
  @Override
  protected void migrateEntity(Instructor instructor) {
- instructor.setIsArchived(instructor.getIsArchived());
-
  saveEntityDeferred(instructor);
  }
-
 }

src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java

@@ -249,10 +249,6 @@ protected CourseAttributes getCourse(CourseAttributes course) {
  return getCourse(course.getId());
  }
 
- CourseAttributes getArchivedCourse(String instructorId, String courseId) {
- return BACKDOOR.getArchivedCourse(instructorId, courseId);
- }
-
  FeedbackQuestionAttributes getFeedbackQuestion(String courseId, String feedbackSessionName, int qnNumber) {
  return BACKDOOR.getFeedbackQuestion(courseId, feedbackSessionName, qnNumber);
  }

src/e2e/java/teammates/e2e/cases/InstructorCoursesPageE2ETest.java

@@ -15,7 +15,6 @@
 import teammates.common.util.AppUrl;
 import teammates.common.util.Const;
 import teammates.e2e.pageobjects.InstructorCoursesPage;
-import teammates.test.ThreadHelper;
 
 /**
  * SUT: {@link Const.WebPageURIs#INSTRUCTOR_COURSES_PAGE}.
@@ -79,12 +78,10 @@ public void testAll() {
  InstructorCoursesPage coursesPage = loginToPage(url, InstructorCoursesPage.class, instructorId);
 
  ______TS("verify loaded data");
- CourseAttributes[] activeCourses = { courses[0], courses[3] };
- CourseAttributes[] archivedCourses = { courses[1] };
+ CourseAttributes[] activeCourses = { courses[1], courses[0], courses[3] };
  CourseAttributes[] deletedCourses = { courses[2] };
 
  coursesPage.verifyActiveCoursesDetails(activeCourses);
- coursesPage.verifyArchivedCoursesDetails(archivedCourses);
  coursesPage.verifyDeletedCoursesDetails(deletedCourses);
 
  ______TS("verify statistics");
@@ -94,7 +91,7 @@ public void testAll() {
  coursesPage.verifyNotModifiable(courses[0].getId());
 
  ______TS("add new course");
- CourseAttributes[] activeCoursesWithNewCourse = { courses[0], courses[3], newCourse };
+ CourseAttributes[] activeCoursesWithNewCourse = { courses[0], courses[3], courses[1], newCourse };
  coursesPage.addCourse(newCourse);
 
  coursesPage.verifyStatusMessage("The course has been added.");
@@ -103,7 +100,7 @@ public void testAll() {
  verifyPresentInDatabase(newCourse);
 
  ______TS("copy course");
- CourseAttributes[] activeCoursesWithCopyCourse = { courses[0], courses[3], newCourse, copyCourse };
+ CourseAttributes[] activeCoursesWithCopyCourse = { courses[0], courses[3], courses[1], newCourse, copyCourse };
  coursesPage.copyCourse(courses[3].getId(), copyCourse);
 
  coursesPage.verifyStatusMessage("The course has been added.");
@@ -112,41 +109,21 @@ public void testAll() {
  verifyPresentInDatabase(copyCourse);
  verifyPresentInDatabase(copySession);
 
- ______TS("archive course");
- CourseAttributes[] archivedCoursesWithNewCourse = { newCourse, courses[1] };
- coursesPage.archiveCourse(newCourse.getId());
-
- coursesPage.verifyStatusMessage("The course " + newCourse.getId() + " has been archived. "
- + "It will not appear on the home page anymore.");
- coursesPage.verifyNumActiveCourses(3);
- coursesPage.verifyArchivedCoursesDetails(archivedCoursesWithNewCourse);
- verifyCourseArchivedInDatabase(instructorId, newCourse);
-
- ______TS("unarchive course");
- CourseAttributes[] activeCoursesWithNewCourseSortedByName = { copyCourse, courses[3], newCourse, courses[0] };
- coursesPage.unarchiveCourse(newCourse.getId());
-
- coursesPage.verifyStatusMessage("The course has been unarchived.");
- coursesPage.verifyNumArchivedCourses(1);
- coursesPage.sortByCourseName();
- coursesPage.verifyActiveCoursesDetails(activeCoursesWithNewCourseSortedByName);
- verifyCourseNotArchivedInDatabase(instructorId, newCourse);
-
  ______TS("move active course to recycle bin");
  newCourse.setDeletedAt(Instant.now());
  CourseAttributes[] deletedCoursesWithNewCourse = { newCourse, courses[2] };
  coursesPage.moveCourseToRecycleBin(newCourse.getId());
 
  coursesPage.verifyStatusMessage("The course " + newCourse.getId() + " has been deleted. "
  + "You can restore it from the Recycle Bin manually.");
- coursesPage.verifyNumActiveCourses(3);
+ coursesPage.verifyNumActiveCourses(4);
  coursesPage.verifyDeletedCoursesDetails(deletedCoursesWithNewCourse);
  assertTrue(BACKDOOR.isCourseInRecycleBin(newCourse.getId()));
 
  ______TS("restore active course");
  newCourse.setDeletedAt(null);
  CourseAttributes[] activeCoursesWithNewCourseSortedByCreationDate =
- { copyCourse, newCourse, courses[0], courses[3] };
+ { copyCourse, newCourse, courses[1], courses[0], courses[3] };
  coursesPage.restoreCourse(newCourse.getId());
 
  coursesPage.verifyStatusMessage("The course " + newCourse.getId() + " has been restored.");
@@ -156,61 +133,21 @@ public void testAll() {
  coursesPage.verifyActiveCoursesDetails(activeCoursesWithNewCourseSortedByCreationDate);
  assertFalse(BACKDOOR.isCourseInRecycleBin(newCourse.getId()));
 
- ______TS("move archived course to recycle bin");
- coursesPage.archiveCourse(newCourse.getId());
- newCourse.setDeletedAt(Instant.now());
- coursesPage.moveArchivedCourseToRecycleBin(newCourse.getId());
-
- coursesPage.verifyStatusMessage("The course " + newCourse.getId() + " has been deleted. "
- + "You can restore it from the Recycle Bin manually.");
- coursesPage.verifyNumArchivedCourses(1);
- coursesPage.verifyDeletedCoursesDetails(deletedCoursesWithNewCourse);
- assertTrue(BACKDOOR.isCourseInRecycleBin(newCourse.getId()));
-
- ______TS("restore archived course");
- newCourse.setDeletedAt(null);
- coursesPage.restoreCourse(newCourse.getId());
-
- coursesPage.verifyStatusMessage("The course " + newCourse.getId() + " has been restored.");
- coursesPage.waitForPageToLoad();
- coursesPage.verifyNumDeletedCourses(1);
- coursesPage.verifyArchivedCoursesDetails(archivedCoursesWithNewCourse);
- assertFalse(BACKDOOR.isCourseInRecycleBin(newCourse.getId()));
- verifyCourseArchivedInDatabase(instructorId, newCourse);
-
  ______TS("permanently delete course");
- coursesPage.moveArchivedCourseToRecycleBin(newCourse.getId());
+ coursesPage.moveCourseToRecycleBin(newCourse.getId());
  coursesPage.deleteCourse(newCourse.getId());
 
  coursesPage.verifyStatusMessage("The course " + newCourse.getId()
  + " has been permanently deleted.");
  coursesPage.verifyNumDeletedCourses(1);
  verifyAbsentInDatabase(newCourse);
 
- ______TS("restore all");
- coursesPage.moveArchivedCourseToRecycleBin(courses[1].getId());
- CourseAttributes[] activeCoursesWithRestored = { courses[0], courses[3], courses[2], copyCourse };
- coursesPage.restoreAllCourses();
-
- coursesPage.verifyStatusMessage("All courses have been restored.");
- coursesPage.waitForPageToLoad();
- coursesPage.sortByCourseId();
- coursesPage.verifyActiveCoursesDetails(activeCoursesWithRestored);
- coursesPage.verifyArchivedCoursesDetails(archivedCourses);
- coursesPage.verifyNumDeletedCourses(0);
- assertFalse(BACKDOOR.isCourseInRecycleBin(courses[1].getId()));
- assertFalse(BACKDOOR.isCourseInRecycleBin(courses[2].getId()));
-
  ______TS("permanently delete all");
- coursesPage.moveArchivedCourseToRecycleBin(courses[1].getId());
- coursesPage.moveCourseToRecycleBin(courses[2].getId());
  coursesPage.deleteAllCourses();
 
  coursesPage.verifyStatusMessage("All courses have been permanently deleted.");
- coursesPage.verifyNumActiveCourses(3);
- coursesPage.verifyNumArchivedCourses(0);
+ coursesPage.verifyNumActiveCourses(4);
  coursesPage.verifyNumDeletedCourses(0);
- verifyAbsentInDatabase(courses[1]);
  verifyAbsentInDatabase(courses[2]);
  }
 
@@ -242,26 +179,4 @@ private void verifyActiveCourseStatistics(InstructorCoursesPage coursesPage, Cou
  coursesPage.verifyActiveCourseStatistics(course, Integer.toString(numSections), Integer.toString(numTeams),
  Integer.toString(numStudents), Integer.toString(numUnregistered));
  }
-
- private void verifyCourseArchivedInDatabase(String instructorId, CourseAttributes course) {
- int retryLimit = 5;
- CourseAttributes actual = getArchivedCourse(instructorId, course.getId());
- while (actual == null && retryLimit > 0) {
- retryLimit--;
- ThreadHelper.waitFor(1000);
- actual = getArchivedCourse(instructorId, course.getId());
- }
- assertEquals(actual, course);
- }
-
- private void verifyCourseNotArchivedInDatabase(String instructorId, CourseAttributes course) {
- int retryLimit = 5;
- CourseAttributes actual = getArchivedCourse(instructorId, course.getId());
- while (actual != null && retryLimit > 0) {
- retryLimit--;
- ThreadHelper.waitFor(1000);
- actual = getArchivedCourse(instructorId, course.getId());
- }
- assertNull(actual);
- }
 }

src/e2e/java/teammates/e2e/cases/InstructorHomePageE2ETest.java

@@ -176,27 +176,18 @@ public void testAll() {
  homePage.verifyStatusMessage("The feedback session has been deleted. "
  + "You can restore it from the 'Sessions' tab.");
  homePage.sortCoursesByCreationDate();
- courseIndex = 1;
  otherCourseIndex = 0;
  homePage.verifyCourseTabDetails(otherCourseIndex, otherCourse, otherCourseSessions);
  assertNotNull(getSoftDeletedSession(copiedSession.getFeedbackSessionName(),
  instructor.getGoogleId()));
 
- ______TS("archive course");
- homePage.archiveCourse(courseIndex);
-
- homePage.verifyStatusMessage("The course " + course.getId() + " has been archived. "
- + "You can retrieve it from the Courses page.");
- homePage.verifyNumCourses(1);
- verifyCourseArchivedInDatabase(instructor.getGoogleId(), course);
-
  ______TS("delete course");
  otherCourseIndex = 0;
  homePage.deleteCourse(otherCourseIndex);
 
  homePage.verifyStatusMessage("The course " + otherCourse.getId() + " has been deleted. "
  + "You can restore it from the Recycle Bin manually.");
- homePage.verifyNumCourses(0);
+ homePage.verifyNumCourses(1);
  assertTrue(BACKDOOR.isCourseInRecycleBin(otherCourse.getId()));
  }
 
@@ -237,15 +228,4 @@ private void verifySessionPublishedState(FeedbackSessionAttributes feedbackSessi
  }
  assertEquals(actual.isPublished(), state);
  }
-
- private void verifyCourseArchivedInDatabase(String instructorId, CourseAttributes course) {
- int retryLimit = 5;
- CourseAttributes actual = getArchivedCourse(instructorId, course.getId());
- while (actual == null && retryLimit > 0) {
- retryLimit--;
- ThreadHelper.waitFor(1000);
- actual = getArchivedCourse(instructorId, course.getId());
- }
- assertEquals(actual, course);
- }
 }