Skip to content

Commit

Permalink
Merge pull request #1293 from archesproject/1292-sample-deletion
Browse files Browse the repository at this point in the history 
1292 Fix sample deletion
  • Loading branch information
@njkim
njkim authored Oct 11, 2023
2 parents dc2ae3d + d10faa5 commit 04c4f9e
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 34 deletions.
139 changes: 107 additions & 32 deletions arches_for_science/tests.py
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,66 @@
import os
from pathlib import Path

from django.core.management import call_command

from django.contrib.auth.models import User
from django.test import TestCase
from django.test.client import Client
from django.urls import reverse
from django.utils.translation import get_language

from arches.app.utils.betterJSONSerializer import JSONSerializer
from arches.app.models.models import Node, NodeGroup, ResourceInstance, ResourceXResource, TileModel
from arches.app.models.models import GraphModel, Node, NodeGroup, ResourceInstance, ResourceXResource, TileModel
from arches.app.models.system_settings import settings
from arches.app.models.tile import Tile

PHYSICAL_THING_GRAPH_ID = "9519cb4f-b25b-11e9-8c7b-a4d18cec433a"
PART_IDENTIFIER_ASSIGNMENT = "b240c366-8594-11ea-97eb-acde48001122"
SAMPLING_ACTIVITY_GRAPH_ID = "03357848-1d9d-11eb-a29f-024e0d439fdb"
COLLECTION_RESOURCE = "54bf1022-a0b8-4f95-a5e9-82c084b2f533" # arbitrary test value


def setUpModule():
# TODO: when py 3.11 is min (soon), we can use contextlib.chdir() context mgr
os.chdir(Path(__file__).parent)
# TODO: this command isn't using a tempdir, so it's leaving behind files
call_command("packages", "-o load_package -s pkg -y".split())
if not GraphModel.objects.filter(pk=PHYSICAL_THING_GRAPH_ID).exists():
# TODO: this command isn't using a tempdir, so it's leaving behind files
call_command("packages", "-o load_package -s arches_for_science/pkg -y".split())
if not User.objects.filter(username="tester1").exists():
call_command("add_test_users")


class AnalysisAreaAndSampleTakingTests(TestCase):
def test_create_delete_analysis_area(self):
def login(self, username="dev", password="dev"):
client = Client()
client.login(username="ben", password="Test12345!")

transaction_id = "10000000-1000-1000-1000-100000000000"
graph_id = "9519cb4f-b25b-11e9-8c7b-a4d18cec433a"
part_identifier_assignment = "b240c366-8594-11ea-97eb-acde48001122"
collection_resource = "54bf1022-a0b8-4f95-a5e9-82c084b2f53"
client.login(username=username, password=password)
return client

def get_resource_instance(self, graph_id):
r = ResourceInstance(graph_id=graph_id)
r.save() # not part of the transaction, part of the setup
self.addCleanup(r.delete)
parent_phys_thing = str(r.pk)
return r

def make_tile(self, parent_phys_thing, data, transaction_id):
arbitrary_nodegroup = NodeGroup.objects.first()
new_tile = TileModel(resourceinstance=parent_phys_thing, nodegroup=arbitrary_nodegroup)
new_tile.save()
# Set the transactionid
new_tile = Tile.objects.get(tileid=new_tile.pk)
new_tile.data = data
new_tile.save(transaction_id=transaction_id)

self.addCleanup(new_tile.delete)
return new_tile

def test_create_delete_analysis_area(self):
# TODO: fails with dev/dev? 🤔
client = self.login(username="ben", password="Test12345!")

transaction_id = "10000000-1000-1000-1000-100000000000"
parent_phys_thing = self.get_resource_instance(PHYSICAL_THING_GRAPH_ID)
create_data = {
"transaction_id": transaction_id, # NB: snake_case
"parentPhysicalThingResourceid": parent_phys_thing, # NB: lowercase id
"collectionResourceid": collection_resource,
"parentPhysicalThingResourceid": str(parent_phys_thing.pk), # NB: lowercase id
"collectionResourceid": COLLECTION_RESOURCE,
"partIdentifierAssignmentTileData": JSONSerializer().serialize(
{part_identifier_assignment: []}
{PART_IDENTIFIER_ASSIGNMENT: []}
),
"analysisAreaName": "Test Analysis Area",
}
Expand All @@ -48,19 +70,11 @@ def test_create_delete_analysis_area(self):
new_resource = ResourceInstance.objects.get(
pk=response.json()['result']['memberOfTile']['resourceinstance_id']
)
arbitrary_nodegroup = NodeGroup.objects.first()
new_tile = TileModel(resourceinstance=r, nodegroup=arbitrary_nodegroup)
new_tile.save()
# Set the transactionid
new_tile_data = {part_identifier_assignment: [{"resourceId": str(new_resource.pk)}]}
new_tile = Tile.objects.get(tileid=new_tile.pk)
new_tile.data = new_tile_data
new_tile.save(transaction_id=transaction_id)

self.addCleanup(new_tile.delete)
new_tile_data = {PART_IDENTIFIER_ASSIGNMENT: [{"resourceId": str(new_resource.pk)}]}
new_tile = self.make_tile(parent_phys_thing, new_tile_data, transaction_id)
rxr = ResourceXResource(
nodeid=Node.objects.get(pk=part_identifier_assignment),
resourceinstanceidfrom=r,
nodeid=Node.objects.get(pk=PART_IDENTIFIER_ASSIGNMENT),
resourceinstanceidfrom=parent_phys_thing,
resourceinstanceidto=new_resource,
tileid=new_tile,
)
Expand All @@ -69,11 +83,72 @@ def test_create_delete_analysis_area(self):

delete_data = {
"transactionId": transaction_id, # NB: camelCase
"parentPhysicalThingResourceId": parent_phys_thing, # NB: uppercase id
"parentPhysicalThingResourceId": str(parent_phys_thing.pk), # NB: uppercase id
"parentPhysicalThingTileData": JSONSerializer().serialize(new_tile_data),
}
delete_data = JSONSerializer().serialize(delete_data)
content_type = "application/json"
response = client.post(reverse("deleteanalysisarea"), delete_data, content_type=content_type)

self.assertEqual(response.status_code, 200)

def test_create_delete_sample(self):
client = self.login()

transaction_id = "10000000-1000-1000-1000-100000000001"
parent_phys_thing = self.get_resource_instance(PHYSICAL_THING_GRAPH_ID)
sampling_activity = self.get_resource_instance(SAMPLING_ACTIVITY_GRAPH_ID)
part = self.get_resource_instance(PHYSICAL_THING_GRAPH_ID)

# Create
physical_part_of_object_nodeid = "b240c366-8594-11ea-97eb-acde48001122"
part_identifier_assignment_label_nodeid = "3e541cc6-859b-11ea-97eb-acde48001122"
part_identifier_assignment_polygon_identifier_nodeid = "97c30c42-8594-11ea-97eb-acde48001122"
part_identifier_assignment_tile_data = {
part_identifier_assignment_label_nodeid: {
get_language(): {"value": "test value", "direction": "ltr"}
},
physical_part_of_object_nodeid: [],
part_identifier_assignment_polygon_identifier_nodeid: {},
}

create_data = {
"transaction_id": transaction_id, # NB: snake_case
"parentPhysicalThingResourceid": str(parent_phys_thing.pk),
"parentPhysicalThingName": "Test Name of Physical Thing",
"collectionResourceid": COLLECTION_RESOURCE,
"partIdentifierAssignmentTileData": JSONSerializer().serialize(part_identifier_assignment_tile_data),
"partIdentifierAssignmentResourceId": str(part.pk),
"sampleMotivation": "Test Motivation",
"sampleDescription": "Test Description",
"samplingActivityResourceId": str(sampling_activity.pk),
}
response = client.post(reverse("savesamplearea"), create_data)
self.assertEqual(response.status_code, 200)

# Delete
result = response.json()['result']
physical_part_of_object_nodeid = "b240c366-8594-11ea-97eb-acde48001122"
physical_part_of_object_resourceid = result['parentPhysicalThing']['physicalPartOfObjectTile']['data'][physical_part_of_object_nodeid][0]['resourceId']
part_identifier_assignment_tile_data = {
**part_identifier_assignment_tile_data,
physical_part_of_object_nodeid: [
{"resourceId": physical_part_of_object_resourceid},
],
}

delete_data = {
"transactionId": transaction_id, # NB: camelCase
"parentPhysicalThingResourceid": str(parent_phys_thing.pk),
"parentPhysicalThingName": "Test Name of Physical Thing",
"partIdentifierAssignmentTileData": JSONSerializer().serialize(part_identifier_assignment_tile_data),
"samplingActivityResourceId": str(sampling_activity.pk),
"collectionResourceid": COLLECTION_RESOURCE,
"sampleMotivation": "Test Motivation",
"sampleDescription": "Test Description",
}
delete_data = JSONSerializer().serialize(delete_data)
content_type = "application/json"
response = client.post(reverse("deletesamplearea"), delete_data, content_type=content_type)

self.assertEqual(response.status_code, 200)
4 changes: 2 additions & 2 deletions arches_for_science/views/analysis_area_and_sample_taking.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,9 @@ def post(self, request):

with transaction.atomic():
Resource.objects.get(resourceinstanceid=sample_area_physical_thing_resourceid).delete(
transaction_id=transaction_id, request=request)
transaction_id=transaction_id, user=request.user)
Resource.objects.get(resourceinstanceid=sample_physical_thing_resourceid).delete(
transaction_id=transaction_id, request=request)
transaction_id=transaction_id, user=request.user)
Tile.objects.get(tileid=parentPhysicalThingSampleTile.tileid_id).delete(
transaction_id=transaction_id, request=request)
Tile.objects.get(tileid=samplingActivitySampleTile.tileid_id).delete(
Expand Down

0 comments on commit 04c4f9e

Please sign in to comment.