Merge pull request #156 from alyssaongyx/add-course-search

Add localcourse and partnercourse search

src/main/java/seedu/address/logic/Messages.java

@@ -104,10 +104,39 @@ public static <T> String format(ObservableList<T> observableList) {
                     .map(Note::getTags).get().toString();
             builder.append(tag);
             return builder.toString();
+        } else if (item instanceof LocalCourse) {
+            final StringBuilder builder = new StringBuilder("Localcourses: ");
+            String localCourses = observableList.stream()
+                    .map(localcourse -> (LocalCourse) localcourse)
+                    .map(localCourse -> {
+                        String localName = localCourse.getLocalName().toString();
+                        String localCode = localCourse.getLocalCode().toString();
+                        double units = localCourse.getLocalUnit().getValue();
+
+                        return localName + " (" + localCode + ", " + units + " units)";
+                    })
+                    .collect(Collectors.joining(", "));
+            builder.append(localCourses);
+            return builder.toString();
+        } else if (item instanceof PartnerCourse) {
+            final StringBuilder builder = new StringBuilder("Partnercourses: ");
+            String partnerCourses = observableList.stream()
+                    .map(partnercourse -> (PartnerCourse) partnercourse)
+                    .map(partnerCourse -> {
+                        String partnerName = partnerCourse.getPartnerName().toString();
+                        String partnerCode = partnerCourse.getPartnerCode().toString();
+                        double units = partnerCourse.getPartnerUnit().getValue();
+
+                        return partnerName + " (" + partnerCode + ", " + units + " units)";
+                    })
+                    .collect(Collectors.joining(", "));
+            builder.append(partnerCourses);
+            return builder.toString();
         }
         return "default";
-    }
 
+
+    }
     /**
      * Formats the {@code partnerCourse} for display to the user.
      * Overloaded method.

src/main/java/seedu/address/logic/SeplendidLogic.java

@@ -74,16 +74,16 @@ public interface SeplendidLogic {
     Path getPartnerCourseCatalogueFilePath();
     ObservableList<PartnerCourse> getSortedPartnerCourseCatalogue();
 
-    //=========== Universityatalouge ============================================================================
+
+    //=========== UniversityCatalogue ============================================================================
     ReadOnlyUniversityCatalogue getUniversityCatalogue();
     ObservableList<University> getFilteredUniversityCatalogue();
-
     Path getUniversityeCatalogueFilePath();
     ObservableList<University> getSortedUniversityCatalogue();
-    //=========== NoteCatalouge ============================================================================
+    //=========== NoteCatalogue ============================================================================
     ObservableList<Note> getFilteredNoteCatalogue();
 
-    //=========== MappingCatalouge ============================================================================
+    //=========== MappingCatalogue ============================================================================
     ReadOnlyMappingCatalogue getMappingCatalogue();
 
     ObservableList<Mapping> getFilteredMappingCatalogue();

src/main/java/seedu/address/logic/commands/LocalCourseAddCommand.java → src/main/java/seedu/address/logic/commands/localcourse/LocalCourseAddCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.localcourse;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/LocalCourseCommand.java → src/main/java/seedu/address/logic/commands/localcourse/LocalCourseCommand.java

@@ -1,6 +1,7 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.localcourse;
 
 import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.Command;
 
 /**
  * Abstract class for LocalCourseCommands.

src/main/java/seedu/address/logic/commands/LocalCourseDeleteCommand.java → src/main/java/seedu/address/logic/commands/localcourse/LocalCourseDeleteCommand.java

@@ -1,11 +1,12 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.localcourse;
 
 import static java.util.Objects.requireNonNull;
 
 import java.util.Optional;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/LocalCourseListCommand.java → src/main/java/seedu/address/logic/commands/localcourse/LocalCourseListCommand.java

@@ -1,7 +1,8 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.localcourse;
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/localcourse/LocalCourseSearchCommand.java

@@ -0,0 +1,88 @@
+package seedu.address.logic.commands.localcourse;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Objects;
+
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.SeplendidModel;
+import seedu.address.model.localcourse.LocalCourseAttribute;
+import seedu.address.model.localcourse.LocalCourseContainsKeywordsPredicate;
+import seedu.address.seplendidui.UiUtil;
+
+/**
+ * Finds and lists all localcourses in SEPlendid whose name contains any of the argument keywords.
+ * Keyword matching is case-insensitive.
+ */
+public class LocalCourseSearchCommand extends LocalCourseCommand {
+    public static final String ACTION_WORD = "search"; // Use "search" as the command word
+
+    public static final String MESSAGE_SUCCESS = "Local courses searched: %1$s";
+
+
+    public static final String LOCALCOURSE_SEARCH_MESSAGE_USAGE = COMMAND_WORD
+            + " : Search local courses by attributes - localcode and localname and localdescription";
+
+    private final LocalCourseAttribute attribute;
+
+    private final LocalCourseContainsKeywordsPredicate predicate;
+
+    private String query;
+
+    /**
+     * Creates a LocalCourseSearchCommand to sort the local course list based on the code predicate.
+     * @param codePredicate Predicate use for search
+     */
+    public LocalCourseSearchCommand(LocalCourseAttribute attribute,
+                                    LocalCourseContainsKeywordsPredicate predicate,
+                                    String query) {
+        this.attribute = attribute;
+        this.predicate = predicate;
+        this.query = query;
+    }
+
+    @Override
+    public CommandResult execute(SeplendidModel model) throws CommandException {
+        requireNonNull(model);
+
+        model.searchLocalCourses(attribute, predicate);
+
+        return new CommandResult(String.format(MESSAGE_SUCCESS, Messages.format(model.getFilteredLocalCourseList())),
+                UiUtil.ListViewModel.LOCAL_COURSE_LIST);
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        throw new CommandException("TBD: this is a stub and should be removed after morph.");
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        if (!(other instanceof LocalCourseSearchCommand)) {
+            return false;
+        }
+
+        LocalCourseSearchCommand otherLocalCourseSearchCommand = (LocalCourseSearchCommand) other;
+        return attribute == otherLocalCourseSearchCommand.attribute
+                && Objects.equals(predicate, otherLocalCourseSearchCommand.predicate)
+                && Objects.equals(query, otherLocalCourseSearchCommand.query);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .add("attribute", attribute)
+                .add("predicate", predicate)
+                .add("query", query)
+                .toString();
+    }
+}
+

src/main/java/seedu/address/logic/commands/LocalCourseSortCommand.java → src/main/java/seedu/address/logic/commands/localcourse/LocalCourseSortCommand.java

@@ -1,10 +1,11 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.localcourse;
 
 import static java.util.Objects.requireNonNull;
 
 import java.util.Comparator;
 
 import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/MappingAddCommand.java → src/main/java/seedu/address/logic/commands/mapping/MappingAddCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.mapping;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/MappingCommand.java → src/main/java/seedu/address/logic/commands/mapping/MappingCommand.java

@@ -1,6 +1,7 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.mapping;
 
 import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.Command;
 
 /**
  * Abstract class for MappingCommands.

src/main/java/seedu/address/logic/commands/MappingDeleteCommand.java → src/main/java/seedu/address/logic/commands/mapping/MappingDeleteCommand.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.mapping;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
@@ -7,6 +7,7 @@
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/MappingListCommand.java → src/main/java/seedu/address/logic/commands/mapping/MappingListCommand.java

@@ -1,7 +1,8 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.mapping;
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/MappingSearchCommand.java → src/main/java/seedu/address/logic/commands/mapping/MappingSearchCommand.java

@@ -1,8 +1,9 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.mapping;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/NoteAddCommand.java → src/main/java/seedu/address/logic/commands/note/NoteAddCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/NoteCommand.java → src/main/java/seedu/address/logic/commands/note/NoteCommand.java

@@ -1,6 +1,7 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.Command;
 
 /**
  * Abstract class for NoteCommands.

src/main/java/seedu/address/logic/commands/NoteDeleteCommand.java → src/main/java/seedu/address/logic/commands/note/NoteDeleteCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/NoteListCommand.java → src/main/java/seedu/address/logic/commands/note/NoteListCommand.java

@@ -1,7 +1,8 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/NoteSearchCommand.java → src/main/java/seedu/address/logic/commands/note/NoteSearchCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/NoteTagCommand.java → src/main/java/seedu/address/logic/commands/note/NoteTagCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/NoteUpdateCommand.java → src/main/java/seedu/address/logic/commands/note/NoteUpdateCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.note;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/PartnerCourseAddCommand.java → src/main/java/seedu/address/logic/commands/partnercourse/PartnerCourseAddCommand.java

@@ -1,9 +1,10 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.partnercourse;
 
 import static java.util.Objects.requireNonNull;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/PartnerCourseCommand.java → src/main/java/seedu/address/logic/commands/partnercourse/PartnerCourseCommand.java

@@ -1,6 +1,7 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.partnercourse;
 
 import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.commands.Command;
 
 /**
  * Abstract class for PartnerCourseCommands.

src/main/java/seedu/address/logic/commands/PartnerCourseDeleteCommand.java → src/main/java/seedu/address/logic/commands/partnercourse/PartnerCourseDeleteCommand.java

@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.partnercourse;
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
@@ -7,6 +7,7 @@
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;

src/main/java/seedu/address/logic/commands/PartnerCourseListCommand.java → src/main/java/seedu/address/logic/commands/partnercourse/PartnerCourseListCommand.java

@@ -1,7 +1,8 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.partnercourse;
 
 import static java.util.Objects.requireNonNull;
 
+import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.SeplendidModel;