Remove deprecated Elasticsearch query framework

src/main/java/uk/ac/cam/cl/dtg/isaac/api/EventsFacade.java

@@ -1288,6 +1288,7 @@ public final Response getEventOverviews(@Context final HttpServletRequest reques
 
     /**
      * REST end point to provide a summary of events suitable for mapping.
+     * Excludes nofilter events.
      *
      * @param request        - this allows us to check to see if a user is currently logged in.
      * @param startIndex     - the initial index for the first result.

src/main/java/uk/ac/cam/cl/dtg/isaac/api/GameboardsFacade.java

@@ -124,96 +124,6 @@ public GameboardsFacade(final AbstractConfigLoader properties, final ILogManager
         this.fastTrackManger = fastTrackManger;
     }
 
-    /**
-     * REST end point to provide a Temporary Gameboard stored in volatile storage.
-     * 
-     * @param request
-     *            - this allows us to check to see if a user is currently loggedin.
-     * @param title
-     *            - the title of the generated board
-     * @param subjects
-     *            - a comma separated list of subjects
-     * @param fields
-     *            - a comma separated list of fields
-     * @param topics
-     *            - a comma separated list of topics
-     * @param levels
-     *            - a comma separated list of levels
-     * @param concepts
-     *            - a comma separated list of conceptIds
-     * @param questionCategories
-     *            - a comma separated list of question categories
-     * @return a Response containing a gameboard object or containing a SegueErrorResponse.
-     */
-    @Deprecated
-    @GET
-    @Path("gameboards")
-    @Produces(MediaType.APPLICATION_JSON)
-    @GZIP
-    @Operation(summary = "Get a temporary board of questions matching provided constraints.")
-    public final Response generateTemporaryGameboard(@Context final HttpServletRequest request,
-            @QueryParam("title") final String title, @QueryParam("subjects") final String subjects,
-            @QueryParam("fields") final String fields, @QueryParam("topics") final String topics,
-            @QueryParam("stages") final String stages, @QueryParam("difficulties") final String difficulties,
-            @QueryParam("examBoards") final String examBoards, @QueryParam("levels") final String levels,
-            @QueryParam("concepts") final String concepts, @QueryParam("questionCategories") final String questionCategories) {
-        List<String> subjectsList = splitCsvStringQueryParam(subjects);
-        List<String> fieldsList = splitCsvStringQueryParam(fields);
-        List<String> topicsList = splitCsvStringQueryParam(topics);
-        List<Integer> levelsList = null;
-        List<String> stagesList = splitCsvStringQueryParam(stages);
-        List<String> difficultiesList = splitCsvStringQueryParam(difficulties);
-        List<String> examBoardsList = splitCsvStringQueryParam(examBoards);
-        List<String> conceptsList = splitCsvStringQueryParam(concepts);
-        List<String> questionCategoriesList = splitCsvStringQueryParam(questionCategories);
-
-        if (null != levels && !levels.isEmpty()) {
-            String[] levelsAsString = levels.split(",");
-
-            levelsList = Lists.newArrayList();
-            for (String s : levelsAsString) {
-                try {
-                    levelsList.add(Integer.parseInt(s));
-                } catch (NumberFormatException e) {
-                    return new SegueErrorResponse(Status.BAD_REQUEST, "Levels must be numbers if specified.", e)
-                            .toResponse();
-                }
-            }
-        }
-
-        try {
-            log.warn("Method generateTemporaryGameboard was called by an API request!");
-            // FIXME: remove endpoint after 2026-05. brownout below, in a revertible way, until removal.
-            if (!getProperties().getProperty(SEGUE_APP_ENVIRONMENT).equals(EnvironmentType.DEV.name())) {
-                return SegueErrorResponse.getGoneResponse();
-            }
-
-            AbstractSegueUserDTO boardOwner = this.userManager.getCurrentUser(request);
-            GameboardDTO gameboard;
-
-            gameboard = gameManager.generateRandomGameboard(title, subjectsList, fieldsList, topicsList, levelsList,
-                    conceptsList, questionCategoriesList, stagesList, difficultiesList, examBoardsList,boardOwner);
-
-            if (null == gameboard) {
-                return new SegueErrorResponse(Status.NO_CONTENT,
-                        "We cannot find any questions based on your filter criteria.").toResponse();
-            }
-
-            return Response.ok(gameboard).cacheControl(getCacheControl(NEVER_CACHE_WITHOUT_ETAG_CHECK, false)).build();
-        } catch (IllegalArgumentException e) {
-            return new SegueErrorResponse(Status.BAD_REQUEST, "Your gameboard filter request is invalid.").toResponse();
-        } catch (SegueDatabaseException e) {
-            String message = "SegueDatabaseException whilst generating a gameboard";
-            log.error(message, e);
-            return new SegueErrorResponse(Status.INTERNAL_SERVER_ERROR, message).toResponse();
-        } catch (ContentManagerException e1) {
-            SegueErrorResponse error = new SegueErrorResponse(Status.NOT_FOUND, "Error locating the version requested",
-                    e1);
-            log.error(error.getErrorMessage(), e1);
-            return error.toResponse();
-        }
-    }
-
     /**
      * REST end point to retrieve a specific gameboard by Id.
      * 

src/main/java/uk/ac/cam/cl/dtg/isaac/api/PagesFacade.java

@@ -54,12 +54,13 @@
 import uk.ac.cam.cl.dtg.isaac.dto.users.RegisteredUserDTO;
 import uk.ac.cam.cl.dtg.segue.api.managers.QuestionManager;
 import uk.ac.cam.cl.dtg.segue.api.managers.UserAccountManager;
-import uk.ac.cam.cl.dtg.segue.api.services.ContentService;
 import uk.ac.cam.cl.dtg.segue.auth.exceptions.NoUserLoggedInException;
 import uk.ac.cam.cl.dtg.segue.dao.ILogManager;
 import uk.ac.cam.cl.dtg.segue.dao.SegueDatabaseException;
 import uk.ac.cam.cl.dtg.segue.dao.content.ContentManagerException;
 import uk.ac.cam.cl.dtg.segue.dao.content.GitContentManager;
+import uk.ac.cam.cl.dtg.segue.search.BooleanInstruction;
+import uk.ac.cam.cl.dtg.segue.search.MatchInstruction;
 import uk.ac.cam.cl.dtg.util.AbstractConfigLoader;
 import uk.ac.cam.cl.dtg.util.mappers.MainMapper;
 
@@ -103,7 +104,6 @@
 public class PagesFacade extends AbstractIsaacFacade {
     private static final Logger log = LoggerFactory.getLogger(PagesFacade.class);
 
-    private final ContentService api;
     private final MainMapper mapper;
     private final UserAccountManager userManager;
     private final URIManager uriManager;
@@ -116,8 +116,6 @@ public class PagesFacade extends AbstractIsaacFacade {
     /**
      * Creates an instance of the pages controller which provides the REST endpoints for accessing page content.
      *
-     * @param api
-     *            - Instance of ContentService
      * @param propertiesLoader
      *            - Instance of properties Loader
      * @param logManager
@@ -138,13 +136,12 @@ public class PagesFacade extends AbstractIsaacFacade {
      *            - For looking up bookmark information.
      */
     @Inject
-    public PagesFacade(final ContentService api, final AbstractConfigLoader propertiesLoader,
+    public PagesFacade(final AbstractConfigLoader propertiesLoader,
                        final ILogManager logManager, final MainMapper mapper, final GitContentManager contentManager,
                        final UserAccountManager userManager, final URIManager uriManager,
                        final QuestionManager questionManager, final GameManager gameManager,
                        final UserAttemptManager userAttemptManager, final BookmarksManager bookmarksManager) {
         super(propertiesLoader, logManager);
-        this.api = api;
         this.mapper = mapper;
         this.contentManager = contentManager;
         this.userManager = userManager;
@@ -181,31 +178,25 @@ public final Response getConceptList(@Context final Request request, @QueryParam
             @QueryParam("tags") final String tags,
             @DefaultValue(DEFAULT_START_INDEX_AS_STRING) @QueryParam("start_index") final Integer startIndex,
             @DefaultValue(DEFAULT_RESULTS_LIMIT_AS_STRING) @QueryParam("limit") final Integer limit) {
-        Map<String, List<String>> fieldsToMatch = Maps.newHashMap();
-        fieldsToMatch.put(TYPE_FIELDNAME, List.of(CONCEPT_TYPE));
-
         StringBuilder etagCodeBuilder = new StringBuilder();
-
-        Integer newLimit = null;
+        Integer newLimit = limit;
 
         if (limit != null) {
-            newLimit = limit;
             etagCodeBuilder.append(limit);
         }
 
-        // options
+        List<String> idsList = null;
         if (ids != null) {
-            List<String> idsList = Arrays.asList(ids.split(","));
-            fieldsToMatch.put(ID_FIELDNAME, idsList);
+            idsList = Arrays.asList(ids.split(","));
             newLimit = idsList.size();
             etagCodeBuilder.append(ids);
         }
 
+        List<String> tagList = null;
         if (tags != null) {
-            fieldsToMatch.put(TAGS_FIELDNAME, Arrays.asList(tags.split(",")));
+            tagList = Arrays.asList(tags.split(","));
             etagCodeBuilder.append(tags);
         }
-        Map<String, BooleanOperator> booleanOperatorOverrideMap = ImmutableMap.of(TAGS_FIELDNAME, BooleanOperator.OR);
 
         // Calculate the ETag on last modified date of tags list
         // NOTE: Assumes that the latest version of the content is being used.
@@ -219,10 +210,39 @@ public final Response getConceptList(@Context final Request request, @QueryParam
         }
 
         try {
-            return listContentObjects(fieldsToMatch, booleanOperatorOverrideMap, startIndex, newLimit).tag(etag)
+            BooleanInstruction searchInstruction = new BooleanInstruction();
+            searchInstruction.must(new MatchInstruction(TYPE_FIELDNAME, CONCEPT_TYPE));
+
+            if (idsList != null && !idsList.isEmpty()) {
+                BooleanInstruction idsInstruction = new BooleanInstruction();
+                for (String id : idsList) {
+                    idsInstruction.should(new MatchInstruction(ID_FIELDNAME, id));
+                }
+                searchInstruction.must(idsInstruction);
+            }
+
+            if (tagList != null && !tagList.isEmpty()) {
+                BooleanInstruction tagsInstruction = new BooleanInstruction();
+                for (String tag : tagList) {
+                    tagsInstruction.should(new MatchInstruction(TAGS_FIELDNAME, tag));
+                }
+                searchInstruction.must(tagsInstruction);
+            }
+
+            Map<String, SortOrder> sortInstructions = Maps.newHashMap();
+            sortInstructions.put(TITLE_FIELDNAME + "." + UNPROCESSED_SEARCH_FIELD_SUFFIX, SortOrder.ASC);
+
+            ResultsWrapper<ContentDTO> c = this.contentManager.nestedMatchSearch(
+                    searchInstruction, startIndex, newLimit, null, sortInstructions);
+
+            ResultsWrapper<ContentSummaryDTO> summarizedContent = new ResultsWrapper<>(
+                    this.extractContentSummaryFromList(c.getResults()),
+                    c.getTotalResults());
+
+            return Response.ok(summarizedContent).tag(etag)
                     .cacheControl(getCacheControl(NUMBER_SECONDS_IN_ONE_HOUR, true))
                     .build();
-        } catch (ContentManagerException e1) {
+        } catch (final ContentManagerException e1) {
             SegueErrorResponse error = new SegueErrorResponse(Status.NOT_FOUND,
                     "Error locating the content requested", e1);
             log.error(error.getErrorMessage(), e1);
@@ -1172,17 +1192,16 @@ public final Response getPodList(@Context final Request request,
         }
 
         try {
-            Map<String, List<String>> fieldsToMatch = Maps.newHashMap();
-            fieldsToMatch.put(TYPE_FIELDNAME, List.of(POD_FRAGMENT_TYPE));
-            fieldsToMatch.put(TAGS_FIELDNAME, List.of(subject));
+            BooleanInstruction searchInstruction = new BooleanInstruction();
+            searchInstruction.must(new MatchInstruction(TYPE_FIELDNAME, POD_FRAGMENT_TYPE));
+            searchInstruction.must(new MatchInstruction(TAGS_FIELDNAME, subject));
 
             Map<String, SortOrder> sortInstructions = new HashMap<>();
             sortInstructions.put("id.raw", SortOrder.DESC); // Sort by ID (i.e. most recent; all pod ids start yyyymmdd)
             // We would ideally also sort by presence of 'featured' tag, tricky with current implementation
 
-            ResultsWrapper<ContentDTO> pods = api.findMatchingContent(
-                    ContentService.generateDefaultFieldToMatch(fieldsToMatch), startIndex, MAX_PODS_TO_RETURN,
-                    sortInstructions);
+            ResultsWrapper<ContentDTO> pods = this.contentManager.nestedMatchSearch(
+                    searchInstruction, startIndex, MAX_PODS_TO_RETURN, null, sortInstructions);
 
             return Response.ok(pods).cacheControl(getCacheControl(NUMBER_SECONDS_IN_TEN_MINUTES, true))
                     .tag(etag)
@@ -1292,44 +1311,6 @@ private List<ContentSummaryDTO> extractContentSummaryFromList(final List<Content
         return listOfContentInfo;
     }
 
-    /**
-     * Helper method to query segue for a list of content objects.
-     * 
-     * This method will only use the latest version of the content.
-     * 
-     * @param fieldsToMatch
-     *            - expects a map of the form fieldname -> list of queries to match
-     * @param booleanOperatorOverrideMap
-     *            - an optional map of the form fieldname -> one of 'AND', 'OR' or 'NOT', to specify the
-     *              type of matching needed for that field. Overrides any other default matching behaviour
-     *              for the given fields
-     * @param startIndex
-     *            - the initial index for the first result.
-     * @param limit
-     *            - the maximums number of results to return
-     * @return Response builder containing a list of content summary objects or containing a SegueErrorResponse
-     */
-    private Response.ResponseBuilder listContentObjects(final Map<String,
-                List<String>> fieldsToMatch,
-                @Nullable final Map<String, BooleanOperator> booleanOperatorOverrideMap,
-                final Integer startIndex,
-                final Integer limit)
-            throws ContentManagerException {
-        ResultsWrapper<ContentDTO> c;
-
-        c = api.findMatchingContent(
-                ContentService.generateDefaultFieldToMatch(fieldsToMatch, booleanOperatorOverrideMap),
-                startIndex,
-                limit
-        );
-
-        ResultsWrapper<ContentSummaryDTO> summarizedContent = new ResultsWrapper<>(
-                this.extractContentSummaryFromList(c.getResults()),
-                c.getTotalResults());
-
-        return Response.ok(summarizedContent);
-    }
-
     /**
      * Convert an optional comma-separated URL parameter into a value suitable for logging.
      * @param urlParam - the URL parameter value, potentially null or empty.

src/main/java/uk/ac/cam/cl/dtg/isaac/api/managers/EventNotificationEmailManager.java

@@ -16,20 +16,19 @@
 import uk.ac.cam.cl.dtg.isaac.dto.users.UserSummaryDTO;
 import uk.ac.cam.cl.dtg.segue.api.Constants;
 import uk.ac.cam.cl.dtg.segue.api.managers.UserAccountManager;
-import uk.ac.cam.cl.dtg.segue.api.services.ContentService;
 import uk.ac.cam.cl.dtg.segue.auth.exceptions.NoUserException;
 import uk.ac.cam.cl.dtg.segue.comm.EmailManager;
 import uk.ac.cam.cl.dtg.segue.comm.EmailType;
 import uk.ac.cam.cl.dtg.segue.dao.SegueDatabaseException;
 import uk.ac.cam.cl.dtg.segue.dao.content.ContentManagerException;
 import uk.ac.cam.cl.dtg.segue.dao.content.GitContentManager;
-import uk.ac.cam.cl.dtg.segue.search.AbstractFilterInstruction;
-import uk.ac.cam.cl.dtg.segue.search.DateRangeFilterInstruction;
+import uk.ac.cam.cl.dtg.segue.search.BooleanInstruction;
+import uk.ac.cam.cl.dtg.segue.search.MatchInstruction;
+import uk.ac.cam.cl.dtg.segue.search.RangeInstruction;
 import uk.ac.cam.cl.dtg.util.AbstractConfigLoader;
 
 import java.time.ZonedDateTime;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -97,22 +96,21 @@ public void sendReminderEmails() {
         // Magic number
         Integer limit = 10000;
         Integer startIndex = 0;
-        Map<String, List<String>> fieldsToMatch = Maps.newHashMap();
         Map<String, Constants.SortOrder> sortInstructions = Maps.newHashMap();
-        Map<String, AbstractFilterInstruction> filterInstructions = Maps.newHashMap();
-        fieldsToMatch.put(TYPE_FIELDNAME, Collections.singletonList(EVENT_TYPE));
         sortInstructions.put(DATE_FIELDNAME, Constants.SortOrder.DESC);
         ZonedDateTime now = ZonedDateTime.now();
         ZonedDateTime threeDaysAhead = now.plusDays(3);
-        DateRangeFilterInstruction
-            eventsWithinThreeDays = new DateRangeFilterInstruction(new Date(), Date.from(threeDaysAhead.toInstant()));
-        filterInstructions.put(DATE_FIELDNAME, eventsWithinThreeDays);
+
+        BooleanInstruction searchInstruction = new BooleanInstruction();
+        searchInstruction.must(new MatchInstruction(TYPE_FIELDNAME, EVENT_TYPE));
+        searchInstruction.must(new RangeInstruction<Long>(DATE_FIELDNAME)
+                .greaterThanOrEqual(new Date().getTime())
+                .lessThanOrEqual(Date.from(threeDaysAhead.toInstant()).getTime()));
 
         try {
-            ResultsWrapper<ContentDTO> findByFieldNames = this.contentManager.findByFieldNames(
-                    ContentService.generateDefaultFieldToMatch(fieldsToMatch), startIndex, limit, sortInstructions,
-                    filterInstructions);
-            for (ContentDTO contentResult : findByFieldNames.getResults()) {
+            ResultsWrapper<ContentDTO> results = this.contentManager.nestedMatchSearch(
+                    searchInstruction, startIndex, limit, null, sortInstructions);
+            for (ContentDTO contentResult : results.getResults()) {
                 if (contentResult instanceof IsaacEventPageDTO event) {
                     // Skip sending emails for cancelled events
                     if (EventStatus.CANCELLED.equals(event.getEventStatus())) {
@@ -138,23 +136,21 @@ public void sendFeedbackEmails() {
         // Magic number
         Integer limit = 10000;
         Integer startIndex = 0;
-        Map<String, List<String>> fieldsToMatch = Maps.newHashMap();
         Map<String, Constants.SortOrder> sortInstructions = Maps.newHashMap();
-        Map<String, AbstractFilterInstruction> filterInstructions = Maps.newHashMap();
-        fieldsToMatch.put(TYPE_FIELDNAME, Collections.singletonList(EVENT_TYPE));
         sortInstructions.put(DATE_FIELDNAME, Constants.SortOrder.DESC);
         ZonedDateTime now = ZonedDateTime.now();
         ZonedDateTime sixtyDaysAgo = now.plusDays(-60);
 
-        DateRangeFilterInstruction eventsInLastSixtyDays = new DateRangeFilterInstruction(
-                Date.from(sixtyDaysAgo.toInstant()), new Date());
-        filterInstructions.put(DATE_FIELDNAME, eventsInLastSixtyDays);
+        BooleanInstruction searchInstruction = new BooleanInstruction();
+        searchInstruction.must(new MatchInstruction(TYPE_FIELDNAME, EVENT_TYPE));
+        searchInstruction.must(new RangeInstruction<Long>(DATE_FIELDNAME)
+                .greaterThanOrEqual(Date.from(sixtyDaysAgo.toInstant()).getTime())
+                .lessThanOrEqual(new Date().getTime()));
 
         try {
-            ResultsWrapper<ContentDTO> findByFieldNames = this.contentManager.findByFieldNames(
-                    ContentService.generateDefaultFieldToMatch(fieldsToMatch), startIndex, limit, sortInstructions,
-                    filterInstructions);
-            for (ContentDTO contentResult : findByFieldNames.getResults()) {
+            ResultsWrapper<ContentDTO> results = this.contentManager.nestedMatchSearch(
+                    searchInstruction, startIndex, limit, null, sortInstructions);
+            for (ContentDTO contentResult : results.getResults()) {
                 if (contentResult instanceof IsaacEventPageDTO event) {
                     // Skip sending emails for cancelled events
                     if (EventStatus.CANCELLED.equals(event.getEventStatus())) {