From 31bebf24438d3c77851465e70be68bfcc174314b Mon Sep 17 00:00:00 2001
From: akm99 <akm99@cornell.edu>
Date: Mon, 15 Apr 2024 17:50:04 -0400
Subject: [PATCH 1/3] merge

---
 src/models/UserModel.ts            | 6 ++++++
 src/repositories/UserRepository.ts | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/models/UserModel.ts b/src/models/UserModel.ts
index 35247e6..8ba799c 100644
--- a/src/models/UserModel.ts
+++ b/src/models/UserModel.ts
@@ -52,6 +52,12 @@ export class UserModel {
   @Column({ type: "text", default: "" })
   bio: string;
 
+  @Column({ unique: true })
+  referralCode: string;
+
+  @Column({ nullable: true })
+  referredBy: Uuid;
+
   @ManyToMany(() => UserModel, (user) => user.blockers)
   @JoinTable({
     name: "user_blocking_users",
diff --git a/src/repositories/UserRepository.ts b/src/repositories/UserRepository.ts
index 4fbe00f..a6a58cc 100644
--- a/src/repositories/UserRepository.ts
+++ b/src/repositories/UserRepository.ts
@@ -104,6 +104,9 @@ export class UserRepository extends AbstractRepository<UserModel> {
     }
     const adminEmails = process.env.ADMIN_EMAILS?.split(",");
     const adminStatus = adminEmails?.includes(email);
+    // Generate a random uuid referral code
+    const referralCode = require('uuid').v4();
+    console.log(referralCode);
 
     const user = new UserModel();
     user.username = username;

From 59f8f1ce70ef6ccfeb11f90adc9d67dd4d760916 Mon Sep 17 00:00:00 2001
From: akm99 <akm99@cornell.edu>
Date: Mon, 15 Apr 2024 17:55:07 -0400
Subject: [PATCH 2/3] merge stashed changes

---
 src/models/UserModel.ts            | 6 ------
 src/repositories/UserRepository.ts | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/src/models/UserModel.ts b/src/models/UserModel.ts
index 8ba799c..35247e6 100644
--- a/src/models/UserModel.ts
+++ b/src/models/UserModel.ts
@@ -52,12 +52,6 @@ export class UserModel {
   @Column({ type: "text", default: "" })
   bio: string;
 
-  @Column({ unique: true })
-  referralCode: string;
-
-  @Column({ nullable: true })
-  referredBy: Uuid;
-
   @ManyToMany(() => UserModel, (user) => user.blockers)
   @JoinTable({
     name: "user_blocking_users",
diff --git a/src/repositories/UserRepository.ts b/src/repositories/UserRepository.ts
index a6a58cc..4fbe00f 100644
--- a/src/repositories/UserRepository.ts
+++ b/src/repositories/UserRepository.ts
@@ -104,9 +104,6 @@ export class UserRepository extends AbstractRepository<UserModel> {
     }
     const adminEmails = process.env.ADMIN_EMAILS?.split(",");
     const adminStatus = adminEmails?.includes(email);
-    // Generate a random uuid referral code
-    const referralCode = require('uuid').v4();
-    console.log(referralCode);
 
     const user = new UserModel();
     user.username = username;

From 1d7eda2d09b4cd7b145a069bacc58838b8c7f73c Mon Sep 17 00:00:00 2001
From: akm99 <akm99@cornell.edu>
Date: Mon, 15 Apr 2024 18:04:31 -0400
Subject: [PATCH 3/3] Make netid nullable

---
 src/migrations/1713218553306-makenetidnullable.ts | 14 ++++++++++++++
 src/models/UserModel.ts                           |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/migrations/1713218553306-makenetidnullable.ts

diff --git a/src/migrations/1713218553306-makenetidnullable.ts b/src/migrations/1713218553306-makenetidnullable.ts
new file mode 100644
index 0000000..3ab4844
--- /dev/null
+++ b/src/migrations/1713218553306-makenetidnullable.ts
@@ -0,0 +1,14 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class makenetidnullable1713218553306 implements MigrationInterface {
+    name = 'makenetidnullable1713218553306'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "User" ALTER COLUMN "netid" DROP NOT NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "User" ALTER COLUMN "netid" SET NOT NULL`);
+    }
+
+}
diff --git a/src/models/UserModel.ts b/src/models/UserModel.ts
index 35247e6..e7f169b 100644
--- a/src/models/UserModel.ts
+++ b/src/models/UserModel.ts
@@ -16,7 +16,7 @@ export class UserModel {
   @Column({ unique: true })
   username: string;
 
-  @Column({ unique: true })
+  @Column({ unique: true, nullable: true })
   netid: string;
 
   @Column()