From 4bf2e658f71e5d0366e955598d74934d626b1348 Mon Sep 17 00:00:00 2001
From: William Oldham <wegg7250@gmail.com>
Date: Wed, 22 Nov 2023 23:14:45 +0000
Subject: [PATCH 1/3] Fix ESLint Ignore for migrations

---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 5350b42..7ebf87f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -13,7 +13,7 @@ module.exports = {
     sourceType: 'module',
   },
   plugins: ['@typescript-eslint'],
-  ignorePatterns: ['./src/db/migrations/**/*'],
+  ignorePatterns: ['src/db/migrations/**/*'],
   rules: {
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

From d3aa4847f89820663978e8f9c51ef23af8266869 Mon Sep 17 00:00:00 2001
From: William Oldham <wegg7250@gmail.com>
Date: Wed, 22 Nov 2023 23:16:52 +0000
Subject: [PATCH 2/3] Update UserSettings primary key to text, to match user

---
 src/db/migrations/.snapshot-movie_web.json   |  4 ++--
 src/db/migrations/Migration20231122231620.ts | 14 ++++++++++++++
 src/db/models/UserSettings.ts                |  5 ++---
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 src/db/migrations/Migration20231122231620.ts

diff --git a/src/db/migrations/.snapshot-movie_web.json b/src/db/migrations/.snapshot-movie_web.json
index 4b40879..4a6d346 100644
--- a/src/db/migrations/.snapshot-movie_web.json
+++ b/src/db/migrations/.snapshot-movie_web.json
@@ -587,12 +587,12 @@
       "columns": {
         "id": {
           "name": "id",
-          "type": "uuid",
+          "type": "text",
           "unsigned": false,
           "autoincrement": false,
           "primary": false,
           "nullable": false,
-          "mappedType": "uuid"
+          "mappedType": "text"
         },
         "application_theme": {
           "name": "application_theme",
diff --git a/src/db/migrations/Migration20231122231620.ts b/src/db/migrations/Migration20231122231620.ts
new file mode 100644
index 0000000..ec603f8
--- /dev/null
+++ b/src/db/migrations/Migration20231122231620.ts
@@ -0,0 +1,14 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20231122231620 extends Migration {
+
+  async up(): Promise<void> {
+    this.addSql('alter table "user_settings" alter column "id" type text using ("id"::text);');
+  }
+
+  async down(): Promise<void> {
+    this.addSql('alter table "user_settings" alter column "id" drop default;');
+    this.addSql('alter table "user_settings" alter column "id" type uuid using ("id"::text::uuid);');
+  }
+
+}
diff --git a/src/db/models/UserSettings.ts b/src/db/models/UserSettings.ts
index 22fbfa3..4014255 100644
--- a/src/db/models/UserSettings.ts
+++ b/src/db/models/UserSettings.ts
@@ -1,10 +1,9 @@
 import { Entity, PrimaryKey, Property } from '@mikro-orm/core';
-import { randomUUID } from 'crypto';
 
 @Entity({ tableName: 'user_settings' })
 export class UserSettings {
-  @PrimaryKey({ name: 'id', type: 'uuid' })
-  id: string = randomUUID();
+  @PrimaryKey({ name: 'id', type: 'text' })
+  id!: string;
 
   @Property({ name: 'application_theme', nullable: true })
   applicationTheme?: string | null;

From 233cb11ac6240d454d731c01b2dcbc4fc9eb7131 Mon Sep 17 00:00:00 2001
From: William Oldham <wegg7250@gmail.com>
Date: Wed, 22 Nov 2023 23:17:01 +0000
Subject: [PATCH 3/3] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2b3ae96..c2a78d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "homepage": "https://github.com/movie-web/backend",
   "engines": {