Skip to content

[MERGE] main -> staging post EE release #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
901b6b4
[TM-1995] Add TM-1995-migrate-project-pitches-be-v3
Scriptmatico Apr 30, 2025
611558a
[TM-1995] feat: enhance ProjectPitchDto and service with additional p…
Scriptmatico May 1, 2025
0cb9a66
[TM-1995] feat: implement user-specific project pitch retrieval and e…
Scriptmatico May 1, 2025
941898a
[TM-1995] feat: add id property to ProjectPitchDto and enhance contro…
Scriptmatico May 2, 2025
9b86726
[TM-1995] feat: enhance getPitches method to accept pagination and se…
Scriptmatico May 2, 2025
06d63c5
[TM-1995] feat: enhance project pitch retrieval with pagination and s…
Scriptmatico May 5, 2025
2cbffc0
[TM-1995] feat: update pagination parameters in project pitch service…
Scriptmatico May 5, 2025
fed6f65
[TM-1995] add project-pitches.controller.spec.ts
Scriptmatico May 6, 2025
07c2af5
[TM-1995] feat: update getProjectPitches method to validate user exis…
Scriptmatico May 6, 2025
518898a
[TM-1995] feat: update getPitches and getAdminPitches methods to incl…
Scriptmatico May 6, 2025
233f29c
[TM-1995] feat: refactor project pitch service and controller to use …
Scriptmatico May 7, 2025
f116c5d
[TM-1995] feat: update project pitch service and controller to use En…
Scriptmatico May 7, 2025
371a193
[TM-1995] test: enhance admin project pitches controller tests for su…
Scriptmatico May 7, 2025
2bf1ad6
[TM-1995] feat: simplify pagination parameter setup in project pitch …
Scriptmatico May 8, 2025
e19e298
[TM-1995] Merge branch 'staging' into feat/TM-1995-migrate-project-pi…
Scriptmatico May 8, 2025
f61666c
[TM-1995] refactor: remove unused import from project pitch service
Scriptmatico May 8, 2025
2862f3b
[TM-1995] refactor: update import path for Organisation entity in pro…
Scriptmatico May 8, 2025
ac8c69a
[TM-1995] refactor: migrate project pitch service to use new query DT…
Scriptmatico May 12, 2025
e4d3275
[TM-1995] feat: add optional createdAt field to project pitch DTO and…
Scriptmatico May 12, 2025
31f8197
[TM-1995] refactor: update filter and sort keys in project pitch serv…
Scriptmatico May 13, 2025
8a708c9
[TM-1995] refactor: update ProjectPitch policy integration and fix fi…
Scriptmatico May 13, 2025
6fdb82c
[TM-1995] refactor: update import path for ProjectPitchPolicy in poli…
Scriptmatico May 13, 2025
84a7800
[TM-1995] refactor: improve project pitch service error handling and …
Scriptmatico May 14, 2025
aa065bd
[TM-2050] use values or localization keys for mail
pachonjcl May 15, 2025
77ea3b8
Merge pull request #156 from wri/feat/TM-1995-migrate-project-pitches…
Scriptmatico May 15, 2025
6c7eff1
Merge pull request #166 from wri/fix/TM-2050_email_verification_missi…
pachonjcl May 15, 2025
15bb00b
[TM-1995] Fix name of column on project pitches.
roguenet May 19, 2025
bf38519
[TM-1995] Fix name of column on project pitches.
roguenet May 19, 2025
6d2c898
Merge pull request #169 from wri/feat/TM-1995-fix-project-pitch-column
roguenet May 19, 2025
61979a2
Merge pull request #165 from wri/release/elegant-emerald
Scriptmatico May 19, 2025
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
7 changes: 5 additions & 2 deletions apps/entity-service/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,20 @@ import { EntitiesService } from "./entities/entities.service";
import { EntitiesController } from "./entities/entities.controller";
import { EntityAssociationsController } from "./entities/entity-associations.controller";
import { HealthModule } from "@terramatch-microservices/common/health/health.module";
import { ProjectPitchesController } from "./entities/project-pitches.controller";
import { ProjectPitchService } from "./entities/project-pitch.service";

@Module({
imports: [SentryModule.forRoot(), CommonModule, HealthModule],
controllers: [EntitiesController, EntityAssociationsController, TreesController],
controllers: [ProjectPitchesController, EntitiesController, EntityAssociationsController, TreesController],
providers: [
{
provide: APP_FILTER,
useClass: SentryGlobalFilter
},
EntitiesService,
TreeService
TreeService,
ProjectPitchService
]
})
export class AppModule {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { ApiProperty } from "@nestjs/swagger";

export class ProjectPitchParamDto {
@ApiProperty({ description: "Entity UUID for association" })
uuid: string;
}
39 changes: 39 additions & 0 deletions apps/entity-service/src/entities/dto/project-pitch-query.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { ApiProperty, IntersectionType } from "@nestjs/swagger";
import { IsEnum, IsOptional, ValidateNested } from "class-validator";
import { NumberPage } from "@terramatch-microservices/common/dto/page.dto";

class QuerySort {
@ApiProperty({ name: "sort[field]", required: false })
@IsOptional()
field?: string;

@ApiProperty({ name: "sort[direction]", required: false, enum: ["ASC", "DESC"], default: "ASC" })
@IsEnum(["ASC", "DESC"])
@IsOptional()
direction?: "ASC" | "DESC";
}

class FilterItem {
[key: string]: string | undefined;
}

export class ProjectPitchQueryDto extends IntersectionType(QuerySort, NumberPage) {
@ValidateNested()
@IsOptional()
page?: NumberPage;

@ValidateNested()
@IsOptional()
sort?: QuerySort;

@ApiProperty({ required: false })
@IsOptional()
search?: string;

@ApiProperty({
required: false,
description: "Search query used for filtering selectable options in autocomplete fields."
})
@IsOptional()
filter?: FilterItem;
}
Loading
Loading