Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ca4e5df
Add activity search DTO, service, and endpoint
craigyu Feb 10, 2026
4bb78da
feat: search endpoint for oracle
craigyu Feb 12, 2026
6e49d86
remove redundant description fetching
craigyu Feb 12, 2026
0f129b0
feat: postgres search and all tests
craigyu Feb 13, 2026
153aba9
fix: adjust tests
craigyu Feb 13, 2026
66c5e31
Merge branch 'main' into feat/1165-activity-search-endpoint
craigyu Feb 17, 2026
17902e1
fix: better date handling
craigyu Feb 17, 2026
00eeed6
fix: remove no arg constructor
craigyu Feb 17, 2026
0c23e9d
fix: add filter back
craigyu Feb 17, 2026
9c1bcf4
fix: date search compare
craigyu Feb 17, 2026
0746458
fix: add empty search test
craigyu Feb 17, 2026
8538910
Merge branch 'feat/1165-activity-search-endpoint' of https://github.c…
craigyu Feb 17, 2026
7d12559
fix bracket
craigyu Feb 17, 2026
c1352fe
fix: remove redundant test
craigyu Feb 17, 2026
9526b2b
fix: better sql for isComplete
craigyu Feb 17, 2026
cb2c197
Merge branch 'main' into feat/1165-activity-search-endpoint
craigyu Feb 17, 2026
7465198
fix is complete filter on postgres
craigyu Feb 17, 2026
e68a5b3
Merge branch 'feat/1165-activity-search-endpoint' of https://github.c…
craigyu Feb 17, 2026
7099e6e
Merge branch 'main' into feat/1165-activity-search-endpoint
craigyu Feb 17, 2026
9a21012
Merge branch 'main' into feat/1165-activity-search-endpoint
craigyu Feb 17, 2026
b9f6080
Mark AbstractActivityService as abstract
craigyu Feb 18, 2026
5794dd8
fix: getting rid of service unit test
craigyu Feb 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
package ca.bc.gov.restapi.results.common.dto.activity;

import ca.bc.gov.restapi.results.common.SilvaConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import java.util.Objects;
import lombok.Getter;
import lombok.ToString;
import org.springframework.util.CollectionUtils;

/** This class contains all possible filters when using the Activity Search API. */
@Getter
@ToString
public class ActivitySearchFiltersDto {

@Schema(type = "array", nullable = true)
private final List<String> bases;

@Schema(type = "array", nullable = true)
private final List<String> techniques;

@Schema(type = "array", nullable = true)
private final List<String> methods;

@Schema(type = "boolean", nullable = true)
private final Boolean isComplete;

@Schema(type = "array", nullable = true)
private final List<String> objectives;

@Schema(type = "array", nullable = true)
private final List<String> fundingSources;

@Schema(type = "array", nullable = true)
private final List<String> orgUnits;

@Schema(type = "array", nullable = true)
private final List<String> openingCategories;

@Schema(type = "string")
private final String fileId;

@Schema(type = "array", nullable = true)
private final List<String> clientNumbers;

@Schema(type = "array", nullable = true)
private final List<String> openingStatuses;

@Schema(type = "string", format = "date", nullable = true)
private final String updateDateStart;

@Schema(type = "string", format = "date", nullable = true)
private final String updateDateEnd;

/**
* Creates a no-arg instance with all fields set to null, delegating to the all-args constructor
* to apply defaults.
*/
public ActivitySearchFiltersDto() {
this(null, null, null, null, null, null, null, null, null, null, null, null, null);
}

/** Creates an instance of the activity search filter dto. */
public ActivitySearchFiltersDto(
List<String> bases,
List<String> techniques,
List<String> methods,
Boolean isComplete,
List<String> objectives,
List<String> fundingSources,
List<String> orgUnits,
List<String> openingCategories,
String fileId,
List<String> clientNumbers,
List<String> openingStatuses,
String updateDateStart,
String updateDateEnd) {
this.bases = !CollectionUtils.isEmpty(bases) ? bases : List.of(SilvaConstants.NOVALUE);
this.techniques =
!CollectionUtils.isEmpty(techniques) ? techniques : List.of(SilvaConstants.NOVALUE);
this.methods = !CollectionUtils.isEmpty(methods) ? methods : List.of(SilvaConstants.NOVALUE);
this.isComplete = isComplete;
this.objectives =
!CollectionUtils.isEmpty(objectives) ? objectives : List.of(SilvaConstants.NOVALUE);
this.fundingSources =
!CollectionUtils.isEmpty(fundingSources) ? fundingSources : List.of(SilvaConstants.NOVALUE);
this.orgUnits = !CollectionUtils.isEmpty(orgUnits) ? orgUnits : List.of(SilvaConstants.NOVALUE);
this.openingCategories =
!CollectionUtils.isEmpty(openingCategories)
? openingCategories
: List.of(SilvaConstants.NOVALUE);
this.fileId = Objects.isNull(fileId) ? null : fileId.trim();
this.clientNumbers =
!CollectionUtils.isEmpty(clientNumbers) ? clientNumbers : List.of(SilvaConstants.NOVALUE);
this.openingStatuses =
!CollectionUtils.isEmpty(openingStatuses)
? openingStatuses
: List.of(SilvaConstants.NOVALUE);
this.updateDateStart = Objects.isNull(updateDateStart) ? null : updateDateStart.trim();
this.updateDateEnd = Objects.isNull(updateDateEnd) ? null : updateDateEnd.trim();
}

public boolean hasAnyFilter() {
return !SilvaConstants.NOVALUE.equals(bases.get(0))
|| !SilvaConstants.NOVALUE.equals(techniques.get(0))
|| !SilvaConstants.NOVALUE.equals(methods.get(0))
|| isComplete != null
|| !SilvaConstants.NOVALUE.equals(objectives.get(0))
|| !SilvaConstants.NOVALUE.equals(fundingSources.get(0))
|| !SilvaConstants.NOVALUE.equals(orgUnits.get(0))
|| !SilvaConstants.NOVALUE.equals(openingCategories.get(0))
|| (fileId != null && !fileId.isBlank())
|| !SilvaConstants.NOVALUE.equals(clientNumbers.get(0))
|| !SilvaConstants.NOVALUE.equals(openingStatuses.get(0))
|| (updateDateStart != null && !updateDateStart.isBlank())
|| (updateDateEnd != null && !updateDateEnd.isBlank());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package ca.bc.gov.restapi.results.common.dto.activity;

import ca.bc.gov.restapi.results.common.dto.CodeDescriptionDto;
import ca.bc.gov.restapi.results.common.dto.ForestClientDto;
import java.math.BigDecimal;
import java.time.LocalDateTime;

public record ActivitySearchResponseDto(
Long activityId,
CodeDescriptionDto base,
CodeDescriptionDto technique,
CodeDescriptionDto method,
boolean isComplete,
CodeDescriptionDto fundingSource,
String fileId,
String cutBlock,
Long openingId,
String cuttingPermit,
BigDecimal treatmentAmountArea,
String intraAgencyNumber,
CodeDescriptionDto openingCategory,
CodeDescriptionDto orgUnit,
ForestClientDto openingClient,
LocalDateTime updateTimestamp) {}
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package ca.bc.gov.restapi.results.common.endpoint;

import ca.bc.gov.restapi.results.common.dto.activity.ActivitySearchFiltersDto;
import ca.bc.gov.restapi.results.common.dto.activity.ActivitySearchResponseDto;
import ca.bc.gov.restapi.results.common.dto.opening.OpeningSearchExactFiltersDto;
import ca.bc.gov.restapi.results.common.dto.opening.OpeningSearchResponseDto;
import ca.bc.gov.restapi.results.common.exception.MissingSearchParameterException;
import ca.bc.gov.restapi.results.common.service.ActivityService;
import ca.bc.gov.restapi.results.common.service.OpeningSearchService;
import ca.bc.gov.restapi.results.oracle.SilvaOracleConstants;
import java.util.List;
Expand All @@ -24,6 +27,8 @@ public class SearchEndpoint {

private final OpeningSearchService openingSearchService;

private final ActivityService activityService;

/**
* Exact search for Openings with direct value matching on provided filters.
*
Expand Down Expand Up @@ -121,4 +126,44 @@ public Page<OpeningSearchResponseDto> openingSearchExact(

return openingSearchService.openingSearchExact(filtersDto, paginationParameters);
}

@GetMapping("/activities")
public Page<ActivitySearchResponseDto> activitySearch(
@RequestParam(value = "bases", required = false) List<String> bases,
@RequestParam(value = "techniques", required = false) List<String> techniques,
@RequestParam(value = "methods", required = false) List<String> methods,
@RequestParam(value = "isComplete", required = false) Boolean isComplete,
@RequestParam(value = "objectives", required = false) List<String> objectives,
@RequestParam(value = "fundingSources", required = false) List<String> fundingSources,
@RequestParam(value = "orgUnits", required = false) List<String> orgUnits,
@RequestParam(value = "openingCategories", required = false) List<String> openingCategories,
@RequestParam(value = "fileId", required = false) String fileId,
@RequestParam(value = "clientNumbers", required = false) List<String> clientNumbers,
@RequestParam(value = "openingStatuses", required = false) List<String> openingStatuses,
@RequestParam(value = "updateDateStart", required = false) String updateDateStart,
@RequestParam(value = "updateDateEnd", required = false) String updateDateEnd,
@ParameterObject Pageable paginationParameters) {

ActivitySearchFiltersDto filters =
new ActivitySearchFiltersDto(
bases,
techniques,
methods,
isComplete,
objectives,
fundingSources,
orgUnits,
openingCategories,
fileId,
clientNumbers,
openingStatuses,
updateDateStart,
updateDateEnd);

if (!filters.hasAnyFilter()) {
throw new MissingSearchParameterException();
}

return activityService.activitySearch(filters, paginationParameters);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package ca.bc.gov.restapi.results.common.projection;

import java.math.BigDecimal;
import java.time.LocalDateTime;

/** Projection interface used for activity search native queries. */
public interface ActivitySearchProjection {

Long getActivityId();

String getBaseCode();

String getBaseDescription();

String getTechniqueCode();

String getTechniqueDescription();

String getMethodCode();

String getMethodDescription();

Long getIsComplete();

String getFundingSourceCode();

String getFundingSourceDescription();

String getFileId();

String getCutBlock();

Long getOpeningId();

String getCuttingPermit();

BigDecimal getTreatmentAmountArea();

String getIntraAgencyNumber();

String getOpeningCategoryCode();

String getOpeningCategoryDescription();

String getOrgUnitCode();

String getOrgUnitDescription();

String getOpeningClientCode();

Long getTotalCount();

LocalDateTime getUpdateTimestamp();
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package ca.bc.gov.restapi.results.common.repository;

import ca.bc.gov.restapi.results.common.dto.activity.ActivitySearchFiltersDto;
import ca.bc.gov.restapi.results.common.projection.ActivitySearchProjection;
import ca.bc.gov.restapi.results.common.projection.activity.*;
import ca.bc.gov.restapi.results.common.projection.opening.OpeningActivitiesActivitiesProjection;
import ca.bc.gov.restapi.results.common.projection.opening.OpeningActivitiesDisturbanceProjection;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

import java.util.List;
import java.util.Optional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

public interface ActivityTreatmentUnitRepository {
Page<OpeningActivitiesDisturbanceProjection> getOpeningActivitiesDisturbanceByOpeningId(
Expand All @@ -27,4 +28,7 @@ Page<OpeningActivitiesActivitiesProjection> getOpeningActivitiesActivitiesByOpen
Optional<OpeningActivityPruningProjection> getOpeningActivityPR(Long openingId, Long atuId);

Optional<Long> getOpeningActivitySP(Long openingId, Long atuId);

List<ActivitySearchProjection> activitySearch(
ActivitySearchFiltersDto filters, long offset, long size);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package ca.bc.gov.restapi.results.common.service;

import ca.bc.gov.restapi.results.common.dto.activity.ActivitySearchFiltersDto;
import ca.bc.gov.restapi.results.common.dto.activity.ActivitySearchResponseDto;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

public interface ActivityService {
Page<ActivitySearchResponseDto> activitySearch(
ActivitySearchFiltersDto filters, Pageable pagination);
}
Loading
Loading