Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
desd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
kj2-drupisz
desd
Commits
26f5d3f6
Commit
26f5d3f6
authored
1 year ago
by
Brody Wilton
Browse files
Options
Downloads
Patches
Plain Diff
remove old code
parent
6fdbb54c
No related branches found
No related tags found
1 merge request
!39
Brodybranch
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
myproject/myapp/models.py
+4
-79
4 additions, 79 deletions
myproject/myapp/models.py
with
4 additions
and
79 deletions
myproject/myapp/models.py
+
4
−
79
View file @
26f5d3f6
from
django.db
import
models
from
django.db
import
models
from
django.contrib.auth
import
get_user_model
#
from django.contrib.auth import get_user_model
from
django.contrib.auth.models
import
User
,
Group
,
Permission
from
django.contrib.auth.models
import
User
#
, Group, Permission
from
django.contrib.contenttypes.models
import
ContentType
#
from django.contrib.contenttypes.models import ContentType
from
enum
import
Enum
from
enum
import
Enum
from
django.dispatch
import
receiver
from
django.dispatch
import
receiver
from
django.db.models.signals
import
post_save
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
):
class
Profile
(
models
.
Model
):
USER_TYPES
=
(
USER_TYPES
=
(
(
0
,
'
Basic User
'
),
(
0
,
'
Basic User
'
),
...
@@ -48,7 +20,6 @@ class Profile(models.Model):
...
@@ -48,7 +20,6 @@ class Profile(models.Model):
def
__str__
(
self
):
def
__str__
(
self
):
return
f
'
{
self
.
user
.
username
}
Profile
'
return
f
'
{
self
.
user
.
username
}
Profile
'
# Model to hold the user token count
# Model to hold the user token count
class
UserTokenCount
(
models
.
Model
):
class
UserTokenCount
(
models
.
Model
):
# User
# User
...
@@ -59,7 +30,7 @@ class UserTokenCount(models.Model):
...
@@ -59,7 +30,7 @@ class UserTokenCount(models.Model):
def
__str__
(
self
):
def
__str__
(
self
):
return
f
'
{
self
.
user
.
username
}
\'
s token count:
{
self
.
token_count
}
'
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
)
@receiver
(
post_save
,
sender
=
User
)
def
create_or_update_user_profile
(
sender
,
instance
,
created
,
**
kwargs
):
def
create_or_update_user_profile
(
sender
,
instance
,
created
,
**
kwargs
):
if
created
:
if
created
:
...
@@ -81,39 +52,6 @@ class Action(Enum):
...
@@ -81,39 +52,6 @@ class Action(Enum):
DOWNLOAD_BREAKDOWN
=
"
The user has downloaded a breakdown of their data.
"
DOWNLOAD_BREAKDOWN
=
"
The user has downloaded a breakdown of their data.
"
UNKNOWN
=
"
An unknown error has occurred.
"
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
):
class
Audio
(
models
.
Model
):
file
=
models
.
FileField
(
'
audio
'
,
upload_to
=
'
audio
'
)
file
=
models
.
FileField
(
'
audio
'
,
upload_to
=
'
audio
'
)
...
@@ -121,16 +59,3 @@ class Log(models.Model):
...
@@ -121,16 +59,3 @@ class Log(models.Model):
date
=
models
.
DateTimeField
(
auto_now_add
=
True
)
date
=
models
.
DateTimeField
(
auto_now_add
=
True
)
user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
SET_NULL
,
null
=
True
,
blank
=
True
)
user
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
SET_NULL
,
null
=
True
,
blank
=
True
)
log
=
models
.
JSONField
()
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)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment