From 745afd9dbde30e8295a9cf7fb6c5bde156a7eeda Mon Sep 17 00:00:00 2001
From: Edward Tirado Jr <ed@etdevelopment.net>
Date: Wed, 23 Apr 2025 16:06:58 -0500
Subject: [PATCH 01/26] moved omdb key to settings file

---
 movie_db/db_providers/omdb.py | 5 +++--
 movienight/settings.py        | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/movie_db/db_providers/omdb.py b/movie_db/db_providers/omdb.py
index 7db8f1e..2041126 100644
--- a/movie_db/db_providers/omdb.py
+++ b/movie_db/db_providers/omdb.py
@@ -1,5 +1,7 @@
 import os
 
+from django.conf import settings
+
 from movie_db.movie_db import MovieDB
 import requests
 
@@ -8,8 +10,7 @@ from movie_db.serializers import MovieSerializer, MovieResultSerializer
 
 class OMDb(MovieDB):
     def __init__(self):
-        api_key = os.getenv("OMDB_API_KEY")
-        self.api_key = f"{api_key}"
+        self.api_key = settings.OMDB_API_KEY
         self.base_url = "https://www.omdbapi.com/?apikey=" + self.api_key
         super().__init__()
 
diff --git a/movienight/settings.py b/movienight/settings.py
index 4fcd523..74f4921 100644
--- a/movienight/settings.py
+++ b/movienight/settings.py
@@ -126,6 +126,8 @@ USE_I18N = True
 
 USE_TZ = True
 
+OMDB_API_KEY = os.environ.get("OMDB_API_KEY")
+
 # Django Rest Framework
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": [

From 4c43266c97a86f6dbe16b05a3f28b11d1b4aede0 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Sun, 27 Apr 2025 00:44:03 -0500
Subject: [PATCH 02/26] updated .env example

---
 .env.example | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.env.example b/.env.example
index 8a2d2bb..ea10291 100644
--- a/.env.example
+++ b/.env.example
@@ -13,3 +13,5 @@ DATABASE_USERNAME=admin
 DATABASE_PASSWORD=super_secret_password
 SECRET_KEY=your_django_secret_key
 DJANGO_SECRET_KEY=your_django_secret_key
+# You can get a free key here: https://www.omdbapi.com/apikey.aspx
+OMDB_API_KEY=your_omdb_api_key

From 69dd381e822a24ff6c9c4f5e54ec028ff0a7d7b2 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 8 May 2025 18:03:28 -0500
Subject: [PATCH 03/26] .idea updates

---
 .idea/misc.xml           | 2 +-
 .idea/movie-night-py.iml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9f60641..3adcd12 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,5 +5,5 @@
     <option name="enabledOnSave" value="true" />
     <option name="sdkName" value="Python 3.13 (api)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (api)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (movie-night-api)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/movie-night-py.iml b/.idea/movie-night-py.iml
index f13645b..a8016fc 100644
--- a/.idea/movie-night-py.iml
+++ b/.idea/movie-night-py.iml
@@ -17,7 +17,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
       <excludeFolder url="file://$MODULE_DIR$/.venv1" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.13 (api)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.13 (movie-night-api)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

From 65274b5de6609bf26b9d570fb9ad816bc0ae35b8 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 8 May 2025 18:03:38 -0500
Subject: [PATCH 04/26] updated .env example

---
 .env.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.example b/.env.example
index ea10291..128f832 100644
--- a/.env.example
+++ b/.env.example
@@ -11,7 +11,10 @@ DATABASE_HOST=movienight-db
 DATABASE_NAME=movienight
 DATABASE_USERNAME=admin
 DATABASE_PASSWORD=super_secret_password
+
+# Django key generator: https://djecrety.ir/
 SECRET_KEY=your_django_secret_key
 DJANGO_SECRET_KEY=your_django_secret_key
+
 # You can get a free key here: https://www.omdbapi.com/apikey.aspx
 OMDB_API_KEY=your_omdb_api_key

From 3085be7fd1cbcda1818722bad4eea2a03667563e Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 29 May 2025 13:21:28 -0500
Subject: [PATCH 05/26] .idea updates

---
 .idea/misc.xml           | 2 +-
 .idea/movie-night-py.iml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3adcd12..9a8f74c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,5 +5,5 @@
     <option name="enabledOnSave" value="true" />
     <option name="sdkName" value="Python 3.13 (api)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (movie-night-api)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/movie-night-py.iml b/.idea/movie-night-py.iml
index a8016fc..7a7a8e5 100644
--- a/.idea/movie-night-py.iml
+++ b/.idea/movie-night-py.iml
@@ -17,7 +17,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
       <excludeFolder url="file://$MODULE_DIR$/.venv1" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.13 (movie-night-api)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

From c45b3e2e188a5316c603754d41324c056c6c7fef Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 29 May 2025 13:21:42 -0500
Subject: [PATCH 06/26] fixed schedule bug

---
 movie_manager/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/movie_manager/views.py b/movie_manager/views.py
index 78d5412..7c5c1e9 100644
--- a/movie_manager/views.py
+++ b/movie_manager/views.py
@@ -142,7 +142,9 @@ class ScheduleViewset(viewsets.ModelViewSet):
     def retrieve(self, request, pk=None, *args, **kwargs):
         # Get the schedule instance
         instance = self.get_object()
-        today = datetime.datetime.now()
+        now = datetime.datetime.now()
+        # get time from start of day
+        today = datetime.datetime(now.year, now.month, now.day)
 
         upcoming_showings = Showing.objects.filter(
             showtime__gte=today, schedule=instance

From e17e95df043a71799d45d62a83568ef72bac7d68 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 29 May 2025 13:58:00 -0500
Subject: [PATCH 07/26] fixed hide schedule bug

---
 movie_manager/serializers.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/movie_manager/serializers.py b/movie_manager/serializers.py
index 75d451c..dc3cff1 100644
--- a/movie_manager/serializers.py
+++ b/movie_manager/serializers.py
@@ -5,9 +5,28 @@ from movie_manager.models import Movie, MovieList, Schedule, Showing
 
 
 class MovieSerializer(serializers.ModelSerializer):
+    has_been_scheduled = serializers.SerializerMethodField()
+
     class Meta:
         model = Movie
-        fields = "__all__"
+        fields = [
+            "id",
+            "title",
+            "imdb_id",
+            "year",
+            "director",
+            "actors",
+            "plot",
+            "genre",
+            "mpaa_rating",
+            "critic_scores",
+            "poster",
+            "added_by_id",
+            "has_been_scheduled",
+        ]
+
+    def get_has_been_scheduled(self, obj):
+        return len(Showing.objects.filter(movie_id=obj.id).all()) > 0
 
 
 class MovieListSerializer(serializers.ModelSerializer):

From 2b073c57059ba05f44f3c6bfb6a7f1a76596294a Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Tue, 3 Jun 2025 00:10:32 -0500
Subject: [PATCH 08/26] updated docker to use development server for live
 reloading

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e94a7e1..e6d5f42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,4 +35,4 @@ USER web
 
 EXPOSE 8000
 
-CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--workers", "3", "movienight.wsgi:application"]
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
\ No newline at end of file

From b25f5c66e1d70433c1e95f44924bb13b01746a8f Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Tue, 3 Jun 2025 00:11:30 -0500
Subject: [PATCH 09/26] added fields to admin pages

---
 movie_manager/admin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/movie_manager/admin.py b/movie_manager/admin.py
index b199e47..883114f 100644
--- a/movie_manager/admin.py
+++ b/movie_manager/admin.py
@@ -6,19 +6,19 @@ from movie_manager.models import Movie, MovieList, Schedule, Showing
 # Register your models here.
 @admin.register(Movie)
 class MovieAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["title", "imdb_id", "added_by"]
 
 
 @admin.register(MovieList)
 class MovieListAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["name", "owner"]
 
 
 @admin.register(Schedule)
 class ScheduleAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["name", "owner"]
 
 
 @admin.register(Showing)
 class ShowingAdmin(admin.ModelAdmin):
-    pass
+    list_display = ["showtime", "movie"]

From 9dce0f1ec4cfc30188df0fea7a2ab28d78ef43d2 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Mon, 30 Jun 2025 15:35:39 -0500
Subject: [PATCH 10/26] added better error handling to movie search

---
 movie_db/views.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/movie_db/views.py b/movie_db/views.py
index 602e418..d46540f 100644
--- a/movie_db/views.py
+++ b/movie_db/views.py
@@ -3,10 +3,24 @@ from movie_db.db_providers.omdb import OMDb
 
 
 def omdb_search(request):
+    print("ENTERING MOVIE SEARCH")
     query = request.GET.get("q")
     if not query:
         return JsonResponse({"Error": "Missing query"}, status=400)
 
     search_type = request.GET.get("type")
     omdb = OMDb()
-    return JsonResponse(omdb.search(query, {"type": search_type}), safe=False)
+
+    results = omdb.search(query, {"type": search_type})
+    if "error" in results:
+        return parse_error(results)
+
+    return JsonResponse(results, safe=False)
+
+
+def parse_error(results):
+    error_json = results["error"]
+    if "Error" in error_json and error_json["Error"] == "Movie not found!":
+        return JsonResponse({}, status=404)
+    else:
+        return JsonResponse("Error while searching for movie.", status=500)
\ No newline at end of file

From f8b4fa4a0e5b6d7198f00075705aa0368d8adde6 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Mon, 30 Jun 2025 15:37:37 -0500
Subject: [PATCH 11/26] removed debug print

---
 movie_db/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/movie_db/views.py b/movie_db/views.py
index d46540f..536c6e5 100644
--- a/movie_db/views.py
+++ b/movie_db/views.py
@@ -3,7 +3,6 @@ from movie_db.db_providers.omdb import OMDb
 
 
 def omdb_search(request):
-    print("ENTERING MOVIE SEARCH")
     query = request.GET.get("q")
     if not query:
         return JsonResponse({"Error": "Missing query"}, status=400)

From 6651be3458cc81529de88e4dc859aa564be5ecf7 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Mon, 30 Jun 2025 17:08:47 -0500
Subject: [PATCH 12/26] updated db queries for performance improvement

---
 movie_manager/serializers.py | 11 +++++++++--
 movie_manager/views.py       |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/movie_manager/serializers.py b/movie_manager/serializers.py
index dc3cff1..07cc417 100644
--- a/movie_manager/serializers.py
+++ b/movie_manager/serializers.py
@@ -26,19 +26,26 @@ class MovieSerializer(serializers.ModelSerializer):
         ]
 
     def get_has_been_scheduled(self, obj):
-        return len(Showing.objects.filter(movie_id=obj.id).all()) > 0
+        return Showing.objects.filter(movie_id=obj.id).exists()
 
 
 class MovieListSerializer(serializers.ModelSerializer):
     movie_count = serializers.SerializerMethodField()
     movies = MovieSerializer(read_only=True, many=True)
+    serializer_class = MovieSerializer
+
+    def get_queryset(self):
+        return MovieList.objects.prefetch_related(
+            "movies",
+            "movies__showing_set"
+        )
 
     class Meta:
         model = MovieList
         fields = ["id", "name", "owner", "public", "movies", "movie_count"]
 
     def get_movie_count(self, obj):
-        return len(obj.movies.all())
+        return obj.movies.count()
 
 
 class UserSerializer(serializers.Serializer):
diff --git a/movie_manager/views.py b/movie_manager/views.py
index 7c5c1e9..0a3dbe9 100644
--- a/movie_manager/views.py
+++ b/movie_manager/views.py
@@ -55,7 +55,7 @@ class MovieViewset(viewsets.ModelViewSet):
 
 
 class MovieListViewset(viewsets.ModelViewSet):
-    queryset = MovieList.objects.all().order_by("name")
+    queryset = MovieList.objects.prefetch_related("movies").order_by("name")
     authentication_classes = [TokenAuthentication]
     permission_classes = [permissions.IsAuthenticated | ReadOnly]
 

From 54cdeb56afbec3fe465db66ff8dde41192a68f2a Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Mon, 30 Jun 2025 17:30:41 -0500
Subject: [PATCH 13/26] added new lighter serializer for list of movielists

---
 movie_manager/serializers.py | 15 +++++++++++----
 movie_manager/views.py       | 20 +++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/movie_manager/serializers.py b/movie_manager/serializers.py
index 07cc417..cb39648 100644
--- a/movie_manager/serializers.py
+++ b/movie_manager/serializers.py
@@ -28,9 +28,18 @@ class MovieSerializer(serializers.ModelSerializer):
     def get_has_been_scheduled(self, obj):
         return Showing.objects.filter(movie_id=obj.id).exists()
 
+class MovieListListSerializer(serializers.ModelSerializer):
+    movie_count = serializers.SerializerMethodField()
+
+    class Meta:
+        model = MovieList
+        fields = ["id", "name", "owner", "public", "movie_count"]
+
+    def get_movie_count(self, obj):
+        return obj.movies.count()
+
 
 class MovieListSerializer(serializers.ModelSerializer):
-    movie_count = serializers.SerializerMethodField()
     movies = MovieSerializer(read_only=True, many=True)
     serializer_class = MovieSerializer
 
@@ -42,10 +51,8 @@ class MovieListSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = MovieList
-        fields = ["id", "name", "owner", "public", "movies", "movie_count"]
+        fields = ["id", "name", "owner", "public", "movies"]
 
-    def get_movie_count(self, obj):
-        return obj.movies.count()
 
 
 class UserSerializer(serializers.Serializer):
diff --git a/movie_manager/views.py b/movie_manager/views.py
index 0a3dbe9..973a488 100644
--- a/movie_manager/views.py
+++ b/movie_manager/views.py
@@ -16,7 +16,7 @@ from movie_manager.serializers import (
     MovieListSerializer,
     MovieSerializer,
     ScheduleSerializer,
-    ShowingSerializer,
+    ShowingSerializer, MovieListListSerializer,
 )
 
 
@@ -55,11 +55,25 @@ class MovieViewset(viewsets.ModelViewSet):
 
 
 class MovieListViewset(viewsets.ModelViewSet):
-    queryset = MovieList.objects.prefetch_related("movies").order_by("name")
+    queryset = MovieList.objects.all()
     authentication_classes = [TokenAuthentication]
     permission_classes = [permissions.IsAuthenticated | ReadOnly]
 
-    serializer_class = MovieListSerializer
+    def get_serializer_class(self):
+        if self.action == "list":
+            return MovieListListSerializer
+        else:
+            return MovieListSerializer
+
+    def get_queryset(self):
+        if self.action == "list":
+            return MovieList.objects.filter(owner=self.request.user)
+        else:
+            return MovieList.objects.prefetch_related(
+                "movies",
+                "movies__showing_set"
+            ).order_by("name")
+
 
     def create(self, request, *args, **kwargs):
         movie_list = MovieList.objects.create(

From 8f4a155c06699eb85a4d03f286051536244efa06 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Mon, 30 Jun 2025 18:15:56 -0500
Subject: [PATCH 14/26] updated permissions for list

---
 movie_manager/serializers.py |  1 +
 movie_manager/views.py       | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/movie_manager/serializers.py b/movie_manager/serializers.py
index cb39648..3b7a517 100644
--- a/movie_manager/serializers.py
+++ b/movie_manager/serializers.py
@@ -42,6 +42,7 @@ class MovieListListSerializer(serializers.ModelSerializer):
 class MovieListSerializer(serializers.ModelSerializer):
     movies = MovieSerializer(read_only=True, many=True)
     serializer_class = MovieSerializer
+    owner = serializers.PrimaryKeyRelatedField(read_only=True)
 
     def get_queryset(self):
         return MovieList.objects.prefetch_related(
diff --git a/movie_manager/views.py b/movie_manager/views.py
index 973a488..2d606ea 100644
--- a/movie_manager/views.py
+++ b/movie_manager/views.py
@@ -1,9 +1,10 @@
 import datetime
-import json
 
+from django.db.models import QuerySet
 from django.http import JsonResponse
 from django.contrib.auth.models import User
 from django.utils.dateparse import parse_datetime
+from django.db import models
 from rest_framework import permissions, viewsets
 from knox.auth import TokenAuthentication
 from rest_framework.decorators import action, api_view
@@ -66,14 +67,29 @@ class MovieListViewset(viewsets.ModelViewSet):
             return MovieListSerializer
 
     def get_queryset(self):
+        base_qs = MovieList.objects.all()
+
         if self.action == "list":
-            return MovieList.objects.filter(owner=self.request.user)
+            if self.request.user.is_authenticated:
+                return base_qs.filter(
+                    models.Q(public=True) |
+                    models.Q(owner=self.request.user)
+                ).order_by("name")
+
+            return base_qs.filter(public=True).order_by("name")
         else:
             return MovieList.objects.prefetch_related(
                 "movies",
                 "movies__showing_set"
             ).order_by("name")
 
+    def perform_create(self, serializer):
+        serializer.save(owner=self.request.user)
+
+    def get_permissions(self):
+        if self.action in ['update', 'partial_update', 'destroy']:
+            self.permission_classes = [permissions.IsAuthenticated]
+        return super().get_permissions()
 
     def create(self, request, *args, **kwargs):
         movie_list = MovieList.objects.create(

From 83982877c3a6c7cde75644b30200f6c562549411 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Wed, 2 Jul 2025 16:09:38 -0500
Subject: [PATCH 15/26] .idea updates

---
 .idea/dictionaries/project.xml | 8 ++++++++
 .idea/misc.xml                 | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .idea/dictionaries/project.xml

diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
new file mode 100644
index 0000000..779eda8
--- /dev/null
+++ b/.idea/dictionaries/project.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="project">
+    <words>
+      <w>mpaa</w>
+      <w>viewset</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9a8f74c..f6f7e02 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,9 @@
   <component name="Black">
     <option name="enabledOnReformat" value="true" />
     <option name="enabledOnSave" value="true" />
-    <option name="sdkName" value="Python 3.13 (api)" />
+    <option name="executionMode" value="BINARY" />
+    <option name="pathToExecutable" value="$USER_HOME$/.local/bin/black" />
+    <option name="sdkName" value="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" />
   </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file

From 2e7dbe4ddc4ce70ea4ac3251d0100b90e916d914 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Wed, 2 Jul 2025 16:58:44 -0500
Subject: [PATCH 16/26] reorganized viewsets into their own files

---
 movie_manager/permissions.py         |   6 +
 movie_manager/views.py               | 235 ---------------------------
 movie_manager/viewsets/__init__.py   |  11 ++
 movie_manager/viewsets/movie.py      |  37 +++++
 movie_manager/viewsets/movie_list.py | 120 ++++++++++++++
 movie_manager/viewsets/schedule.py   |  58 +++++++
 movie_manager/viewsets/showing.py    |  36 ++++
 movienight/urls.py                   |  24 ++-
 requirements.txt                     |   2 +-
 users/views.py                       |  35 +---
 users/viewsets/__init__.py           |   4 +
 users/viewsets/group.py              |  13 ++
 users/viewsets/user.py               |  26 +++
 13 files changed, 330 insertions(+), 277 deletions(-)
 create mode 100644 movie_manager/permissions.py
 create mode 100644 movie_manager/viewsets/__init__.py
 create mode 100644 movie_manager/viewsets/movie.py
 create mode 100644 movie_manager/viewsets/movie_list.py
 create mode 100644 movie_manager/viewsets/schedule.py
 create mode 100644 movie_manager/viewsets/showing.py
 create mode 100644 users/viewsets/__init__.py
 create mode 100644 users/viewsets/group.py
 create mode 100644 users/viewsets/user.py

diff --git a/movie_manager/permissions.py b/movie_manager/permissions.py
new file mode 100644
index 0000000..3dae833
--- /dev/null
+++ b/movie_manager/permissions.py
@@ -0,0 +1,6 @@
+from rest_framework import permissions
+from rest_framework.permissions import SAFE_METHODS
+
+class ReadOnly(permissions.BasePermission):
+    def has_permission(self, request, view):
+        return request.method in SAFE_METHODS
diff --git a/movie_manager/views.py b/movie_manager/views.py
index 2d606ea..e69de29 100644
--- a/movie_manager/views.py
+++ b/movie_manager/views.py
@@ -1,235 +0,0 @@
-import datetime
-
-from django.db.models import QuerySet
-from django.http import JsonResponse
-from django.contrib.auth.models import User
-from django.utils.dateparse import parse_datetime
-from django.db import models
-from rest_framework import permissions, viewsets
-from knox.auth import TokenAuthentication
-from rest_framework.decorators import action, api_view
-from rest_framework.exceptions import NotFound
-from rest_framework.permissions import AllowAny, SAFE_METHODS
-
-from movie_db.db_providers.omdb import OMDb
-from movie_manager.models import Movie, MovieList, Schedule, Showing
-from movie_manager.serializers import (
-    MovieListSerializer,
-    MovieSerializer,
-    ScheduleSerializer,
-    ShowingSerializer, MovieListListSerializer,
-)
-
-
-class ReadOnly(permissions.BasePermission):
-    def has_permission(self, request, view):
-        return request.method in SAFE_METHODS
-
-
-# Create your views here.
-class MovieViewset(viewsets.ModelViewSet):
-    queryset = Movie.objects.all().order_by("title")
-    authentication_classes = [TokenAuthentication]
-    permission_classes = [permissions.IsAuthenticated]
-
-    serializer_class = MovieSerializer
-
-    def update(self, request, pk=None, *args, **kwargs):
-        omdb = OMDb()
-        updated_movie = omdb.search(request.data.get("imdb_id"), {"type": "imdb_id"})
-
-        movie = Movie.objects.get(pk=pk)
-
-        movie.title = updated_movie["title"]
-        movie.actors = updated_movie["actors"]
-        movie.year = updated_movie["year"]
-        movie.critic_scores = updated_movie["critic_scores"]
-        movie.mpaa_rating = updated_movie["mpaa_rating"]
-        movie.director = updated_movie["director"]
-        movie.poster = updated_movie["poster"]
-        movie.plot = updated_movie["plot"]
-        movie.genre = updated_movie["genre"]
-
-        movie.save()
-
-        return JsonResponse(MovieSerializer(movie).data)
-
-
-class MovieListViewset(viewsets.ModelViewSet):
-    queryset = MovieList.objects.all()
-    authentication_classes = [TokenAuthentication]
-    permission_classes = [permissions.IsAuthenticated | ReadOnly]
-
-    def get_serializer_class(self):
-        if self.action == "list":
-            return MovieListListSerializer
-        else:
-            return MovieListSerializer
-
-    def get_queryset(self):
-        base_qs = MovieList.objects.all()
-
-        if self.action == "list":
-            if self.request.user.is_authenticated:
-                return base_qs.filter(
-                    models.Q(public=True) |
-                    models.Q(owner=self.request.user)
-                ).order_by("name")
-
-            return base_qs.filter(public=True).order_by("name")
-        else:
-            return MovieList.objects.prefetch_related(
-                "movies",
-                "movies__showing_set"
-            ).order_by("name")
-
-    def perform_create(self, serializer):
-        serializer.save(owner=self.request.user)
-
-    def get_permissions(self):
-        if self.action in ['update', 'partial_update', 'destroy']:
-            self.permission_classes = [permissions.IsAuthenticated]
-        return super().get_permissions()
-
-    def create(self, request, *args, **kwargs):
-        movie_list = MovieList.objects.create(
-            name=request.data.get("name"),
-            owner=request.user,
-        )
-
-        return JsonResponse(MovieListSerializer(movie_list).data)
-
-    def update(self, request, pk=None, *args, **kwargs):
-        movie_list = MovieList.objects.get(pk=pk)
-        movie_list.name = request.data.get("name")
-        movie_list.owner = User.objects.get(pk=request.data.get("owner"))
-
-        if request.data.get("movies"):
-            movie_ids = request.data.get("movies")
-            for movie_id in movie_ids:
-                try:
-                    movie = Movie.objects.get(pk=movie_id)
-                    movie_list.movies.add(movie)
-                except Movie.DoesNotExist:
-                    raise NotFound(f"Movie {movie_id} does not exist")
-
-            removed_movies = Movie.objects.exclude(id__in=movie_ids)
-            for removed_movie in removed_movies:
-                removed_movie.delete()
-
-        movie_list.save()
-
-        return JsonResponse(MovieListSerializer(movie_list).data)
-
-    @action(
-        detail=True, methods=["put", "delete"], url_path="movie/(?P<imdb_id>tt[0-9]+)"
-    )
-    def add_movie(self, request, pk=None, imdb_id=None, *args, **kwargs):
-        if request.method == "DELETE":
-            return self.remove_movie(request, pk, imdb_id)
-
-        movie_list = MovieList.objects.get(pk=pk)
-        try:
-            new_movie = Movie.objects.get(imdb_id=imdb_id)
-        except Movie.DoesNotExist:
-            omdb = OMDb()
-            movie = omdb.search(imdb_id, {"type": "imdb_id"})
-
-            new_movie = Movie.objects.create(
-                title=movie["title"],
-                actors=movie["actors"],
-                year=movie["year"],
-                imdb_id=movie["imdb_id"],
-                poster=movie["poster"],
-                plot=movie["plot"],
-                genre=movie["genre"],
-                critic_scores=movie["critic_scores"],
-                mpaa_rating=movie["mpaa_rating"],
-                director=movie["director"],
-                added_by_id=request.user.id,
-            )
-
-        movie_list.movies.add(new_movie)
-
-        return JsonResponse(MovieListSerializer(movie_list).data)
-
-    def remove_movie(self, request, pk=None, imdb_id=None, *args, **kwargs):
-        movie = Movie.objects.filter(imdb_id=imdb_id).first()
-
-        movie_list = MovieList.objects.get(pk=pk)
-        movie_list.movies.remove(movie)
-
-        return JsonResponse(MovieListSerializer(movie_list).data)
-
-
-class ScheduleViewset(viewsets.ModelViewSet):
-    queryset = Schedule.objects.all().order_by("name")
-    authentication_classes = [TokenAuthentication]
-    permission_classes = [permissions.IsAuthenticated | ReadOnly]
-
-    serializer_class = ScheduleSerializer
-
-    def retrieve(self, request, pk=None, *args, **kwargs):
-        # Get the schedule instance
-        instance = self.get_object()
-        now = datetime.datetime.now()
-        # get time from start of day
-        today = datetime.datetime(now.year, now.month, now.day)
-
-        upcoming_showings = Showing.objects.filter(
-            showtime__gte=today, schedule=instance
-        )
-
-        # Create a serialized response
-        serializer = self.get_serializer(instance)
-        data = serializer.data
-
-        # Replace all showings with only future showings
-        data["showings"] = ShowingSerializer(upcoming_showings, many=True).data
-
-        if request.GET.get("past_showings") == "true":
-            past_showings = Showing.objects.filter(
-                showtime__lt=today, schedule=instance
-            )
-
-            # Add both to the response
-            data["past_showings"] = [
-                {
-                    "id": showing.id,
-                    "showtime": showing.showtime.isoformat(),
-                    "movie": MovieSerializer(showing.movie).data,
-                }
-                for showing in past_showings
-            ]
-        else:
-            data["past_showings"] = []
-
-        return JsonResponse(data)
-
-
-class ShowingViewset(viewsets.ModelViewSet):
-    queryset = Showing.objects.all().order_by("showtime")
-    authentication_classes = [TokenAuthentication]
-    permission_classes = [permissions.IsAuthenticated | ReadOnly]
-
-    serializer_class = ShowingSerializer
-
-    def create(self, request, *args, **kwargs):
-        movie_id = request.data.get("movie")
-        movie = Movie.objects.get(pk=movie_id)
-
-        schedule_id = request.data.get("schedule")
-        schedule = Schedule.objects.get(pk=schedule_id)
-
-        showtime_str = request.data.get("showtime")
-        showtime = parse_datetime(showtime_str)
-
-        showing = Showing.objects.create(
-            movie=movie,
-            schedule=schedule,
-            showtime=showtime,
-            public=request.data.get("public"),
-            owner=request.user,
-        )
-
-        return JsonResponse(ShowingSerializer(showing).data)
diff --git a/movie_manager/viewsets/__init__.py b/movie_manager/viewsets/__init__.py
new file mode 100644
index 0000000..da282d0
--- /dev/null
+++ b/movie_manager/viewsets/__init__.py
@@ -0,0 +1,11 @@
+from .movie import MovieViewset
+from .movie_list import MovieListViewset
+from .schedule import ScheduleViewset
+from .showing import ShowingViewset
+
+__all__ = [
+    "MovieViewset",
+    "MovieListViewset",
+    "ScheduleViewset",
+    "ShowingViewset",
+]
diff --git a/movie_manager/viewsets/movie.py b/movie_manager/viewsets/movie.py
new file mode 100644
index 0000000..c7b6977
--- /dev/null
+++ b/movie_manager/viewsets/movie.py
@@ -0,0 +1,37 @@
+from django.http import JsonResponse
+from rest_framework import permissions, viewsets
+
+from movie_db.db_providers.omdb import OMDb
+from movie_manager.models import Movie
+
+from knox.auth import TokenAuthentication
+
+from movie_manager.serializers import MovieSerializer
+
+
+class MovieViewset(viewsets.ModelViewSet):
+    queryset = Movie.objects.all().order_by("title")
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated]
+
+    serializer_class = MovieSerializer
+
+    def update(self, request, pk=None, *args, **kwargs):
+        omdb = OMDb()
+        updated_movie = omdb.search(request.data.get("imdb_id"), {"type": "imdb_id"})
+
+        movie = Movie.objects.get(pk=pk)
+
+        movie.title = updated_movie["title"]
+        movie.actors = updated_movie["actors"]
+        movie.year = updated_movie["year"]
+        movie.critic_scores = updated_movie["critic_scores"]
+        movie.mpaa_rating = updated_movie["mpaa_rating"]
+        movie.director = updated_movie["director"]
+        movie.poster = updated_movie["poster"]
+        movie.plot = updated_movie["plot"]
+        movie.genre = updated_movie["genre"]
+
+        movie.save()
+
+        return JsonResponse(MovieSerializer(movie).data)
diff --git a/movie_manager/viewsets/movie_list.py b/movie_manager/viewsets/movie_list.py
new file mode 100644
index 0000000..75730b6
--- /dev/null
+++ b/movie_manager/viewsets/movie_list.py
@@ -0,0 +1,120 @@
+from django.http import JsonResponse
+from django.db import models
+from django.contrib.auth.models import User
+from rest_framework import permissions, viewsets
+from rest_framework.decorators import action
+from rest_framework.exceptions import NotFound
+
+from movie_db.db_providers.omdb import OMDb
+from movie_manager.models import MovieList, Movie
+
+from knox.auth import TokenAuthentication
+
+from movie_manager.permissions import ReadOnly
+from movie_manager.serializers import MovieListSerializer, MovieListListSerializer
+
+
+class MovieListViewset(viewsets.ModelViewSet):
+    queryset = MovieList.objects.all()
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated | ReadOnly]
+
+    def get_serializer_class(self):
+        if self.action == "list":
+            return MovieListListSerializer
+        else:
+            return MovieListSerializer
+
+    def get_queryset(self):
+        base_qs = MovieList.objects.all()
+
+        if self.action == "list":
+            if self.request.user.is_authenticated:
+                return base_qs.filter(
+                    models.Q(public=True) | models.Q(owner=self.request.user)
+                ).order_by("name")
+
+            return base_qs.filter(public=True).order_by("name")
+        else:
+            return MovieList.objects.prefetch_related(
+                "movies", "movies__showing_set"
+            ).order_by("name")
+
+    def perform_create(self, serializer):
+        serializer.save(owner=self.request.user)
+
+    def get_permissions(self):
+        if self.action in ["update", "partial_update", "destroy"]:
+            self.permission_classes = [permissions.IsAuthenticated]
+        return super().get_permissions()
+
+    def create(self, request, *args, **kwargs):
+        movie_list = MovieList.objects.create(
+            name=request.data.get("name"),
+            owner=request.user,
+        )
+
+        return JsonResponse(MovieListSerializer(movie_list).data)
+
+    def update(self, request, pk=None, *args, **kwargs):
+        movie_list = MovieList.objects.get(pk=pk)
+        movie_list.name = request.data.get("name")
+        movie_list.owner = User.objects.get(pk=request.data.get("owner"))
+
+        if request.data.get("movies"):
+            movie_ids = request.data.get("movies")
+            for movie_id in movie_ids:
+                try:
+                    movie = Movie.objects.get(pk=movie_id)
+                    movie_list.movies.add(movie)
+                except Movie.DoesNotExist:
+                    raise NotFound(f"Movie {movie_id} does not exist")
+
+            removed_movies = Movie.objects.exclude(id__in=movie_ids)
+            for removed_movie in removed_movies:
+                removed_movie.delete()
+
+        movie_list.save()
+
+        return JsonResponse(MovieListSerializer(movie_list).data)
+
+    @action(
+        detail=True, methods=["put", "delete"], url_path="movie/(?P<imdb_id>tt[0-9]+)"
+    )
+    def add_movie(self, request, pk=None, imdb_id=None, *args, **kwargs):
+        if request.method == "DELETE":
+            return self.remove_movie(request, pk, imdb_id)
+
+        movie_list = MovieList.objects.get(pk=pk)
+        try:
+            new_movie = Movie.objects.get(imdb_id=imdb_id)
+        except Movie.DoesNotExist:
+            omdb = OMDb()
+            movie = omdb.search(imdb_id, {"type": "imdb_id"})
+
+            new_movie = Movie.objects.create(
+                title=movie["title"],
+                actors=movie["actors"],
+                year=movie["year"],
+                imdb_id=movie["imdb_id"],
+                poster=movie["poster"],
+                plot=movie["plot"],
+                genre=movie["genre"],
+                critic_scores=movie["critic_scores"],
+                mpaa_rating=movie["mpaa_rating"],
+                director=movie["director"],
+                added_by_id=request.user.id,
+            )
+
+        movie_list.movies.add(new_movie)
+
+        return JsonResponse(MovieListSerializer(movie_list).data)
+
+    @staticmethod
+    def remove_movie(request, pk=None, imdb_id=None, *args, **kwargs):
+        movie = Movie.objects.filter(imdb_id=imdb_id).first()
+
+        movie_list = MovieList.objects.get(pk=pk)
+        movie_list.movies.remove(movie)
+
+        return JsonResponse(MovieListSerializer(movie_list).data)
diff --git a/movie_manager/viewsets/schedule.py b/movie_manager/viewsets/schedule.py
new file mode 100644
index 0000000..856605a
--- /dev/null
+++ b/movie_manager/viewsets/schedule.py
@@ -0,0 +1,58 @@
+import datetime
+
+from django.http import JsonResponse
+from knox.auth import TokenAuthentication
+from rest_framework import viewsets, permissions
+
+from movie_manager.models import Schedule, Showing
+from movie_manager.permissions import ReadOnly
+from movie_manager.serializers import (
+    ScheduleSerializer,
+    ShowingSerializer,
+    MovieSerializer,
+)
+
+
+class ScheduleViewset(viewsets.ModelViewSet):
+    queryset = Schedule.objects.all().order_by("name")
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated | ReadOnly]
+
+    serializer_class = ScheduleSerializer
+
+    def retrieve(self, request, pk=None, *args, **kwargs):
+        # Get the schedule instance
+        instance = self.get_object()
+        now = datetime.datetime.now()
+        # get time from start of day
+        today = datetime.datetime(now.year, now.month, now.day)
+
+        upcoming_showings = Showing.objects.filter(
+            showtime__gte=today, schedule=instance
+        )
+
+        # Create a serialized response
+        serializer = self.get_serializer(instance)
+        data = serializer.data
+
+        # Replace all showings with only future showings
+        data["showings"] = ShowingSerializer(upcoming_showings, many=True).data
+
+        if request.GET.get("past_showings") == "true":
+            past_showings = Showing.objects.filter(
+                showtime__lt=today, schedule=instance
+            )
+
+            # Add both to the response
+            data["past_showings"] = [
+                {
+                    "id": showing.id,
+                    "showtime": showing.showtime.isoformat(),
+                    "movie": MovieSerializer(showing.movie).data,
+                }
+                for showing in past_showings
+            ]
+        else:
+            data["past_showings"] = []
+
+        return JsonResponse(data)
diff --git a/movie_manager/viewsets/showing.py b/movie_manager/viewsets/showing.py
new file mode 100644
index 0000000..1f3c887
--- /dev/null
+++ b/movie_manager/viewsets/showing.py
@@ -0,0 +1,36 @@
+from django.http import JsonResponse
+from django.utils.dateparse import parse_datetime
+from knox.auth import TokenAuthentication
+from rest_framework import viewsets, permissions
+
+from movie_manager.models import Showing, Movie, Schedule
+from movie_manager.permissions import ReadOnly
+from movie_manager.serializers import ShowingSerializer
+
+
+class ShowingViewset(viewsets.ModelViewSet):
+    queryset = Showing.objects.all().order_by("showtime")
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated | ReadOnly]
+
+    serializer_class = ShowingSerializer
+
+    def create(self, request, *args, **kwargs):
+        movie_id = request.data.get("movie")
+        movie = Movie.objects.get(pk=movie_id)
+
+        schedule_id = request.data.get("schedule")
+        schedule = Schedule.objects.get(pk=schedule_id)
+
+        showtime_str = request.data.get("showtime")
+        showtime = parse_datetime(showtime_str)
+
+        showing = Showing.objects.create(
+            movie=movie,
+            schedule=schedule,
+            showtime=showtime,
+            public=request.data.get("public"),
+            owner=request.user,
+        )
+
+        return JsonResponse(ShowingSerializer(showing).data)
diff --git a/movienight/urls.py b/movienight/urls.py
index 22a5c6a..c07c5b5 100644
--- a/movienight/urls.py
+++ b/movienight/urls.py
@@ -10,25 +10,33 @@ from django.conf.urls.static import static
 from django.conf import settings
 from rest_framework.routers import DefaultRouter
 
+from movie_manager.viewsets import (
+    MovieViewset,
+    MovieListViewset,
+    ScheduleViewset,
+    ShowingViewset,
+)
 from users import views as user_views
-from movie_manager import views as movie_views
 from movie_db import views as movie_db_views
 from rest_framework.authtoken.views import obtain_auth_token
 
+from users.viewsets.user import register
+from users.viewsets import UserViewSet, GroupViewSet
+
 router = DefaultRouter()
-router.register(r"v1/users", user_views.UserViewSet)
-router.register(r"v1/groups", user_views.GroupViewSet)
-router.register(r"v1/movies", movie_views.MovieViewset)
-router.register(r"v1/lists", movie_views.MovieListViewset)
-router.register(r"v1/schedules", movie_views.ScheduleViewset)
-router.register(r"v1/showings", movie_views.ShowingViewset)
+router.register(r"v1/users", UserViewSet)
+router.register(r"v1/groups", GroupViewSet)
+router.register(r"v1/movies", MovieViewset)
+router.register(r"v1/lists", MovieListViewset)
+router.register(r"v1/schedules", ScheduleViewset)
+router.register(r"v1/showings", ShowingViewset)
 
 urlpatterns = [
     path("", include(router.urls)),
     path("admin/", admin.site.urls),
     path(r"v1/auth/token/", obtain_auth_token),
     path(r"v1/auth/login/", user_views.LoginView.as_view(), name="knox_login"),
-    path(r"v1/auth/register/", user_views.register, name="register"),
+    path(r"v1/auth/register/", register, name="register"),
     path(r"v1/movies/search", movie_db_views.omdb_search, name="omdb_search"),
     path(r"v1/auth/", include("knox.urls")),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/requirements.txt b/requirements.txt
index 456b8f8..7350802 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-django==5.1.4
+django==5.2.2
 djangorestframework
 django-rest-knox
 markdown
diff --git a/users/views.py b/users/views.py
index bcc7f13..f231eee 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1,40 +1,9 @@
 from django.contrib.auth import login
-from django.contrib.auth.models import Group, User, AnonymousUser
-from rest_framework import permissions, viewsets, status
-from knox.auth import TokenAuthentication
+from rest_framework import permissions
 from knox.views import LoginView as KnoxLoginView
 from rest_framework.authtoken.serializers import AuthTokenSerializer
-from rest_framework.response import Response
-from rest_framework.decorators import api_view
 
-from users.serializers import GroupSerializer, UserSerializer
-
-
-class UserViewSet(viewsets.ModelViewSet):
-    authentication_classes = [TokenAuthentication]
-    permission_classes = [permissions.IsAuthenticated]
-
-    queryset = User.objects.all().order_by("-date_joined")
-    serializer_class = UserSerializer
-
-
-class GroupViewSet(viewsets.ModelViewSet):
-    authentication_classes = [TokenAuthentication]
-    permission_classes = [permissions.IsAuthenticated]
-
-    queryset = Group.objects.all().order_by("name")
-    serializer_class = GroupSerializer
-
-
-@api_view(["POST"])
-def register(request):
-    user_data = UserSerializer(data=request.data)
-
-    if user_data.is_valid():
-        User.objects.create_user(**user_data.validated_data)
-        return Response(request.data, status=status.HTTP_201_CREATED)
-    else:
-        return Response([], status=status.HTTP_400_BAD_REQUEST)
+from users.serializers import UserSerializer
 
 
 class LoginView(KnoxLoginView):
diff --git a/users/viewsets/__init__.py b/users/viewsets/__init__.py
new file mode 100644
index 0000000..a3d0f22
--- /dev/null
+++ b/users/viewsets/__init__.py
@@ -0,0 +1,4 @@
+from .group import GroupViewSet
+from .user import UserViewSet
+
+__all__ = ["GroupViewSet", "UserViewSet"]
diff --git a/users/viewsets/group.py b/users/viewsets/group.py
new file mode 100644
index 0000000..7bbc91d
--- /dev/null
+++ b/users/viewsets/group.py
@@ -0,0 +1,13 @@
+from knox.auth import TokenAuthentication
+from django.contrib.auth.models import Group
+from rest_framework import viewsets, permissions, status
+
+from users.serializers import GroupSerializer
+
+
+class GroupViewSet(viewsets.ModelViewSet):
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated]
+
+    queryset = Group.objects.all().order_by("name")
+    serializer_class = GroupSerializer
diff --git a/users/viewsets/user.py b/users/viewsets/user.py
new file mode 100644
index 0000000..c2e2063
--- /dev/null
+++ b/users/viewsets/user.py
@@ -0,0 +1,26 @@
+from django.contrib.auth.models import User, Group
+from knox.auth import TokenAuthentication
+from rest_framework import viewsets, permissions, status
+from rest_framework.decorators import api_view
+from rest_framework.response import Response
+
+from users.serializers import UserSerializer, GroupSerializer
+
+
+class UserViewSet(viewsets.ModelViewSet):
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated]
+
+    queryset = User.objects.all().order_by("-date_joined")
+    serializer_class = UserSerializer
+
+
+@api_view(["POST"])
+def register(request):
+    user_data = UserSerializer(data=request.data)
+
+    if user_data.is_valid():
+        User.objects.create_user(**user_data.validated_data)
+        return Response(request.data, status=status.HTTP_201_CREATED)
+    else:
+        return Response([], status=status.HTTP_400_BAD_REQUEST)

From 11dedca338f49fe8d224618a1552d472fceb96c6 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 3 Jul 2025 00:04:59 -0500
Subject: [PATCH 17/26] fixed timezone handling

---
 .gitignore                                    |  3 +
 .idea/.gitignore                              |  8 --
 .idea/dictionaries/project.xml                |  8 --
 .../inspectionProfiles/profiles_settings.xml  |  6 --
 .idea/misc.xml                                | 11 ---
 .idea/modules.xml                             |  8 --
 .idea/movie-night-py.iml                      | 30 -------
 .idea/vcs.xml                                 |  6 --
 movie_manager/serializers.py                  | 24 +++--
 movie_manager/tests.py                        | 90 ++++++++++++++++++-
 movie_manager/viewsets/schedule.py            |  6 +-
 movie_manager/viewsets/showing.py             |  2 +-
 requirements.txt                              |  3 +-
 13 files changed, 107 insertions(+), 98 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/dictionaries/project.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/movie-night-py.iml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 6bd33c1..41818d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,3 +175,6 @@ cython_debug/
 
 # django
 static
+
+# JetBrains
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
deleted file mode 100644
index 779eda8..0000000
--- a/.idea/dictionaries/project.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="project">
-    <words>
-      <w>mpaa</w>
-      <w>viewset</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index f6f7e02..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="enabledOnReformat" value="true" />
-    <option name="enabledOnSave" value="true" />
-    <option name="executionMode" value="BINARY" />
-    <option name="pathToExecutable" value="$USER_HOME$/.local/bin/black" />
-    <option name="sdkName" value="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 60235a5..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/movie-night-py.iml" filepath="$PROJECT_DIR$/.idea/movie-night-py.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/movie-night-py.iml b/.idea/movie-night-py.iml
deleted file mode 100644
index 7a7a8e5..0000000
--- a/.idea/movie-night-py.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="django" name="Django">
-      <configuration>
-        <option name="rootFolder" value="$MODULE_DIR$" />
-        <option name="settingsModule" value="movienight/settings.py" />
-        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
-        <option name="environment" value="&lt;map/&gt;" />
-        <option name="doNotUseTestRunner" value="false" />
-        <option name="trackFilePattern" value="migrations" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.venv" />
-      <excludeFolder url="file://$MODULE_DIR$/.venv1" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.13 virtualenv at ~/Projects/MovieNight/movie-night-api/.venv" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-  <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Django" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/movie_manager/serializers.py b/movie_manager/serializers.py
index 3b7a517..c9bb829 100644
--- a/movie_manager/serializers.py
+++ b/movie_manager/serializers.py
@@ -1,6 +1,6 @@
-from django.utils import timezone
 from gunicorn.config import User
 from rest_framework import serializers
+
 from movie_manager.models import Movie, MovieList, Schedule, Showing
 
 
@@ -28,6 +28,7 @@ class MovieSerializer(serializers.ModelSerializer):
     def get_has_been_scheduled(self, obj):
         return Showing.objects.filter(movie_id=obj.id).exists()
 
+
 class MovieListListSerializer(serializers.ModelSerializer):
     movie_count = serializers.SerializerMethodField()
 
@@ -45,17 +46,13 @@ class MovieListSerializer(serializers.ModelSerializer):
     owner = serializers.PrimaryKeyRelatedField(read_only=True)
 
     def get_queryset(self):
-        return MovieList.objects.prefetch_related(
-            "movies",
-            "movies__showing_set"
-        )
+        return MovieList.objects.prefetch_related("movies", "movies__showing_set")
 
     class Meta:
         model = MovieList
         fields = ["id", "name", "owner", "public", "movies"]
 
 
-
 class UserSerializer(serializers.Serializer):
     class Meta:
         model = User
@@ -69,19 +66,18 @@ class ShowingSerializer(serializers.ModelSerializer):
         model = Showing
         fields = ["id", "public", "showtime", "movie", "owner"]
 
-    def to_internal_value(self, data):
-        validated_data = super().to_internal_value(data)
+    # def to_internal_value(self, data):
+    #    validated_data = super().to_internal_value(data)
 
-        if "showtime" in validated_data and timezone.is_naive(
-            validated_data["showtime"]
-        ):
-            validated_data["showtime"] = timezone.make_aware(validated_data["showtime"])
+    #    if "showtime" in validated_data and timezone.is_naive(
+    #        validated_data["showtime"]
+    #    ):
+    #        validated_data["showtime"] = timezone.make_aware(validated_data["showtime"])
 
-        return validated_data
+    #    return validated_data
 
 
 class ScheduleSerializer(serializers.ModelSerializer):
-    name = serializers.CharField(read_only=True)
     showings = ShowingSerializer(source="showing_set", read_only=True, many=True)
 
     class Meta:
diff --git a/movie_manager/tests.py b/movie_manager/tests.py
index 7ce503c..078bc13 100644
--- a/movie_manager/tests.py
+++ b/movie_manager/tests.py
@@ -1,3 +1,89 @@
-from django.test import TestCase
+import json
 
-# Create your tests here.
+from django.contrib.auth.models import User
+from django.utils import timezone
+from freezegun import freeze_time
+from rest_framework import status
+from rest_framework.test import APITestCase, APIClient
+
+from movie_manager.models import Movie, Schedule, Showing
+
+
+class ShowingModelTestCase(APITestCase):
+    def setUp(self):
+        self.client: APIClient = APIClient()
+        self.movie: Movie = Movie.objects.create(title="Test Movie")
+        self.owner: User = User.objects.create(id=1, username="test_user")
+        self.schedule: Schedule = Schedule.objects.create(
+            owner=self.owner, name="Test Schedule"
+        )
+
+    def test_it_creates_a_new_showing(self):
+        self.client.force_authenticate(user=self.owner)
+
+        showing_time = timezone.now().isoformat().replace("+00:00", "Z")
+        response = self.client.post(
+            "/v1/showings/",
+            {
+                "movie": self.movie.id,
+                "public": True,
+                "schedule": self.schedule.id,
+                "showtime": showing_time,
+            },
+        )
+
+        response_data = json.loads(response.content)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(response_data.get("showtime"), showing_time)
+        self.assertEqual(response_data.get("movie").get("title"), "Test Movie")
+
+    @freeze_time("2025-07-02 23:59:00", tz_offset=-5)
+    def test_it_returns_active_showings(self):
+        self.client.force_authenticate(user=self.schedule.owner)
+
+        showtimes_america_chicago_utc = [
+            "2025-07-03T04:00:59.000Z",  # 7/2/25 11:59pm
+            "2025-07-01T04:00:59.000Z",  # 6/30/25 11:59pm
+            "2025-07-08T04:00:59.000Z",  # 7/7/25 11:59pm
+        ]
+
+        for showtime in showtimes_america_chicago_utc:
+            Showing.objects.create(
+                movie=self.movie,
+                schedule=self.schedule,
+                showtime=showtime,
+                public=True,
+                owner=self.schedule.owner,
+            )
+
+        response = self.client.get(f"/v1/schedules/{self.schedule.id}/")
+        parsed_schedule = json.loads(response.content)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(parsed_schedule.get("showings")), 2)
+
+
+class ScheduleModelTestCase(APITestCase):
+    def setUp(self):
+        self.client: APIClient = APIClient()
+        self.test_user: User = User.objects.create(id=1, username="test_user")
+
+    def test_it_creates_a_new_schedule(self):
+        self.client.force_authenticate(user=self.test_user)
+        response = self.client.post(
+            "/v1/schedules/",
+            {
+                "name": "Test Schedule",
+                "owner": self.test_user.id,
+                "public": True,
+                "slug": "test-schedule",
+            },
+        )
+
+        response_data = json.loads(response.content)
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(response_data.get("name"), "Test Schedule")
+        self.assertEqual(response_data.get("owner"), 1)
+        self.assertEqual(response_data.get("public"), True)
+        self.assertEqual(response_data.get("slug"), "test-schedule")
diff --git a/movie_manager/viewsets/schedule.py b/movie_manager/viewsets/schedule.py
index 856605a..57d5ec2 100644
--- a/movie_manager/viewsets/schedule.py
+++ b/movie_manager/viewsets/schedule.py
@@ -1,6 +1,7 @@
 import datetime
 
 from django.http import JsonResponse
+from django.utils import timezone
 from knox.auth import TokenAuthentication
 from rest_framework import viewsets, permissions
 
@@ -23,15 +24,14 @@ class ScheduleViewset(viewsets.ModelViewSet):
     def retrieve(self, request, pk=None, *args, **kwargs):
         # Get the schedule instance
         instance = self.get_object()
-        now = datetime.datetime.now()
+        now = timezone.now()
         # get time from start of day
-        today = datetime.datetime(now.year, now.month, now.day)
+        today = timezone.make_aware(datetime.datetime(now.year, now.month, now.day))
 
         upcoming_showings = Showing.objects.filter(
             showtime__gte=today, schedule=instance
         )
 
-        # Create a serialized response
         serializer = self.get_serializer(instance)
         data = serializer.data
 
diff --git a/movie_manager/viewsets/showing.py b/movie_manager/viewsets/showing.py
index 1f3c887..a52f7c1 100644
--- a/movie_manager/viewsets/showing.py
+++ b/movie_manager/viewsets/showing.py
@@ -33,4 +33,4 @@ class ShowingViewset(viewsets.ModelViewSet):
             owner=request.user,
         )
 
-        return JsonResponse(ShowingSerializer(showing).data)
+        return JsonResponse(ShowingSerializer(showing).data, status=201)
diff --git a/requirements.txt b/requirements.txt
index 7350802..1a4cbee 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ django-filter
 gunicorn==23.0.0
 psycopg2-binary==2.9.10
 django-cors-headers==4.7.0
-requests==2.32.3
\ No newline at end of file
+requests==2.32.3
+freezegun==1.5.2
\ No newline at end of file

From 4f1589f90d81bf9b599ed01cb7a07b7930f23200 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 3 Jul 2025 00:07:33 -0500
Subject: [PATCH 18/26] renamed tests

---
 movie_manager/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/movie_manager/tests.py b/movie_manager/tests.py
index 078bc13..8ab499b 100644
--- a/movie_manager/tests.py
+++ b/movie_manager/tests.py
@@ -9,7 +9,7 @@ from rest_framework.test import APITestCase, APIClient
 from movie_manager.models import Movie, Schedule, Showing
 
 
-class ShowingModelTestCase(APITestCase):
+class ShowingViewsetTestCase(APITestCase):
     def setUp(self):
         self.client: APIClient = APIClient()
         self.movie: Movie = Movie.objects.create(title="Test Movie")
@@ -63,7 +63,7 @@ class ShowingModelTestCase(APITestCase):
         self.assertEqual(len(parsed_schedule.get("showings")), 2)
 
 
-class ScheduleModelTestCase(APITestCase):
+class ScheduleViewsetTestCase(APITestCase):
     def setUp(self):
         self.client: APIClient = APIClient()
         self.test_user: User = User.objects.create(id=1, username="test_user")

From 447fe1782560b08af87b15f0efb618163f2bbc33 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 3 Jul 2025 01:29:35 -0500
Subject: [PATCH 19/26] updated schedule date to use local time

---
 movie_manager/admin.py             | 16 +++++++++++++++-
 movie_manager/tests.py             |  9 +++++----
 movie_manager/viewsets/schedule.py | 20 ++++++--------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/movie_manager/admin.py b/movie_manager/admin.py
index 883114f..2bdc1b9 100644
--- a/movie_manager/admin.py
+++ b/movie_manager/admin.py
@@ -1,4 +1,7 @@
+from zoneinfo import ZoneInfo
+
 from django.contrib import admin
+from django.utils import timezone
 
 from movie_manager.models import Movie, MovieList, Schedule, Showing
 
@@ -21,4 +24,15 @@ class ScheduleAdmin(admin.ModelAdmin):
 
 @admin.register(Showing)
 class ShowingAdmin(admin.ModelAdmin):
-    list_display = ["showtime", "movie"]
+    list_display = ["local_showtime", "movie"]
+
+    def local_showtime(self, obj):
+        if obj.showtime:
+            target_tz = ZoneInfo("America/Chicago")
+            with timezone.override(target_tz):
+                local_time = timezone.localtime(obj.showtime)
+                return local_time.strftime("%Y-%m-%d %H:%M")
+        return "Invalid datetime"
+
+    local_showtime.short_description = "Showtime (Local)"
+    local_showtime.admin_order_field = "showtime"
diff --git a/movie_manager/tests.py b/movie_manager/tests.py
index 8ab499b..09fcbb8 100644
--- a/movie_manager/tests.py
+++ b/movie_manager/tests.py
@@ -37,14 +37,15 @@ class ShowingViewsetTestCase(APITestCase):
         self.assertEqual(response_data.get("showtime"), showing_time)
         self.assertEqual(response_data.get("movie").get("title"), "Test Movie")
 
-    @freeze_time("2025-07-02 23:59:00", tz_offset=-5)
+    @freeze_time("2025-07-03 04:59:00")  # 2025-07-02 23:59 CDT in UTC
     def test_it_returns_active_showings(self):
         self.client.force_authenticate(user=self.schedule.owner)
 
         showtimes_america_chicago_utc = [
-            "2025-07-03T04:00:59.000Z",  # 7/2/25 11:59pm
-            "2025-07-01T04:00:59.000Z",  # 6/30/25 11:59pm
-            "2025-07-08T04:00:59.000Z",  # 7/7/25 11:59pm
+            "2025-07-08T04:59:59.000Z",  # 2025-07-07 11:59pm
+            "2025-07-03T04:59:59.000Z",  # 2025-07-02 11:59pm
+            "2025-07-03T04:00:00.000Z",  # 2025-07-02 11:00pm
+            "2025-07-01T04:59:00.000Z",  # 2025-06-30 11:59pm
         ]
 
         for showtime in showtimes_america_chicago_utc:
diff --git a/movie_manager/viewsets/schedule.py b/movie_manager/viewsets/schedule.py
index 57d5ec2..41d7364 100644
--- a/movie_manager/viewsets/schedule.py
+++ b/movie_manager/viewsets/schedule.py
@@ -1,5 +1,3 @@
-import datetime
-
 from django.http import JsonResponse
 from django.utils import timezone
 from knox.auth import TokenAuthentication
@@ -25,12 +23,8 @@ class ScheduleViewset(viewsets.ModelViewSet):
         # Get the schedule instance
         instance = self.get_object()
         now = timezone.now()
-        # get time from start of day
-        today = timezone.make_aware(datetime.datetime(now.year, now.month, now.day))
 
-        upcoming_showings = Showing.objects.filter(
-            showtime__gte=today, schedule=instance
-        )
+        upcoming_showings = Showing.objects.filter(showtime__gte=now, schedule=instance)
 
         serializer = self.get_serializer(instance)
         data = serializer.data
@@ -39,18 +33,16 @@ class ScheduleViewset(viewsets.ModelViewSet):
         data["showings"] = ShowingSerializer(upcoming_showings, many=True).data
 
         if request.GET.get("past_showings") == "true":
-            past_showings = Showing.objects.filter(
-                showtime__lt=today, schedule=instance
-            )
+            past_showings = Showing.objects.filter(showtime__lt=now, schedule=instance)
 
             # Add both to the response
             data["past_showings"] = [
                 {
-                    "id": showing.id,
-                    "showtime": showing.showtime.isoformat(),
-                    "movie": MovieSerializer(showing.movie).data,
+                    "id": past_showing.id,
+                    "showtime": past_showing.showtime.isoformat(),
+                    "movie": MovieSerializer(past_showing.movie).data,
                 }
-                for showing in past_showings
+                for past_showing in past_showings
             ]
         else:
             data["past_showings"] = []

From cf42c0dbd9163eee719681bf19496caa9f13b7e2 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 3 Jul 2025 01:38:54 -0500
Subject: [PATCH 20/26] added utc showtime to admin

---
 movie_manager/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/movie_manager/admin.py b/movie_manager/admin.py
index 2bdc1b9..7773cfb 100644
--- a/movie_manager/admin.py
+++ b/movie_manager/admin.py
@@ -24,7 +24,7 @@ class ScheduleAdmin(admin.ModelAdmin):
 
 @admin.register(Showing)
 class ShowingAdmin(admin.ModelAdmin):
-    list_display = ["local_showtime", "movie"]
+    list_display = ["local_showtime", "showtime", "movie"]
 
     def local_showtime(self, obj):
         if obj.showtime:

From eeb74027eb3cd2cc8fcb25bcdf7737eeb82a5f02 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Thu, 3 Jul 2025 14:25:17 -0500
Subject: [PATCH 21/26] added coverage

---
 movie_db/tests.py | 7 +++++--
 requirements.txt  | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/movie_db/tests.py b/movie_db/tests.py
index 7ce503c..6cb44f7 100644
--- a/movie_db/tests.py
+++ b/movie_db/tests.py
@@ -1,3 +1,6 @@
-from django.test import TestCase
+from unittest import TestCase
 
-# Create your tests here.
+
+class OmdbTestCase(TestCase):
+    def test_movie_db(self):
+        self.assertTrue(True)
diff --git a/requirements.txt b/requirements.txt
index 1a4cbee..73606df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,5 @@ gunicorn==23.0.0
 psycopg2-binary==2.9.10
 django-cors-headers==4.7.0
 requests==2.32.3
-freezegun==1.5.2
\ No newline at end of file
+freezegun==1.5.2
+coverage==7.9.1

From 1f314f1c20890949b89190086e70612832ad2e37 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Tue, 8 Jul 2025 00:39:58 -0500
Subject: [PATCH 22/26] added support for user profiles

---
 movie_manager/models.py          |  3 +-
 movienight/settings.py           | 12 ++-----
 movienight/urls.py               | 33 +++++++++----------
 users/migrations/0001_initial.py | 25 +++++++++++++++
 users/models.py                  |  9 ++++++
 users/permissions.py             |  6 ++++
 users/serializers.py             | 27 ++++++++++++++--
 users/viewsets/user.py           | 54 ++++++++++++++++++++++++++++++--
 8 files changed, 137 insertions(+), 32 deletions(-)
 create mode 100644 users/migrations/0001_initial.py
 create mode 100644 users/permissions.py

diff --git a/movie_manager/models.py b/movie_manager/models.py
index f401dde..fa39298 100644
--- a/movie_manager/models.py
+++ b/movie_manager/models.py
@@ -1,7 +1,6 @@
-from django.db import models
 from django.contrib.auth.models import User
+from django.db import models
 from django.db.models import SET_NULL
-import datetime
 
 
 class Movie(models.Model):
diff --git a/movienight/settings.py b/movienight/settings.py
index 74f4921..eb9878d 100644
--- a/movienight/settings.py
+++ b/movienight/settings.py
@@ -10,14 +10,12 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.1/ref/settings/
 """
 
-from pathlib import Path
 import os
-
+from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/
 
@@ -30,13 +28,13 @@ DEBUG = bool(os.environ.get("DEBUG", default=0))
 ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", "127.0.0.1").split(",")
 CORS_ALLOWED_ORIGINS = ["http://localhost:3000"]
 
-
 # Application definition
 
 INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
+    "corsheaders",
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
@@ -44,7 +42,7 @@ INSTALLED_APPS = [
     "rest_framework.authtoken",
     "knox",
     "movie_manager",
-    "corsheaders",
+    "users",
 ]
 
 MIDDLEWARE = [
@@ -78,7 +76,6 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "movienight.wsgi.application"
 
-
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
 
@@ -95,7 +92,6 @@ DATABASES = {
     }
 }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
 
@@ -114,7 +110,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/5.1/topics/i18n/
 
@@ -131,7 +126,6 @@ OMDB_API_KEY = os.environ.get("OMDB_API_KEY")
 # Django Rest Framework
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": [
-        #'rest_framework.authentication.SessionAuthentication',
         "knox.auth.TokenAuthentication",
     ],
 }
diff --git a/movienight/urls.py b/movienight/urls.py
index c07c5b5..e36e1b5 100644
--- a/movienight/urls.py
+++ b/movienight/urls.py
@@ -2,14 +2,14 @@
 URL configuration for movienight project.
 """
 
-import knox
-from knox import views as knox_views
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
-from django.conf.urls.static import static
-from django.conf import settings
+from rest_framework.authtoken.views import obtain_auth_token
 from rest_framework.routers import DefaultRouter
 
+from movie_db import views as movie_db_views
 from movie_manager.viewsets import (
     MovieViewset,
     MovieListViewset,
@@ -17,11 +17,8 @@ from movie_manager.viewsets import (
     ShowingViewset,
 )
 from users import views as user_views
-from movie_db import views as movie_db_views
-from rest_framework.authtoken.views import obtain_auth_token
-
-from users.viewsets.user import register
 from users.viewsets import UserViewSet, GroupViewSet
+from users.viewsets.user import register, UserProfileViewSet
 
 router = DefaultRouter()
 router.register(r"v1/users", UserViewSet)
@@ -30,13 +27,17 @@ router.register(r"v1/movies", MovieViewset)
 router.register(r"v1/lists", MovieListViewset)
 router.register(r"v1/schedules", ScheduleViewset)
 router.register(r"v1/showings", ShowingViewset)
+router.register(r"v1/users/profiles/", UserProfileViewSet)
 
 urlpatterns = [
-    path("", include(router.urls)),
-    path("admin/", admin.site.urls),
-    path(r"v1/auth/token/", obtain_auth_token),
-    path(r"v1/auth/login/", user_views.LoginView.as_view(), name="knox_login"),
-    path(r"v1/auth/register/", register, name="register"),
-    path(r"v1/movies/search", movie_db_views.omdb_search, name="omdb_search"),
-    path(r"v1/auth/", include("knox.urls")),
-] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+                  path("", include(router.urls)),
+                  path("admin/", admin.site.urls),
+                  path(r"v1/auth/token/", obtain_auth_token),
+                  path(r"v1/auth/login/", user_views.LoginView.as_view(), name="knox_login"),
+                  path(r"v1/auth/register/", register, name="register"),
+                  path(r"v1/movies/search", movie_db_views.omdb_search, name="omdb_search"),
+                  path(r"v1/auth/", include("knox.urls")),
+                  path('v1/users/profile', UserProfileViewSet.as_view({"get": "current_user_profile"}),
+                       name="current_user_profile"),
+                  path('v1/users/profiles/<str:user__username>/', UserProfileViewSet.as_view({"get": "retrieve"}))
+              ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
new file mode 100644
index 0000000..8b80e3f
--- /dev/null
+++ b/users/migrations/0001_initial.py
@@ -0,0 +1,25 @@
+# Generated by Django 5.2.2 on 2025-07-08 02:37
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserProfile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=100, null=True)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
index 71a8362..416811d 100644
--- a/users/models.py
+++ b/users/models.py
@@ -1,3 +1,12 @@
+from django.contrib.auth.models import User
 from django.db import models
 
+
 # Create your models here.
+class UserProfile(models.Model):
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    name = models.CharField(max_length=100, null=True, blank=True)
+
+    @property
+    def lists(self):
+        return self.user.movielist_set.all()
diff --git a/users/permissions.py b/users/permissions.py
new file mode 100644
index 0000000..3dae833
--- /dev/null
+++ b/users/permissions.py
@@ -0,0 +1,6 @@
+from rest_framework import permissions
+from rest_framework.permissions import SAFE_METHODS
+
+class ReadOnly(permissions.BasePermission):
+    def has_permission(self, request, view):
+        return request.method in SAFE_METHODS
diff --git a/users/serializers.py b/users/serializers.py
index a269baa..33f9a3f 100644
--- a/users/serializers.py
+++ b/users/serializers.py
@@ -1,12 +1,35 @@
 from django.contrib.auth import authenticate
-from rest_framework import serializers
 from django.contrib.auth.models import User, Group
+from rest_framework import serializers
+
+from movie_manager.serializers import MovieListSerializer
+from users.models import UserProfile
 
 
 class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
-        fields = ["url", "username", "email", "password", "groups"]
+        fields = ["url", "username", "email", "groups"]
+
+
+class UserProfileSerializer(serializers.HyperlinkedModelSerializer):
+    name = serializers.SerializerMethodField()
+    username = serializers.SerializerMethodField()
+    date_joined = serializers.SerializerMethodField()
+    lists = MovieListSerializer(many=True, read_only=True)
+
+    class Meta:
+        model = UserProfile
+        fields = ["name", "username", "date_joined", "lists"]
+
+    def get_name(self, obj):
+        return obj.name or ""
+
+    def get_username(self, obj):
+        return obj.user.username
+
+    def get_date_joined(self, obj):
+        return obj.user.date_joined
 
 
 class GroupSerializer(serializers.HyperlinkedModelSerializer):
diff --git a/users/viewsets/user.py b/users/viewsets/user.py
index c2e2063..e7856d3 100644
--- a/users/viewsets/user.py
+++ b/users/viewsets/user.py
@@ -1,10 +1,13 @@
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import User
+from django.http import JsonResponse
 from knox.auth import TokenAuthentication
 from rest_framework import viewsets, permissions, status
-from rest_framework.decorators import api_view
+from rest_framework.decorators import api_view, action
 from rest_framework.response import Response
 
-from users.serializers import UserSerializer, GroupSerializer
+from users.models import UserProfile
+from users.permissions import ReadOnly
+from users.serializers import UserSerializer, UserProfileSerializer
 
 
 class UserViewSet(viewsets.ModelViewSet):
@@ -15,6 +18,51 @@ class UserViewSet(viewsets.ModelViewSet):
     serializer_class = UserSerializer
 
 
+class UserProfileViewSet(viewsets.ModelViewSet):
+    authentication_classes = [TokenAuthentication]
+    permission_classes = [permissions.IsAuthenticated | ReadOnly]
+
+    queryset = UserProfile.objects.all()
+    serializer_class = UserProfileSerializer
+    lookup_field = "user__username"
+
+    @action(detail=False)
+    def current_user_profile(self, request, *args, **kwargs):
+        try:
+            user = request.user
+        except User.DoesNotExist:
+            return Response([], status=status.HTTP_404_NOT_FOUND)
+
+        try:
+            user_profile = UserProfile.objects.get(user=user)
+        except UserProfile.DoesNotExist:
+            user_profile = UserProfile(
+                user=user,
+            )
+
+            user_profile.save()
+
+        return JsonResponse(UserProfileSerializer(user_profile).data)
+
+    def retrieve(self, request, pk=None, *args, **kwargs):
+        try:
+            username = kwargs.get('user__username')
+            user = User.objects.get(username=username)
+        except User.DoesNotExist:
+            return Response([], status=status.HTTP_404_NOT_FOUND)
+
+        try:
+            user_profile = UserProfile.objects.get(user=user)
+        except UserProfile.DoesNotExist:
+            user_profile = UserProfile(
+                user=user,
+            )
+
+            user_profile.save()
+
+        return JsonResponse(UserProfileSerializer(user_profile).data)
+
+
 @api_view(["POST"])
 def register(request):
     user_data = UserSerializer(data=request.data)

From d30266c4393a557f75cbd56e83e6f18a3179fcde Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Tue, 8 Jul 2025 00:41:54 -0500
Subject: [PATCH 23/26] reorganized user profile viewset

---
 users/viewsets/user.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/users/viewsets/user.py b/users/viewsets/user.py
index e7856d3..881f612 100644
--- a/users/viewsets/user.py
+++ b/users/viewsets/user.py
@@ -26,10 +26,10 @@ class UserProfileViewSet(viewsets.ModelViewSet):
     serializer_class = UserProfileSerializer
     lookup_field = "user__username"
 
-    @action(detail=False)
-    def current_user_profile(self, request, *args, **kwargs):
+    def retrieve(self, request, pk=None, *args, **kwargs):
         try:
-            user = request.user
+            username = kwargs.get('user__username')
+            user = User.objects.get(username=username)
         except User.DoesNotExist:
             return Response([], status=status.HTTP_404_NOT_FOUND)
 
@@ -44,10 +44,10 @@ class UserProfileViewSet(viewsets.ModelViewSet):
 
         return JsonResponse(UserProfileSerializer(user_profile).data)
 
-    def retrieve(self, request, pk=None, *args, **kwargs):
+    @action(detail=False)
+    def current_user_profile(self, request, *args, **kwargs):
         try:
-            username = kwargs.get('user__username')
-            user = User.objects.get(username=username)
+            user = request.user
         except User.DoesNotExist:
             return Response([], status=status.HTTP_404_NOT_FOUND)
 

From b68fc0bd63e4c83fe074fa5ef73119a56bb04e92 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Fri, 11 Jul 2025 18:05:58 -0500
Subject: [PATCH 24/26] indexed some model fields

---
 movie_manager/models.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/movie_manager/models.py b/movie_manager/models.py
index f401dde..0271a0f 100644
--- a/movie_manager/models.py
+++ b/movie_manager/models.py
@@ -1,12 +1,11 @@
-from django.db import models
 from django.contrib.auth.models import User
+from django.db import models
 from django.db.models import SET_NULL
-import datetime
 
 
 class Movie(models.Model):
     title = models.CharField(max_length=100)
-    imdb_id = models.CharField(max_length=100)
+    imdb_id = models.CharField(max_length=100, db_index=True, unique=True)
     year = models.IntegerField(null=True, blank=True)
     director = models.CharField(max_length=500, null=True, blank=True)
     actors = models.TextField(null=True, blank=True)
@@ -28,8 +27,9 @@ class Movie(models.Model):
 
 
 class MovieList(models.Model):
-    name = models.CharField(max_length=100)
-    public = models.BooleanField(default=False)
+    name = models.CharField(max_length=100, db_index=True)
+    public = models.BooleanField(default=False, db_index=True)
+    slug = models.SlugField(max_length=100, default="", db_index=True)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
     movies = models.ManyToManyField(Movie)
     created_at = models.DateTimeField(auto_now_add=True)
@@ -38,6 +38,9 @@ class MovieList(models.Model):
 
     class Meta:
         ordering = ["name"]
+        indexes = [
+            models.Index(fields=["public", "owner"]),
+        ]
 
     def __str__(self):
         return self.name
@@ -47,7 +50,7 @@ class Schedule(models.Model):
     name = models.CharField(max_length=100)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
     public = models.BooleanField(default=False)
-    slug = models.SlugField(max_length=100, default="")
+    slug = models.SlugField(max_length=100, default="", db_index=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     deleted_at = models.DateTimeField(null=True, blank=True)

From 733784118390df4e7b443c8864d8d343ce0d40c5 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Fri, 11 Jul 2025 18:32:38 -0500
Subject: [PATCH 25/26] removed slug field from movielists

---
 movie_manager/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/movie_manager/models.py b/movie_manager/models.py
index 0271a0f..ccbb950 100644
--- a/movie_manager/models.py
+++ b/movie_manager/models.py
@@ -29,7 +29,6 @@ class Movie(models.Model):
 class MovieList(models.Model):
     name = models.CharField(max_length=100, db_index=True)
     public = models.BooleanField(default=False, db_index=True)
-    slug = models.SlugField(max_length=100, default="", db_index=True)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
     movies = models.ManyToManyField(Movie)
     created_at = models.DateTimeField(auto_now_add=True)

From fce7e1a653031b64158c87f88b851697d04f5e44 Mon Sep 17 00:00:00 2001
From: "Edward Tirado Jr." <ed@etdevelopment.net>
Date: Sat, 12 Jul 2025 14:01:50 -0500
Subject: [PATCH 26/26] updated cors to use env variable

---
 movienight/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/movienight/settings.py b/movienight/settings.py
index eb9878d..dc59df7 100644
--- a/movienight/settings.py
+++ b/movienight/settings.py
@@ -26,7 +26,7 @@ SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
 DEBUG = bool(os.environ.get("DEBUG", default=0))
 
 ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", "127.0.0.1").split(",")
-CORS_ALLOWED_ORIGINS = ["http://localhost:3000"]
+CORS_ALLOWED_ORIGINS = os.environ.get("DJANGO_ALLOWED_ORIGINS", "http://localhost:3000").split(",")
 
 # Application definition