From 15bb9139d18ca95b05130a910af0e2e2d9ee36bf Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Wed, 11 Oct 2023 01:35:00 +0300
Subject: [PATCH] New: Sort movies by release dates

---
 .../Movie/Index/Menus/MovieIndexSortMenu.tsx  |  9 ++++
 frontend/src/Store/Actions/movieActions.js    | 52 ++++++++++++++++---
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
index 9803e5c91..98d85dceb 100644
--- a/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
+++ b/frontend/src/Movie/Index/Menus/MovieIndexSortMenu.tsx
@@ -100,6 +100,15 @@ function MovieIndexSortMenu(props: MovieIndexSortMenuProps) {
           {translate('DigitalRelease')}
         </SortMenuItem>
 
+        <SortMenuItem
+          name="releaseDate"
+          sortKey={sortKey}
+          sortDirection={sortDirection}
+          onPress={onSortSelect}
+        >
+          {translate('ReleaseDates')}
+        </SortMenuItem>
+
         <SortMenuItem
           name="tmdbRating"
           sortKey={sortKey}
diff --git a/frontend/src/Store/Actions/movieActions.js b/frontend/src/Store/Actions/movieActions.js
index c679cc838..9f2526492 100644
--- a/frontend/src/Store/Actions/movieActions.js
+++ b/frontend/src/Store/Actions/movieActions.js
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import moment from 'moment';
 import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
 import { filterTypePredicates, filterTypes, sortDirections } from 'Helpers/Props';
@@ -240,16 +241,55 @@ export const sortPredicates = {
     return item.year || undefined;
   },
 
-  inCinemas: function(item) {
-    return item.inCinemas || '';
+  inCinemas: function(item, direction) {
+    if (item.inCinemas) {
+      return moment(item.inCinemas).unix();
+    }
+
+    if (direction === sortDirections.DESCENDING) {
+      return -1 * Number.MAX_VALUE;
+    }
+
+    return Number.MAX_VALUE;
   },
 
-  physicalRelease: function(item) {
-    return item.physicalRelease || '';
+  physicalRelease: function(item, direction) {
+    if (item.physicalRelease) {
+      return moment(item.physicalRelease).unix();
+    }
+
+    if (direction === sortDirections.DESCENDING) {
+      return -1 * Number.MAX_VALUE;
+    }
+
+    return Number.MAX_VALUE;
   },
 
-  digitalRelease: function(item) {
-    return item.digitalRelease || '';
+  digitalRelease: function(item, direction) {
+    if (item.digitalRelease) {
+      return moment(item.digitalRelease).unix();
+    }
+
+    if (direction === sortDirections.DESCENDING) {
+      return -1 * Number.MAX_VALUE;
+    }
+
+    return Number.MAX_VALUE;
+  },
+
+  releaseDate: function(item, direction) {
+    const { inCinemas, digitalRelease, physicalRelease } = item;
+    const releaseDate = digitalRelease || physicalRelease || inCinemas;
+
+    if (releaseDate) {
+      return moment(releaseDate).unix();
+    }
+
+    if (direction === sortDirections.DESCENDING) {
+      return -1 * Number.MAX_VALUE;
+    }
+
+    return Number.MAX_VALUE;
   }
 };