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

Bugfix/metric context nullable #1625

Merged
merged 3 commits into from
Jun 5, 2024
Merged

Bugfix/metric context nullable #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6f38a5
fix type error in test
bcb37 Jun 5, 2024
f5bda21
Add migration to make metric context nullable
bcb37 Jun 5, 2024
48fd5bd
Merge branch 'dev' into bugfix/metric-context-nullable
bcb37 Jun 5, 2024
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
2 changes: 1 addition & 1 deletion backend/packages/Upgrade/src/api/models/Metric.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class Metric extends BaseModel {
@Column({ type: 'simple-array', nullable: true })
public allowedData: string[];

@Column('text', { array: true })
@Column('text', { array: true, nullable: true })
public context: string[];

@ManyToMany(() => Log, (log) => log.metrics, {
Expand Down
13 changes: 13 additions & 0 deletions backend/packages/Upgrade/src/database/migrations/1717515138666-metricContextNullable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class metricContextNullable1717515138666 implements MigrationInterface {
name = 'metricContextNullable1717515138666';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "metric" ALTER COLUMN "context" DROP NOT NULL`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "metric" ALTER COLUMN "context" SET NOT NULL`);
}
}
2 changes: 1 addition & 1 deletion backend/packages/Upgrade/test/integration/Experiment/analytics/MonitoredPointForExport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default async function LogOperations(): Promise<void> {

await settingService.setClientCheck(false, true, new UpgradeLogger());

await metricService.saveAllMetrics(metrics as any, new UpgradeLogger());
await metricService.saveAllMetrics(metrics as any, experimentObject.context, new UpgradeLogger());

const findMetric = await metricRepository.find();
expect(findMetric.length).toEqual(32);
Expand Down
Loading