From 0af29a378a98417856e96dd7a6f296ae69095f4a Mon Sep 17 00:00:00 2001
From: Oleg Ivasenko <ivasenko.oleg@gmail.com>
Date: Fri, 13 Sep 2024 17:09:32 +0000
Subject: [PATCH] use asciiOnlyToLowerCase to match lower function behaviour of
 SQLite

---
 server/models/Author.js | 27 ++++++++-------------------
 server/models/Series.js | 27 ++++++++-------------------
 2 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/server/models/Author.js b/server/models/Author.js
index 7115a85e..40e7f75a 100644
--- a/server/models/Author.js
+++ b/server/models/Author.js
@@ -1,5 +1,6 @@
 const { DataTypes, Model, where, fn, col } = require('sequelize')
 const parseNameString = require('../utils/parsers/parseNameString')
+const { asciiOnlyToLowerCase } = require('../utils/index')
 
 class Author extends Model {
   constructor(values, options) {
@@ -53,26 +54,14 @@ class Author extends Model {
    * @returns {Promise<Author>}
    */
   static async getByNameAndLibrary(authorName, libraryId) {
-    const containsOnlyASCII = /^[\u0000-\u007f]*$/.test(authorName)
-
-    // SQLite does not support lower with non-Unicode chars
-    if (!containsOnlyASCII) {
-      return this.findOne({
-        where: {
-          name: authorName,
-          libraryId: libraryId
+    return this.findOne({
+      where: [
+        where(fn('lower', col('name')), asciiOnlyToLowerCase(authorName)),
+        {
+          libraryId
         }
-      })
-    } else {
-      return this.findOne({
-        where: [
-          where(fn('lower', col('name')), authorName.toLowerCase()),
-          {
-            libraryId
-          }
-        ]
-      })
-    }
+      ]
+    })
   }
 
   /**
diff --git a/server/models/Series.js b/server/models/Series.js
index 9eab76b9..dc8d110f 100644
--- a/server/models/Series.js
+++ b/server/models/Series.js
@@ -1,6 +1,7 @@
 const { DataTypes, Model, where, fn, col } = require('sequelize')
 
 const { getTitlePrefixAtEnd } = require('../utils/index')
+const { asciiOnlyToLowerCase } = require('../utils/index')
 
 class Series extends Model {
   constructor(values, options) {
@@ -39,26 +40,14 @@ class Series extends Model {
    * @returns {Promise<Series>}
    */
   static async getByNameAndLibrary(seriesName, libraryId) {
-    const containsOnlyASCII = /^[\u0000-\u007f]*$/.test(authorName)
-
-    // SQLite does not support lower with non-Unicode chars
-    if (!containsOnlyASCII) {
-      return this.findOne({
-        where: {
-          name: seriesName,
-          libraryId: libraryId
+    return this.findOne({
+      where: [
+        where(fn('lower', col('name')), asciiOnlyToLowerCase(seriesName)),
+        {
+          libraryId
         }
-      })
-    } else {
-      return this.findOne({
-        where: [
-          where(fn('lower', col('name')), seriesName.toLowerCase()),
-          {
-            libraryId
-          }
-        ]
-      })
-    }
+      ]
+    })
   }
 
   /**