search bug fixes

jesuisstan · Oct 14, 2024 · 09a8ef9 · 09a8ef9
1 parent 2cef60c
commit 09a8ef9
Show file tree

Hide file tree

Showing 11 changed files with 977 additions and 208 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -427,5 +427,6 @@
   "user-deleted-successfully": "User deleted successfully",
   "delete": "Delete",
   "delete-account": "Delete account",
-  "are-you-sure": "Are you sure?"
+  "are-you-sure": "Are you sure?",
+  "incorrect-age-range": "Incorrect age range"
 }
diff --git a/locales/fr.json b/locales/fr.json
@@ -424,5 +424,6 @@
   "user-deleted-successfully": "Utilisateur supprimé avec succès",
   "delete": "Supprimer",
   "delete-account": "Supprimer le compte",
-  "are-you-sure": "Êtes-vous sûr?"
+  "are-you-sure": "Êtes-vous sûr?",
+  "incorrect-age-range": "Plage d'âge incorrecte"
 }
diff --git a/locales/ru.json b/locales/ru.json
@@ -157,7 +157,7 @@
     "cyclist": "Велосипедист",
     "dancer": "Танцор",
     "doglover": "Любитель собак",
-    "early-bird": "Ранний пташка",
+    "early-bird": "Ранняя пташка",
     "eco-friendly": "Экологичный",
     "esoteric": "Эзотерический",
     "extrovert": "Экстраверт",
@@ -299,7 +299,7 @@
   "settings": "Настройки",
   "rating": "Флирт Фактор",
   "what-is-this": "Что это?",
-  "rating-description-message": "Флирт Фактор - это рейтинг, который показывает, насколько Вы привлекательны для других пользователей.\nЧем выше рейтинг, тем больше вероятность найти подходящего партнера.\n\nРейтинг рассчитывается на основе:\n - полноты Вашего профиля,\n - количества фотографий,\n - количества лайков, полученных от других пользователей,\n - Вашей ежедневной активности.\n\nЧем активнее Вы, тем выше будет Ваш рейтинг.\nЧем меньше активности, тем ниже рейтингю",
+  "rating-description-message": "Флирт Фактор - это рейтинг, который показывает, насколько Вы привлекательны для других пользователей.\nЧем выше рейтинг, тем больше вероятность найти подходящего партнера.\n\nРейтинг рассчитывается на основе:\n - полноты Вашего профиля,\n - количества фотографий,\n - количества лайков, полученных от других пользователей,\n - Вашей ежедневной активности.\n\nЧем активнее Вы, тем выше будет Ваш рейтинг.\nЧем меньше активности, тем ниже рейтинг.",
   "theme": "Тема",
   "refresh": "Обновить",
   "his-her": " (его/её)",
@@ -424,5 +424,6 @@
   "user-deleted-successfully": "Пользователь успешно удалён",
   "delete": "Удалить",
   "delete-account": "Удалить аккаунт",
-  "are-you-sure": "Вы уверены?"
+  "are-you-sure": "Вы уверены?",
+  "incorrect-age-range": "Неверный диапазон возраста"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/create-table-users.js b/scripts/create-table-users.js
@@ -51,7 +51,7 @@ async function createTables() {
         sex_preferences sex_preferences_enum,
         photos TEXT[] DEFAULT '{}' NOT NULL,
         complete BOOLEAN DEFAULT false,
-        rating INT DEFAULT 21,
+        rating INT DEFAULT 22,
         registration_date TIMESTAMP WITH TIME ZONE,
         last_action TIMESTAMP WITH TIME ZONE,
         online BOOLEAN DEFAULT false,

diff --git a/scripts/fake-users-list-confirmed-female.js b/scripts/fake-users-list-confirmed-female.js
@@ -6697,7 +6697,7 @@ module.exports = function (hashedPassword, yesterday) {
       sex_preferences: 'women',
       registration_date: yesterday.toISOString(),
       online: false,
-      rating: 21,
+      rating: 22,
       biography: 'Environmental activist and nature lover. I love spending time in the wilderness.',
       tags: [
         'eco-friendly',

diff --git a/scripts/fake-users-list-unconfirmed.js b/scripts/fake-users-list-unconfirmed.js
@@ -15,7 +15,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -38,7 +38,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -61,7 +61,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -84,7 +84,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -107,7 +107,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -130,7 +130,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -153,7 +153,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -176,7 +176,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -199,7 +199,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -222,7 +222,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -245,7 +245,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -268,7 +268,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -291,7 +291,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -314,7 +314,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,
@@ -337,7 +337,7 @@ module.exports = function (hashedPassword, yesterday) {
       registration_date: yesterday.toISOString(),
       confirmed: false,
       online: false,
-      rating: 21,
+      rating: 22,
       complete: false,
       sex_preferences: null,
       biography: null,

diff --git a/src/app/[locale]/(dashboard)/search/advanced/page.tsx b/src/app/[locale]/(dashboard)/search/advanced/page.tsx
@@ -139,6 +139,7 @@ const AdvancedSearch = () => {
     setSuccessMessage('');
     if (selectedTags.length === 0) {
       setError('error-no-tags-selected');
+      setIsSidebarOpen(false);
       return;
     }
     setLoading(true);
@@ -375,10 +376,10 @@ const AdvancedSearch = () => {
                       name="distance"
                       placeholder={t(`max`)}
                       value={distance}
-                      errorMessage="0-9999"
+                      errorMessage="0-9969"
                       className="-mb-1 w-20"
                       min={0}
-                      max={9999}
+                      max={9969}
                       onChange={(e) => setValueOfSearchFilter('distance', Number(e.target.value))}
                     />
                     <p className="self-start pt-2">{t('km')}</p>
@@ -398,10 +399,10 @@ const AdvancedSearch = () => {
                     name="age-min"
                     placeholder={t(`from`)}
                     value={ageMin}
-                    errorMessage="18-99"
+                    errorMessage="18-169"
                     className="-mb-1 w-20"
                     min={18}
-                    max={99}
+                    max={169}
                     onChange={(e) => setValueOfSearchFilter('age_min', Number(e.target.value))}
                   />
                   <p className="self-start pt-2">{' - '}</p>
@@ -411,10 +412,10 @@ const AdvancedSearch = () => {
                     name="age-max"
                     placeholder={t(`to`)}
                     value={ageMax}
-                    errorMessage="18-999"
+                    errorMessage="18-169"
                     className="-mb-1 w-20"
                     min={18}
-                    max={999}
+                    max={169}
                     onChange={(e) => setValueOfSearchFilter('age_max', Number(e.target.value))}
                   />
                 </div>

diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.ts
@@ -21,6 +21,11 @@ export async function POST(req: Request) {
     age--;
   }
 
+  // Define default user sex preferences based on his/her sex (bisexual by default)
+  let sexPreferences = 'bisexual';
+  if (sex === 'male') sexPreferences = 'women';
+  if (sex === 'female') sexPreferences = 'men';
+
   // Validate the birthdate
   if (new Date(birthdate) > today) {
     return NextResponse.json({ error: 'invalid-birthdate' }, { status: 400 });
@@ -75,8 +80,8 @@ export async function POST(req: Request) {
 
     // If the email was sent successfully, insert the user into the database
     await client.sql`
-      INSERT INTO users (firstname, lastname, nickname, email, password, birthdate, sex, registration_date, last_action, online, confirmed, service_token)
-      VALUES (${firstname}, ${lastname}, ${nickname}, ${email}, ${hashedPassword}, ${birthdate}, ${sex}, NOW(), NOW(), false, false, ${confirmationToken});
+      INSERT INTO users (firstname, lastname, nickname, email, password, birthdate, sex, registration_date, last_action, online, confirmed, service_token, sex_preferences)
+      VALUES (${firstname}, ${lastname}, ${nickname}, ${email}, ${hashedPassword}, ${birthdate}, ${sex}, NOW(), NOW(), false, false, ${confirmationToken}, ${sexPreferences});
     `;
 
     return NextResponse.json({

diff --git a/src/app/api/avatar/delete/route.ts b/src/app/api/avatar/delete/route.ts
@@ -26,11 +26,11 @@ export async function DELETE(req: Request): Promise<NextResponse> {
       return NextResponse.json({ error: 'failed-to-delete-photo' }, { status: 500 });
     }
 
-    // Step 3: Remove the photo URL from the user's photos[] array in PostgreSQL. Decrease the user's rating by 5 points, but not below 21.
+    // Step 3: Remove the photo URL from the user's photos[] array in PostgreSQL. Decrease the user's rating by 5 points, but not below 22.
     const currentDate = new Date();
     const updateQuery = `
       UPDATE users 
-      SET photos = array_remove(photos, $2), last_action = $3, online = true, rating = GREATEST(rating - 5, 21)
+      SET photos = array_remove(photos, $2), last_action = $3, online = true, rating = GREATEST(rating - 5, 22)
       WHERE id = $1
       RETURNING id, photos, last_action, online, rating;
     `;

diff --git a/src/app/api/search/advanced/route.ts b/src/app/api/search/advanced/route.ts
@@ -29,6 +29,14 @@ export async function POST(request: Request) {
       return NextResponse.json({ error: 'user-not-found' }, { status: 404 });
     }
 
+    if (ageMin < 18) {
+      return NextResponse.json({ error: 'under-18' }, { status: 403 });
+    }
+
+    if (ageMax < ageMin) {
+      return NextResponse.json({ error: 'incorrect-age-range' }, { status: 404 });
+    }
+
     // Update user's last action and set online status to true
     const currentDate = new Date().toISOString();
     const updateQuery = `