mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
* Upgrade to heroku-20 stack * Move some gulp deps to dev rather than prod * npm upgrade * Fix audit time check in asset audit test * Attempt at parallelising tests where possible * Add basic calendar button test Mainly to pickup on FullCalendar loading errors * Upgrade python deps * Tends to help if I push valid yaml * You valid now? * Fix whoops in requirements.txt * Change python ver * Define service in coveralls task * Run parallelised RIGS tests as one matrix job * Update python version in tests * Cache python dependencies Should majorly speedup parallelillelelised testing * Purge old vagrant config * No Ruby compass bodge, no need for rubocop! * Purge old .idea config * Switch to gh-a artifact uploading instead of imgur 'hack' For test failure screenshots. Happy now @mattysmith22? ;p * Oops, remove unused import * Exclude tests from the coverage stats Seems to be artifically deflating our stats * Refactor asset audit tests with better selectors Also fixed a silly title error with the modal * Add title checking to the slightly insane assets test * Fix unauth test to not just immediately pass out * Upload failure screenshots as individual artifacts not a zip Turns out I can't unzip things from my phone, which is a pain * Should fix asset test on CI * What about this? * What about this? Swear I spend my life jiggerypokerying the damn test suite... * Does this help the coverage be less weird? * Revert "Does this help the coverage be less weird?" This reverts commit39ab9df836. * Use pytest as our test runner for better parallelism Also rewrote some asset tests to be in the pytest style. May do some more. Some warnings cleaned up in the process. * Bah, codestyle * Oops, remove obsolete if check * Fix screenshot uploading on CI (again) * Try this way of parallel coverage * Add codeclimate maintainability badge * Remove some unused gulp dependencies * Run asset building serverside * Still helps if I commit valid YAML * See below * Different approach to CI dependencies * Exclude node_modules from codestyle * Does this work? * Parallel parallel builds were giving me a headache, try this * Update codeclimate settings, purge some config files * Well the YAML was *syntactically* valid.... * Switch back to old coveralls method * Fix codeclimate config, mark 2 * Attempt to bodge asset test * Oops, again Probably bedtime.. * Might fix heroku building * Attempt #2 at fixing heroku * Belt and braces approach to coverage * Github, you need a Actions YAML validator! * Might fix actions? * Try ignoring some third party deprecation warnings * Another go at making coverage show up * Some template cleanup * Minor python cleanup * Import optimisation * Revert "Minor python cleanup" This reverts commit6a4620a2e5. * Add format arg to coverage command * Ignore test directories from Heroku slug * Maybe this works to purge deps postbuild * Bunch of test refactoring * Restore signals import, screw you import optimisation * Further template refactoring * Add support for running tests with geckodriver, do this on CI * Screw you codestyle * Disable firefox tests for now That was way more errors than I expected * Run cleanup script from the right location * Plausibly fix tests * Helps if I don't delete the pipeline folder prior to collectstatic * Enable whitenoise * Can I delete pipeline here? * Allow seconds difference in assert_times_equal * Disable codeclimate * Remove not working rm command * Maybe this fixes coverage? * Try different coverage reporter * Fix search_help to need login * Made versioning magic a bit less expansive We have more apps than I thought... * Fix IDI0T error in Assets URLS * Refactor 'no access to unauthed' test to cover all of PyRIGS * Add RAs/Checklists to sample data generator * Fix some HTML errors in templates Which apparently only Django's HTML parser cares about, browsers DGAF... * Port title test to project level * Fix more HTML * Fix cable type detail
206 lines
7.1 KiB
Python
206 lines
7.1 KiB
Python
import logging
|
|
|
|
from diff_match_patch import diff_match_patch
|
|
from django.contrib.contenttypes.models import ContentType
|
|
from django.core.exceptions import ObjectDoesNotExist
|
|
from django.db.models import EmailField, IntegerField, TextField, CharField, BooleanField
|
|
from django.utils.functional import cached_property
|
|
from reversion.models import Version, VersionQuerySet
|
|
|
|
from RIGS import models
|
|
|
|
logger = logging.getLogger('tec.pyrigs')
|
|
|
|
|
|
class FieldComparison(object):
|
|
def __init__(self, field=None, old=None, new=None):
|
|
self.field = field
|
|
self._old = old
|
|
self._new = new
|
|
|
|
def display_value(self, value):
|
|
if (isinstance(self.field, IntegerField) or isinstance(self.field, CharField)) and self.field.choices is not None and len(self.field.choices) > 0:
|
|
choice = [x[1] for x in self.field.choices if x[0] == value]
|
|
# TODO This defensive piece should not be necessary?
|
|
if len(choice) > 0:
|
|
return choice[0]
|
|
if isinstance(self.field, BooleanField):
|
|
if value:
|
|
return "✓"
|
|
else:
|
|
return "✗"
|
|
return value
|
|
|
|
@property
|
|
def old(self):
|
|
return self.display_value(self._old)
|
|
|
|
@property
|
|
def new(self):
|
|
return self.display_value(self._new)
|
|
|
|
@property
|
|
def long(self):
|
|
if isinstance(self.field, EmailField):
|
|
return True
|
|
return False
|
|
|
|
@property
|
|
def linebreaks(self):
|
|
if isinstance(self.field, TextField):
|
|
return True
|
|
return False
|
|
|
|
@property
|
|
def diff(self):
|
|
oldText = str(self.display_value(self._old)) or ""
|
|
newText = str(self.display_value(self._new)) or ""
|
|
dmp = diff_match_patch()
|
|
diffs = dmp.diff_main(oldText, newText)
|
|
dmp.diff_cleanupSemantic(diffs)
|
|
|
|
outputDiffs = []
|
|
|
|
for (op, data) in diffs:
|
|
if op == dmp.DIFF_INSERT:
|
|
outputDiffs.append({'type': 'insert', 'text': data})
|
|
elif op == dmp.DIFF_DELETE:
|
|
outputDiffs.append({'type': 'delete', 'text': data})
|
|
elif op == dmp.DIFF_EQUAL:
|
|
outputDiffs.append({'type': 'equal', 'text': data})
|
|
return outputDiffs
|
|
|
|
|
|
class ModelComparison(object):
|
|
def __init__(self, old=None, new=None, version=None, follow=False, excluded_keys=[]):
|
|
# recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects
|
|
try:
|
|
self.fields = old._meta.get_fields()
|
|
except AttributeError:
|
|
self.fields = new._meta.get_fields()
|
|
|
|
self.old = old
|
|
self.new = new
|
|
self.excluded_keys = excluded_keys
|
|
self.version = version
|
|
self.follow = follow
|
|
|
|
@cached_property
|
|
def revision(self):
|
|
return self.version.revision
|
|
|
|
@cached_property
|
|
def field_changes(self):
|
|
changes = []
|
|
for field in self.fields:
|
|
field_name = field.name
|
|
if field_name not in self.excluded_keys: # if we're excluding this field, skip over it
|
|
try:
|
|
oldValue = getattr(self.old, field_name, None)
|
|
except ObjectDoesNotExist:
|
|
oldValue = None
|
|
|
|
try:
|
|
newValue = getattr(self.new, field_name, None)
|
|
except ObjectDoesNotExist:
|
|
newValue = None
|
|
|
|
bothBlank = (not oldValue) and (not newValue)
|
|
if oldValue != newValue and not bothBlank:
|
|
comparison = FieldComparison(field, oldValue, newValue)
|
|
changes.append(comparison)
|
|
return changes
|
|
|
|
@cached_property
|
|
def fields_changed(self):
|
|
return len(self.field_changes) > 0
|
|
|
|
@cached_property
|
|
def item_changes(self):
|
|
if self.follow and self.version.object is not None:
|
|
item_type = ContentType.objects.get_for_model(self.version.object)
|
|
old_item_versions = self.version.parent.revision.version_set.exclude(content_type=item_type)
|
|
new_item_versions = self.version.revision.version_set.exclude(content_type=item_type).exclude(content_type=ContentType.objects.get_for_model(models.EventAuthorisation))
|
|
|
|
comparisonParams = {'excluded_keys': ['id', 'event', 'order', 'checklist']}
|
|
|
|
# Build some dicts of what we have
|
|
item_dict = {} # build a list of items, key is the item_pk
|
|
for version in old_item_versions: # put all the old versions in a list
|
|
compare = ModelComparison(old=version._object_version.object, **comparisonParams)
|
|
item_dict[version.object_id] = compare
|
|
|
|
for version in new_item_versions: # go through the new versions
|
|
try:
|
|
compare = item_dict[version.object_id] # see if there's a matching old version
|
|
compare.new = version._object_version.object # then add the new version to the dictionary
|
|
except KeyError: # there's no matching old version, so add this item to the dictionary by itself
|
|
compare = ModelComparison(new=version._object_version.object, **comparisonParams)
|
|
|
|
item_dict[version.object_id] = compare # update the dictionary with the changes
|
|
|
|
changes = []
|
|
for (_, compare) in list(item_dict.items()):
|
|
if compare.fields_changed:
|
|
changes.append(compare)
|
|
|
|
return changes
|
|
|
|
@cached_property
|
|
def name(self):
|
|
obj = self.new if self.new else self.old
|
|
|
|
if(hasattr(obj, 'activity_feed_string')):
|
|
return obj.activity_feed_string
|
|
else:
|
|
return str(obj)
|
|
|
|
@cached_property
|
|
def items_changed(self):
|
|
return self.item_changes is not None and len(self.item_changes) > 0
|
|
|
|
@cached_property
|
|
def anything_changed(self):
|
|
return self.fields_changed or self.items_changed
|
|
|
|
|
|
class RIGSVersionManager(VersionQuerySet):
|
|
def get_for_multiple_models(self, model_array):
|
|
content_types = []
|
|
for model in model_array:
|
|
content_types.append(ContentType.objects.get_for_model(model))
|
|
|
|
return self.filter(content_type__in=content_types).select_related("revision").order_by(
|
|
"-revision__date_created")
|
|
|
|
|
|
class RIGSVersion(Version):
|
|
class Meta:
|
|
proxy = True
|
|
|
|
objects = RIGSVersionManager.as_manager()
|
|
|
|
# Gets the most recent previous version
|
|
@cached_property
|
|
def parent(self):
|
|
thisId = self.object_id
|
|
|
|
versions = RIGSVersion.objects.get_for_object_reference(self.content_type.model_class(), thisId).select_related(
|
|
"revision", "revision__user").all()
|
|
|
|
try:
|
|
previousVersion = versions.filter(revision_id__lt=self.revision_id).latest('revision__date_created')
|
|
except ObjectDoesNotExist:
|
|
return False
|
|
|
|
return previousVersion
|
|
|
|
@cached_property
|
|
def changes(self):
|
|
return ModelComparison(
|
|
version=self,
|
|
new=self._object_version.object,
|
|
old=self.parent._object_version.object if self.parent else None,
|
|
follow=True
|
|
)
|