Resolve merge conflicts

Giveth · Jul 5, 2023 · 19957e8 · 19957e8
2 parents 930fbf3 + a125988
commit 19957e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/migration/1684071046520-create_qfRound_table.ts b/migration/1684071046520-create_qfRound_table.ts
@@ -6,7 +6,7 @@ export class createQfRoundTable1684071046520 implements MigrationInterface {
             CREATE TABLE "qf_round" (
                 "id" SERIAL NOT NULL,
                 "name" text,
-                "isActive" boolean NOT NULL DEFAULT true,
+                "isActive" boolean,
                 "allocatedFund" integer NOT NULL,
                 "beginDate" timestamp without time zone NOT NULL,
                 "endDate" timestamp without time zone NOT NULL,

diff --git a/src/entities/qfRound.ts b/src/entities/qfRound.ts
@@ -20,12 +20,12 @@ export class QfRound extends BaseEntity {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Field()
+  @Field({ nullable: true })
   @Column('text', { nullable: true })
   name: string;
 
-  @Field()
-  @Column({ default: true })
+  @Field({ nullable: true })
+  @Column({ nullable: true })
   isActive: boolean;
 
   @Field(type => Number)