From 26f5d3f6f8ce56c050fccb899b559e8c0dcd738e Mon Sep 17 00:00:00 2001
From: Brody Wilton <brodywilton@hotmail.com>
Date: Tue, 26 Mar 2024 12:36:09 +0000
Subject: [PATCH] remove old code
---
myproject/myapp/models.py | 83 ++-------------------------------------
1 file changed, 4 insertions(+), 79 deletions(-)
diff --git a/myproject/myapp/models.py b/myproject/myapp/models.py
index b09b3f1..900085c 100644
--- a/myproject/myapp/models.py
+++ b/myproject/myapp/models.py
@@ -1,39 +1,11 @@
from django.db import models
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import User, Group, Permission
-from django.contrib.contenttypes.models import ContentType
+#from django.contrib.auth import get_user_model
+from django.contrib.auth.models import User#, Group, Permission
+#from django.contrib.contenttypes.models import ContentType
from enum import Enum
from django.dispatch import receiver
from django.db.models.signals import post_save
-# class UserTypes(User):
-# USER_TYPE_CHOICES = (
-# 0, 'Basic User',
-# 1, 'Admin',
-# 2, 'ML Engineer',
-# 3, 'Accountant'
-# )
-
-# usertype = models.PositiveSmallIntegerField(choices=USER_TYPE_CHOICES) # should we declare default=0 here?
-
-# group_names = ['Basic User', 'Admin', 'ML Engineer', 'Accountant']
-# for group_name in group_names:
-# Group.objects.get_or_create(name=group_name)
-
-# # assign group permissions
-# content_type = ContentType.objects.get_for_model(UserTypes)
-# permission = Permission.objects.create(codename='can_view_user',
-# name='Can View User',
-# content_type=content_type)
-# group = Group.objects.get(name='Admin')
-# group.permissions.add(permission)
-
-
-# User = get_user_model()
-
-# user = User.objects.create_user('username', 'email', 'password')
-# # names are not necessary - reduces gdpr concerns aswell
-
class Profile(models.Model):
USER_TYPES = (
(0, 'Basic User'),
@@ -48,7 +20,6 @@ class Profile(models.Model):
def __str__(self):
return f'{self.user.username} Profile'
-
# Model to hold the user token count
class UserTokenCount(models.Model):
# User
@@ -59,7 +30,7 @@ class UserTokenCount(models.Model):
def __str__(self):
return f'{self.user.username}\'s token count: {self.token_count}'
-# Automatically create a UserTokenCount entry for each user on user creation
+# Automatically create a UserTokenCount and a account type Profile table entry for each user on user creation
@receiver(post_save, sender=User)
def create_or_update_user_profile(sender, instance, created, **kwargs):
if created:
@@ -81,39 +52,6 @@ class Action(Enum):
DOWNLOAD_BREAKDOWN = "The user has downloaded a breakdown of their data."
UNKNOWN = "An unknown error has occurred."
-# class Logs(models.Model):
-# """
-# * Logs model
-# """
-# user_id = models.ForeignKey("User", on_delete=models.CASCADE)
-# error_id = models.IntegerField()
-# date = models.DateTimeField()
-
-# class Feedback(models.Model):
-# """
-# * Feedback Model
-# """
-# user_id = models.ForeignKey("User", on_delete=models.CASCADE)
-# content = models.CharField(max_length=2000)
-# date = models.DateTimeField()
-
-# class Bills(models.Model):
-# """
-# * Bill/receipts Model
-# """
-# user_id = models.ForeignKey("User", on_delete=models.CASCADE)
-# date = models.DateTimeField()
-# paid = models.BooleanField(default=False)
-
-
-# class Files(models.Model):
-# """
-# * Uploaded files
-# """
-# date = models.DateTimeField()
-# data = models.CharField(max_length=2000)
-# uploader = models.ForeignKey("User", on_delete=models.CASCADE)
-
class Audio(models.Model):
file = models.FileField('audio', upload_to='audio')
@@ -121,16 +59,3 @@ class Log(models.Model):
date = models.DateTimeField(auto_now_add=True)
user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
log = models.JSONField()
-
-# # LOGIN
-# log_data = get_log_data(Action.LOGIN, 'success', user=request.user.username)
-# create_log(log_data)
-# # REGISTER
-# log_data = get_log_data(Action.REGISTER, 'success', user=request.user.username)
-# create_log(log_data)
-# # INVALID_PASSWORD
-# log_data = get_log_data(Action.INVALID_PASSWORD, 'error', user=request.user.username)
-# create_log(log_data)
-# # GENERATE_FINANCIAL_STATEMENT
-# log_data = get_log_data(Action.GENERATE_FINANCIAL_STATEMENT, 'success', user=request.user.username)
-# create_log(log_data)
--
GitLab