Skip to content
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.

Sign up for GitHub

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

(chore) t1supplier and producer required for sourcing locations #1052

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

(chore) t1supplier and producer required for sourcing locations #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24f03be
t1supplier and producer required for sourcing locations
alexeh Aug 7, 2023
dc67d8d
require t1supplier/producer create intervention dto
alexeh Aug 7, 2023
f235f38
add unknown supplier to test xlsx
alexeh Aug 7, 2023
62872be
Rollback create supplier within createSourcingLocation
alexeh Aug 7, 2023
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
12 changes: 6 additions & 6 deletions api/src/modules/scenario-interventions/dto/create.scenario-intervention.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,22 +430,22 @@ export class CreateScenarioInterventionDtoV2 {
newIndicatorCoefficients?: IndicatorCoefficientsDtoV2;

@IsUUID()
@IsOptional()
@ApiPropertyOptional({
@IsNotEmpty()
@ApiProperty({
description: `Id of the New Supplier`,
type: String,
example: 'bc5e4933-cd9a-4afc-bd53-56941b8adc111',
})
newT1SupplierId?: string;
newT1SupplierId!: string;

@IsUUID()
@IsOptional()
@ApiPropertyOptional({
@IsNotEmpty()
@ApiProperty({
description: `Id of the New Producer`,
type: String,
example: 'bc5e4933-cd9a-4afc-bd53-56941b8adc222',
})
newProducerId?: string;
newProducerId!: string;

@ValidateIf(
(dto: CreateScenarioInterventionDto) =>
Expand Down
6 changes: 0 additions & 6 deletions api/src/modules/sourcing-locations/dto/sourcing-location-with-record.interface.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions api/src/modules/sourcing-locations/sourcing-location.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export class SourcingLocation extends TimestampedBaseEntity {
t1Supplier: Supplier;

@Index()
@Column({ nullable: true })
@Column()
t1SupplierId?: string;

@ManyToOne(
Expand All @@ -185,7 +185,7 @@ export class SourcingLocation extends TimestampedBaseEntity {
producer: Supplier;

@Index()
@Column({ nullable: true })
@Column()
producerId?: string;

@ManyToOne(
Expand Down
1 change: 1 addition & 0 deletions api/test/entity-mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ async function createSourcingLocation(
additionalData: Partial<SourcingLocation> = {},
): Promise<SourcingLocation> {
const material: Material = await createMaterial();

const defaultData: DeepPartial<SourcingLocation> = {
title: 'test sourcing location',
locationAddressInput: 'pqrst',
Expand Down
Binary file modified api/test/integration/import-data/xlsx-uploads/files/test-base-dataset.xlsx
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions api/test/integration/import-data/xlsx-uploads/sourcing-data-import.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,9 @@ describe('Sourcing Data import', () => {
expect(businessUnitsRoots).toHaveLength(1);

const suppliers: Supplier[] = await supplierRepository.find();
expect(suppliers).toHaveLength(5);
expect(suppliers).toHaveLength(6);
const suppliersRoots: Supplier[] = await supplierRepository.findRoots();
expect(suppliersRoots).toHaveLength(4);
expect(suppliersRoots).toHaveLength(5);

const sourcingRecords: SourcingRecord[] =
await sourcingRecordRepository.find();
Expand Down