mirror of
https://github.com/sartography/cr-connect-workflow.git
synced 2025-02-23 13:18:35 +00:00
c7484267e1
We now cache the LDAP records - so we look in our own database for the record before calling out to ldap for the details when given a straight up computing id like dhf8r. Added "date_approved" to the approval model. And moved the approver and primary investigator into real associated models to make it easier to dump. Fixed a problem with the validation that was causing it to throw incorrect errors on valid workflows. Getting it to behave a little more like the front end behaves, and respecting the read-only fields. But it was mainly to do with always returning all the data with each form submission.
40 lines
1.4 KiB
Python
40 lines
1.4 KiB
Python
from flask_marshmallow.sqla import SQLAlchemyAutoSchema
|
|
from marshmallow import EXCLUDE
|
|
from sqlalchemy import func, inspect
|
|
|
|
from crc import db
|
|
|
|
|
|
class LdapModel(db.Model):
|
|
uid = db.Column(db.String, primary_key=True)
|
|
display_name = db.Column(db.String)
|
|
given_name = db.Column(db.String)
|
|
email_address = db.Column(db.String)
|
|
telephone_number = db.Column(db.String)
|
|
title = db.Column(db.String)
|
|
department = db.Column(db.String)
|
|
affiliation = db.Column(db.String)
|
|
sponsor_type = db.Column(db.String)
|
|
date_cached = db.Column(db.DateTime(timezone=True), default=func.now())
|
|
|
|
@classmethod
|
|
def from_entry(cls, entry):
|
|
return LdapModel(uid=entry.uid.value,
|
|
display_name=entry.displayName.value,
|
|
given_name=", ".join(entry.givenName),
|
|
email_address=entry.mail.value,
|
|
telephone_number=entry.telephoneNumber.value,
|
|
title=", ".join(entry.title),
|
|
department=", ".join(entry.uvaDisplayDepartment),
|
|
affiliation=", ".join(entry.uvaPersonIAMAffiliation),
|
|
sponsor_type=", ".join(entry.uvaPersonSponsoredType))
|
|
|
|
|
|
class LdapSchema(SQLAlchemyAutoSchema):
|
|
class Meta:
|
|
model = LdapModel
|
|
load_instance = True
|
|
include_relationships = True
|
|
include_fk = True # Includes foreign keys
|
|
unknown = EXCLUDE
|