Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2aa625a6ac | |||
| d39e758df4 | |||
| 690d11e966 | |||
| 02ce78551c | |||
| 112b74f5cd | |||
| 22a92cb3df |
@@ -156,6 +156,11 @@ class AbstractModelAPISerializer:
|
|||||||
if isinstance(geojson, dict):
|
if isinstance(geojson, dict):
|
||||||
geojson = json.dumps(geojson)
|
geojson = json.dumps(geojson)
|
||||||
geometry = geos.fromstr(geojson)
|
geometry = geos.fromstr(geojson)
|
||||||
|
if not geometry.valid:
|
||||||
|
raise ValueError(f"Invalid geometry: {geometry.valid_reason}")
|
||||||
|
is_4326 = Geometry.is_valid_4326(geometry)
|
||||||
|
if not is_4326:
|
||||||
|
raise ValueError("Geometry not in EPSG:4326 (WGS84). Unknown spatial reference system.")
|
||||||
geometry = Geometry.cast_to_rlp_srid(geometry)
|
geometry = Geometry.cast_to_rlp_srid(geometry)
|
||||||
geometry = Geometry.cast_to_multipolygon(geometry)
|
geometry = Geometry.cast_to_multipolygon(geometry)
|
||||||
return geometry
|
return geometry
|
||||||
|
|||||||
@@ -325,8 +325,8 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
|
|||||||
self.identifier = self.generate_new_identifier()
|
self.identifier = self.generate_new_identifier()
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
def mark_as_deleted(self, user, send_mail: bool = True):
|
def mark_as_deleted(self, user, send_mail: bool = True, comment: str|None = None):
|
||||||
super().mark_as_deleted(user, send_mail)
|
super().mark_as_deleted(user, send_mail, comment)
|
||||||
if user is not None:
|
if user is not None:
|
||||||
self.intervention.mark_as_edited(user, edit_comment=COMPENSATION_REMOVED_TEMPLATE.format(self.identifier))
|
self.intervention.mark_as_edited(user, edit_comment=COMPENSATION_REMOVED_TEMPLATE.format(self.identifier))
|
||||||
|
|
||||||
|
|||||||
@@ -306,7 +306,7 @@ class Intervention(BaseObject,
|
|||||||
self.set_unchecked()
|
self.set_unchecked()
|
||||||
return action
|
return action
|
||||||
|
|
||||||
def mark_as_deleted(self, user, send_mail: bool = True):
|
def mark_as_deleted(self, user, send_mail: bool = True, comment: str|None = None):
|
||||||
""" Extends base mark_as_delete functionality
|
""" Extends base mark_as_delete functionality
|
||||||
|
|
||||||
Removes related deductions from the database, which results in updating the deductable_rest of the
|
Removes related deductions from the database, which results in updating the deductable_rest of the
|
||||||
@@ -315,11 +315,12 @@ class Intervention(BaseObject,
|
|||||||
Args:
|
Args:
|
||||||
user (User): The performing user
|
user (User): The performing user
|
||||||
send_mail (bool): Whether to send an info mail
|
send_mail (bool): Whether to send an info mail
|
||||||
|
comment (str|None): The delete comment
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
super().mark_as_deleted(user, send_mail)
|
super().mark_as_deleted(user, send_mail, comment)
|
||||||
|
|
||||||
# Remove pending deductions to free booked capacities
|
# Remove pending deductions to free booked capacities
|
||||||
deductions = self.deductions.all()
|
deductions = self.deductions.all()
|
||||||
|
|||||||
@@ -0,0 +1,113 @@
|
|||||||
|
"""
|
||||||
|
Author: Michel Peltriaux
|
||||||
|
Created on: 16.07.26
|
||||||
|
|
||||||
|
"""
|
||||||
|
from django.db.models import QuerySet
|
||||||
|
|
||||||
|
from compensation.models import Compensation, EcoAccount
|
||||||
|
from ema.models import Ema
|
||||||
|
from intervention.models import Intervention
|
||||||
|
from konova.management.commands.setup import BaseKonovaCommand
|
||||||
|
from user.models import User
|
||||||
|
|
||||||
|
|
||||||
|
class Command(BaseKonovaCommand):
|
||||||
|
help = "Mass-deletes entries according to user input"
|
||||||
|
|
||||||
|
_DELETE_CLS = None
|
||||||
|
_DELETE_COMMENT = None
|
||||||
|
_DELETE_IDENTIFIER_ILIKE_PARAM = None
|
||||||
|
_DELETE_USER = None
|
||||||
|
|
||||||
|
def handle(self, *args, **options):
|
||||||
|
self._get_delete_user()
|
||||||
|
self._get_object_type()
|
||||||
|
self._get_identifier_ilike_param()
|
||||||
|
self._get_delete_comment()
|
||||||
|
self._show_config()
|
||||||
|
entries = self._collect_entries()
|
||||||
|
self._process_delete(entries)
|
||||||
|
|
||||||
|
def _get_delete_user(self):
|
||||||
|
self._DELETE_USER = User.objects.filter(
|
||||||
|
is_superuser=True,
|
||||||
|
is_staff=True
|
||||||
|
).order_by(
|
||||||
|
"id"
|
||||||
|
).first()
|
||||||
|
|
||||||
|
if not self._DELETE_USER:
|
||||||
|
self._write_error("No admin-staff user could be found. Please check the admin users!")
|
||||||
|
|
||||||
|
def _get_object_type(self):
|
||||||
|
object_types = {
|
||||||
|
"eiv": Intervention,
|
||||||
|
"kom": Compensation,
|
||||||
|
"oek": EcoAccount,
|
||||||
|
"ema": Ema,
|
||||||
|
}
|
||||||
|
object_types_str = "|".join(object_types.keys())
|
||||||
|
object_type_select = input(f"Which object type shall be processed? ({object_types_str}): ").lower()
|
||||||
|
try:
|
||||||
|
self._DELETE_CLS = object_types[object_type_select]
|
||||||
|
if self._DELETE_CLS == EcoAccount:
|
||||||
|
oek_deduction_remove_understood = input(f"Please be aware that deleting OEKs will result in TOTAL REMOVING of their deductions without any chance to restore them. Do you want to continue? (y|n): ")
|
||||||
|
oek_deduction_remove_understood = oek_deduction_remove_understood.lower() == "y"
|
||||||
|
if not oek_deduction_remove_understood:
|
||||||
|
self._write_error("Removing of OEK canceled. Abort.")
|
||||||
|
exit(-1)
|
||||||
|
|
||||||
|
except KeyError:
|
||||||
|
self._write_error(f"'{object_type_select}' not a valid option of {object_types_str}. Abort.")
|
||||||
|
exit(-1)
|
||||||
|
|
||||||
|
def _get_identifier_ilike_param(self):
|
||||||
|
self._DELETE_IDENTIFIER_ILIKE_PARAM = input("Use this substring to search in identifiers: ")
|
||||||
|
|
||||||
|
def _get_delete_comment(self):
|
||||||
|
self._DELETE_COMMENT = input("Comment to store in delete action: ")
|
||||||
|
|
||||||
|
def _show_config(self):
|
||||||
|
assert self._DELETE_CLS is not None
|
||||||
|
assert self._DELETE_IDENTIFIER_ILIKE_PARAM is not None
|
||||||
|
assert self._DELETE_COMMENT is not None
|
||||||
|
|
||||||
|
self._write_warning("You are about to delete entries with:")
|
||||||
|
self._write_warning(f" Object type: {self._DELETE_CLS.__name__}")
|
||||||
|
self._write_warning(f" Identifier pattern: '*{self._DELETE_IDENTIFIER_ILIKE_PARAM}*'")
|
||||||
|
self._write_warning(f" Comment for delete action: '{self._DELETE_COMMENT}'")
|
||||||
|
self._write_warning(f" Delete performing user: '{self._DELETE_USER}'")
|
||||||
|
|
||||||
|
def _collect_entries(self):
|
||||||
|
return self._DELETE_CLS.objects.filter(
|
||||||
|
deleted__isnull=True,
|
||||||
|
identifier__contains=self._DELETE_IDENTIFIER_ILIKE_PARAM
|
||||||
|
)
|
||||||
|
|
||||||
|
def _process_delete(self, entries: QuerySet):
|
||||||
|
entries_count = entries.count()
|
||||||
|
if entries_count == 0:
|
||||||
|
self._write_success(f"Found {entries_count} matches to delete. Nothing to do here. Bye.")
|
||||||
|
exit(0)
|
||||||
|
|
||||||
|
self._write_warning(f"Found {entries_count} matches to delete. Please double-check whether these samples from the results are what you expected: ")
|
||||||
|
first_three_elements = entries[:3]
|
||||||
|
for element in first_three_elements:
|
||||||
|
self._write_warning(f" {element.identifier} ({element.id})")
|
||||||
|
|
||||||
|
delete_input = input("Are you ready to delete them now? (y|n): ").lower()
|
||||||
|
delete_now = delete_input == "y"
|
||||||
|
if not delete_now:
|
||||||
|
self._write_error(f"Entered unknown '{delete_input}'. Abort.")
|
||||||
|
exit(-1)
|
||||||
|
else:
|
||||||
|
i = 0
|
||||||
|
for element in entries:
|
||||||
|
if i % 10 == 0:
|
||||||
|
self._write_warning(f" Deleted {i}/{entries_count}")
|
||||||
|
element.mark_as_deleted(user=self._DELETE_USER, send_mail=False, comment=self._DELETE_COMMENT)
|
||||||
|
i += 1
|
||||||
|
|
||||||
|
self._write_warning(f" Deleted {entries_count}/{entries_count}")
|
||||||
|
self._write_success("Entries deleted. Bye.")
|
||||||
@@ -462,6 +462,26 @@ class Geometry(BaseResource):
|
|||||||
conflict_geoms = Geometry.objects.filter(id__in=conflict_geoms_id)
|
conflict_geoms = Geometry.objects.filter(id__in=conflict_geoms_id)
|
||||||
return conflict_geoms
|
return conflict_geoms
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_valid_4326(geometry):
|
||||||
|
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:4326
|
||||||
|
|
||||||
|
Args:
|
||||||
|
geometry: The geometry
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ret_val (bool): Whether the geometry is valid EPSG:4326
|
||||||
|
"""
|
||||||
|
if not geometry.centroid.coords:
|
||||||
|
# No coordinates at all found, therefore technically proper 4326
|
||||||
|
return True
|
||||||
|
|
||||||
|
try:
|
||||||
|
lat,lon = geometry.centroid.coords
|
||||||
|
return (-90.0 <= lat <= 90.0) and (-180.0 <= lon <= 180.0)
|
||||||
|
except IndexError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class GeometryConflict(UuidModel):
|
class GeometryConflict(UuidModel):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -92,13 +92,15 @@ class DeletableObjectMixin(models.Model):
|
|||||||
class Meta:
|
class Meta:
|
||||||
abstract = True
|
abstract = True
|
||||||
|
|
||||||
def mark_as_deleted(self, user, send_mail: bool = True):
|
def mark_as_deleted(self, user, send_mail: bool = True, comment: str|None = None):
|
||||||
""" Mark an entry as deleted
|
""" Mark an entry as deleted
|
||||||
|
|
||||||
Does not delete from database but sets a timestamp for being deleted on and which user deleted the object
|
Does not delete from database but sets a timestamp for being deleted on and which user deleted the object
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
user (User): The performing user
|
user (User): The performing user
|
||||||
|
send_mail (bool): Whether to send mails to users and teams
|
||||||
|
comment (str|None): The comment for delete action
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
|
|
||||||
@@ -109,7 +111,7 @@ class DeletableObjectMixin(models.Model):
|
|||||||
return
|
return
|
||||||
|
|
||||||
with transaction.atomic():
|
with transaction.atomic():
|
||||||
action = UserActionLogEntry.get_deleted_action(user)
|
action = UserActionLogEntry.get_deleted_action(user, comment)
|
||||||
self.deleted = action
|
self.deleted = action
|
||||||
self.log.add(action)
|
self.log.add(action)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
"""
|
||||||
|
Author: Michel Peltriaux
|
||||||
|
Created on: 16.07.26
|
||||||
|
|
||||||
|
"""
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
"""
|
||||||
|
Author: Michel Peltriaux
|
||||||
|
Created on: 16.07.26
|
||||||
|
|
||||||
|
"""
|
||||||
Reference in New Issue
Block a user