Skip to content

Commit

Permalink
check for empty values for connecting field names
Browse files Browse the repository at this point in the history
support get_accessor_name method for connection determination
catch duplicate entry errors
  • Loading branch information
JDTobin committed Jun 4, 2024
1 parent 0b58178 commit 02d1d21
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 15 deletions.
46 changes: 32 additions & 14 deletions p1_auth/models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import logging
from copy import deepcopy

from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ObjectDoesNotExist
from django.db import models
from django.db import DatabaseError, models

# Get an instance of a logger
logger = logging.getLogger(__name__)

# Create your models here.
class RelatedAssignment(models.Model):
Expand Down Expand Up @@ -62,19 +65,34 @@ def validate(self, user, jwt_json):
return False

def __add_user(self, user, obj, field):
if field.many_to_many or field.one_to_many:
if hasattr(field, 'attname'):
getattr(obj, field.attname).add(user)
elif hasattr(field, 'related_name'):
getattr(obj, field.related_name).add(user)
elif field.many_to_one:
if hasattr(field.remote_field, 'attname'):
getattr(user, field.remote_field.attname).add(obj)
elif hasattr(field.remote_field, 'related_name'):
getattr(user, field.remote_field.related_name).add(obj)
elif field.one_to_one:
setattr(obj, field.name, user)
obj.save()
try:
if field.many_to_many or field.one_to_many:
if hasattr(field, 'get_accessor_name') and\
field.get_accessor_name():
getattr(obj, field.get_accessor_name()).add(user)
elif hasattr(field, 'attname') and field.attname:
getattr(obj, field.attname).add(user)
elif hasattr(field, 'related_name') and field.related_name:
getattr(obj, field.related_name).add(user)
elif field.many_to_one:
if hasattr(field.remote_field, 'get_accessor_name') and\
field.remote_field.get_accessor_name():
getattr(user, field.remote_field.get_accessor_name()).add(obj)
elif hasattr(field.remote_field, 'attname') and\
field.remote_field.attname:
getattr(user, field.remote_field.attname).add(obj)
elif hasattr(field.remote_field, 'related_name') and\
field.remote_field.related_name:
getattr(user, field.remote_field.related_name).add(obj)
elif field.one_to_one:
setattr(obj, field.name, user)
obj.save()
except DatabaseError as db_err:
if 'Duplicate entry' in str(db_err):
return
else:
logger.error("DB Error: %s", db_err)


def __str__(self):
return f'{self.get_instance()} ({self.object_model})'
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = p1-auth
version = 0.1.4
version = 0.1.5
description = Installable Django Authentication that adds support for Platform One
long_description = file:README.md
long_description_content_type = text/markdown
Expand Down

0 comments on commit 02d1d21

Please sign in to comment.