Skip to content

Commit 1419cd7

Browse files
CarolineDenisCarolineDenis
authored
Merge pull request #5221 from specify/issue-5175
Respect naming convention for new geo tables
2 parents 3850165 + 530fbe9 commit 1419cd7

15 files changed

Lines changed: 90 additions & 90 deletions

‎specifyweb/businessrules/rules/cogtype_rules.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from specifyweb.businessrules.orm_signal_handler import orm_signal_handler
44
from specifyweb.specify.models import Picklist, Picklistitem
55

6-
@orm_signal_handler('pre_save', 'CollectionObjectGroupType')
6+
@orm_signal_handler('pre_save', 'Collectionobjectgrouptype')
77
def cogtype_pre_save(cog_type):
88

99
# Ensure the cog_type type is validated by being the picklist.

‎specifyweb/businessrules/rules/cojo_rules.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from specifyweb.businessrules.exceptions import BusinessRuleException
22
from specifyweb.businessrules.orm_signal_handler import orm_signal_handler
3-
from specifyweb.specify.models import CollectionObjectGroupJoin
3+
from specifyweb.specify.models import Collectionobjectgroupjoin
44

5-
@orm_signal_handler('pre_save', 'CollectionObjectGroupJoin')
5+
@orm_signal_handler('pre_save', 'Collectionobjectgroupjoin')
66
def cojo_pre_save(cojo):
77
# Ensure the both the childcog and childco fields are not null.
88
if cojo.childcog == None and cojo.childco == None:
@@ -16,12 +16,12 @@ def cojo_pre_save(cojo):
1616
# So when a record is saved with isPrimary set to True, we need to set all other records with the same parentcog
1717
# to isPrimary = False.
1818
if cojo.isprimary == True:
19-
(CollectionObjectGroupJoin.objects
19+
(Collectionobjectgroupjoin.objects
2020
.filter(parentcog=cojo.parentcog)
2121
.update(isprimary=False))
2222

2323
if cojo.issubstrate == True:
24-
(CollectionObjectGroupJoin.objects
24+
(Collectionobjectgroupjoin.objects
2525
.filter(parentcog=cojo.parentcog)
2626
.update(issubstrate=False))
2727

‎specifyweb/businessrules/tests/test_cog_type.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from specifyweb.businessrules.exceptions import BusinessRuleException
2-
from specifyweb.specify.models import CollectionObjectGroupType, Picklist, Picklistitem
2+
from specifyweb.specify.models import Collectionobjectgrouptype, Picklist, Picklistitem
33
from specifyweb.specify.tests.test_api import DefaultsSetup
44
from django.db import transaction
55

66
# NOTE: Edit this test when a new COG type rule is decided upon.
77
class COGTypeTest(DefaultsSetup):
88
def test_cog_type_select_values(self):
9-
CollectionObjectGroupType.objects.create(name='microscope slide', type='Discrete', collection=self.collection)
9+
Collectionobjectgrouptype.objects.create(name='microscope slide', type='Discrete', collection=self.collection)
1010

1111
with self.assertRaises(BusinessRuleException), transaction.atomic():
12-
CollectionObjectGroupType.objects.create(name='whole rock', type='Burrito', collection=self.collection)
12+
Collectionobjectgrouptype.objects.create(name='whole rock', type='Burrito', collection=self.collection)
1313

‎specifyweb/businessrules/tests/test_cojo.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
from specifyweb.specify.models import CollectionObjectGroup, CollectionObjectGroupJoin, CollectionObjectGroupType, Picklist, Picklistitem
1+
from specifyweb.specify.models import Collectionobjectgroup, Collectionobjectgroupjoin, Collectionobjectgrouptype, Picklist, Picklistitem
22
from specifyweb.specify.tests.test_api import DefaultsSetup
33

44
class CoJoTest(DefaultsSetup):
55
def test_cojo_rules_enforcement(self):
6-
cog_type = CollectionObjectGroupType.objects.create(name='microscope slide', type='Discrete', collection=self.collection)
7-
cog_1 = CollectionObjectGroup.objects.create(
6+
cog_type = Collectionobjectgrouptype.objects.create(name='microscope slide', type='Discrete', collection=self.collection)
7+
cog_1 = Collectionobjectgroup.objects.create(
88
collection=self.collection,
99
cogtype=cog_type
1010
)
11-
cog_2 = CollectionObjectGroup.objects.create(
11+
cog_2 = Collectionobjectgroup.objects.create(
1212
collection=self.collection,
1313
cogtype=cog_type
1414
)
15-
cog_3 = CollectionObjectGroup.objects.create(
15+
cog_3 = Collectionobjectgroup.objects.create(
1616
collection=self.collection,
1717
cogtype=cog_type
1818
)
19-
cojo_1 = CollectionObjectGroupJoin.objects.create(
19+
cojo_1 = Collectionobjectgroupjoin.objects.create(
2020
parentcog=cog_1,
2121
childcog=cog_2,
2222
isprimary=True,
2323
issubstrate=True
2424
)
25-
cojo_2 = CollectionObjectGroupJoin.objects.create(
25+
cojo_2 = Collectionobjectgroupjoin.objects.create(
2626
parentcog=cog_1,
2727
childcog=cog_3,
2828
isprimary=True,
2929
issubstrate=True
3030
)
3131

32-
cojo_1 = CollectionObjectGroupJoin.objects.get(id=cojo_1.id)
33-
cojo_2 = CollectionObjectGroupJoin.objects.get(id=cojo_2.id)
32+
cojo_1 = Collectionobjectgroupjoin.objects.get(id=cojo_1.id)
33+
cojo_2 = Collectionobjectgroupjoin.objects.get(id=cojo_2.id)
3434

3535
self.assertFalse(cojo_1.isprimary)
3636
self.assertFalse(cojo_1.issubstrate)
3737
self.assertTrue(cojo_2.isprimary)
3838
self.assertTrue(cojo_2.issubstrate)
3939

40-
cog_4 = CollectionObjectGroup.objects.create(
40+
cog_4 = Collectionobjectgroup.objects.create(
4141
collection=self.collection,
4242
cogtype=cog_type
4343
)
44-
cojo_3 = CollectionObjectGroupJoin.objects.create(
44+
cojo_3 = Collectionobjectgroupjoin.objects.create(
4545
parentcog=cog_1,
4646
childcog=cog_4,
4747
isprimary=False,
4848
issubstrate=False
4949
)
5050

51-
cojo_1 = CollectionObjectGroupJoin.objects.get(id=cojo_1.id)
52-
cojo_2 = CollectionObjectGroupJoin.objects.get(id=cojo_2.id)
53-
cojo_3 = CollectionObjectGroupJoin.objects.get(id=cojo_3.id)
51+
cojo_1 = Collectionobjectgroupjoin.objects.get(id=cojo_1.id)
52+
cojo_2 = Collectionobjectgroupjoin.objects.get(id=cojo_2.id)
53+
cojo_3 = Collectionobjectgroupjoin.objects.get(id=cojo_3.id)
5454

5555
self.assertFalse(cojo_1.isprimary)
5656
self.assertFalse(cojo_1.issubstrate)

‎specifyweb/businessrules/tests/test_collection.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ def test_collection_objects_block_delete(self):
5555
with self.assertRaises(ProtectedError):
5656
self.collection.delete()
5757

58-
models.CollectionObjectType.objects.filter(collection=self.collection).delete()
58+
models.Collectionobjecttype.objects.filter(collection=self.collection).delete()
5959
models.Collectionobject.objects.filter(collection=self.collection).delete()
6060
self.collection.delete()

‎specifyweb/businessrules/tests/test_collectionobject.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from specifyweb.specify.models import Collection, Collectionobject, CollectionObjectType
1+
from specifyweb.specify.models import Collection, Collectionobject, Collectionobjecttype
22
from specifyweb.specify.tests.test_api import ApiTests
33
from ..exceptions import BusinessRuleException
44

@@ -15,7 +15,7 @@ def test_catalog_number_unique_in_collection(self):
1515
catalognumber=self.collectionobjects[0].catalognumber + 'foo')
1616

1717
def test_default_collectionobjecttype(self):
18-
default_type = CollectionObjectType.objects.create(
18+
default_type = Collectionobjecttype.objects.create(
1919
name="default type",
2020
collection=self.collection,
2121
taxontreedef=self.discipline.taxontreedef

‎specifyweb/specify/calculated_fields.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Loan,
2020
Deaccession,
2121
Accession,
22-
CollectionObjectGroupJoin,
22+
Collectionobjectgroupjoin,
2323
)
2424

2525
logger = logging.getLogger(__name__)
@@ -104,7 +104,7 @@ def calculate_extra_fields(obj, data: Dict[str, Any]) -> Dict[str, Any]:
104104
(det["resource_uri"] for det in dets if det["iscurrent"]), None
105105
)
106106

107-
extra["isMemberOfCOG"] = CollectionObjectGroupJoin.objects.filter(childco=obj).exists()
107+
extra["isMemberOfCOG"] = Collectionobjectgroupjoin.objects.filter(childco=obj).exists()
108108

109109
elif isinstance(obj, Loan):
110110
preps = data["loanpreparations"]

‎specifyweb/specify/datamodel.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8234,8 +8234,8 @@
82348234
fields=[
82358235
Field(name='name', column='Name', indexed=False, unique=False, required=True, type='java.lang.String', length=255),
82368236
Field(name='version', column='Version', indexed=False, unique=False, required=False, type='java.lang.Integer'),
8237-
Field(name='timestampcreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8238-
Field(name='timestampmodified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
8237+
Field(name='timestampCreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8238+
Field(name='timestampModified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
82398239
Field(name='text1', column='Text1', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
82408240
Field(name='text2', column='Text2', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
82418241
Field(name='text3', column='Text3', indexed=False, unique=False, required=False, type='java.lang.String', length=255)
@@ -8268,8 +8268,8 @@
82688268
Field(name='igsn', column='IGSN', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
82698269
Field(name='guid', column='GUID', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
82708270
Field(name='version', column='Version', indexed=False, unique=False, required=False, type='java.lang.Integer'),
8271-
Field(name='timestampcreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8272-
Field(name='timestampmodified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
8271+
Field(name='timestampCreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8272+
Field(name='timestampModified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
82738273
Field(name='text1', column='Text1', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
82748274
Field(name='text2', column='Text2', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
82758275
Field(name='text3', column='Text3', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
@@ -8288,9 +8288,9 @@
82888288
],
82898289
relationships=[
82908290
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID'),
8291-
Relationship(name='cogtype', type='many-to-one', required=True, relatedModelName='CollectionObjectGroupType', column='COGTypeID'),
8292-
Relationship(name='parentcojos', type='one-to-many', required=False, relatedModelName='CollectionObjectGroupJoin', otherSideName='parentcog', dependent=True),
8293-
Relationship(name='cojo', type='one-to-many', required=False, relatedModelName='CollectionObjectGroupJoin', otherSideName='childcog', dependent=True),
8291+
Relationship(name='cogType', type='many-to-one', required=True, relatedModelName='CollectionObjectGroupType', column='COGTypeID'),
8292+
Relationship(name='parentCojos', type='one-to-many', required=False, relatedModelName='CollectionObjectGroupJoin', otherSideName='parentCog', dependent=True),
8293+
Relationship(name='cojo', type='one-to-many', required=False, relatedModelName='CollectionObjectGroupJoin', otherSideName='childCog', dependent=True),
82948294
Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
82958295
Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID'),
82968296
],
@@ -8308,12 +8308,12 @@
83088308
idFieldName='collectionObjectGroupJoinId',
83098309
idField=IdField(name='collectionObjectGroupJoinId', column='CollectionObjectGroupJoinID', type='java.lang.Integer'),
83108310
fields=[
8311-
Field(name='isprimary', column='IsPrimary', indexed=False, unique=False, required=True, type='java.lang.Boolean'),
8312-
Field(name='issubstrate', column='IsSubstrate', indexed=False, unique=False, required=True, type='java.lang.Boolean'),
8311+
Field(name='isPrimary', column='IsPrimary', indexed=False, unique=False, required=True, type='java.lang.Boolean'),
8312+
Field(name='isSubstrate', column='IsSubstrate', indexed=False, unique=False, required=True, type='java.lang.Boolean'),
83138313
Field(name='precedence', column='Precedence', indexed=False, unique=False, required=True, type='java.lang.Integer'),
83148314
Field(name='version', column='Version', indexed=False, unique=False, required=False, type='java.lang.Integer'),
8315-
Field(name='timestampcreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8316-
Field(name='timestampmodified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
8315+
Field(name='timestampCreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8316+
Field(name='timestampModified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
83178317
Field(name='text1', column='Text1', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
83188318
Field(name='text2', column='Text2', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
83198319
Field(name='text3', column='Text3', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
@@ -8328,9 +8328,9 @@
83288328

83298329
],
83308330
relationships=[
8331-
Relationship(name='parentcog', type='many-to-one', required=True, relatedModelName='CollectionObjectGroup', column='ParentCOGID', otherSideName='parentcojos'),
8332-
Relationship(name='childcog', type='one-to-one', required=False, relatedModelName='CollectionObjectGroup', column='ChildCOGID', otherSideName='cojo'),
8333-
Relationship(name='childco', type='one-to-one', required=False, relatedModelName='CollectionObject', column='ChildCOID', otherSideName='cojo'),
8331+
Relationship(name='parentCog', type='many-to-one', required=True, relatedModelName='CollectionObjectGroup', column='ParentCOGID', otherSideName='parentcojos'),
8332+
Relationship(name='childCog', type='one-to-one', required=False, relatedModelName='CollectionObjectGroup', column='ChildCOGID', otherSideName='cojo'),
8333+
Relationship(name='childCo', type='one-to-one', required=False, relatedModelName='CollectionObject', column='ChildCOID', otherSideName='cojo'),
83348334
],
83358335
fieldAliases=[
83368336

@@ -8349,8 +8349,8 @@
83498349
Field(name='name', column='Name', indexed=False, unique=False, required=True, type='java.lang.String', length=255),
83508350
Field(name='type', column='Type', indexed=False, unique=False, required=True, type='java.lang.String', length=255),
83518351
Field(name='version', column='Version', indexed=False, unique=False, required=False, type='java.lang.Integer'),
8352-
Field(name='timestampcreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8353-
Field(name='timestampmodified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
8352+
Field(name='timestampCreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
8353+
Field(name='timestampModified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
83548354
],
83558355
indexes=[
83568356

‎specifyweb/specify/migrations/0002_geo.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from specifyweb.specify.models import (
66
protect_with_blockers,
77
Collectionobject,
8-
CollectionObjectType,
8+
Collectionobjecttype,
99
Collection,
1010
Discipline,
1111
Institution,
@@ -60,7 +60,7 @@ def create_default_collection_types():
6060
for collection in Collection.objects.all():
6161
discipline = collection.discipline
6262
discipline_name = discipline.name
63-
cot, created = CollectionObjectType.objects.get_or_create(
63+
cot, created = Collectionobjecttype.objects.get_or_create(
6464
name=discipline_name,
6565
collection=collection,
6666
taxontreedef_id=discipline.taxontreedef_id
@@ -123,7 +123,7 @@ def create_default_collection_object_types():
123123
for collection in Collection.objects.all():
124124
cog_type_picklist = Picklist.objects.create(
125125
name='Default Collection Object Group Types',
126-
tablename='CollectionObjectGroupType',
126+
tablename='Collectionobjectgrouptype',
127127
issystem=False,
128128
type=1,
129129
readonly=False,
@@ -140,7 +140,7 @@ def revert_default_collection_object_types():
140140
for collection in Collection.objects.all():
141141
cog_type_picklist_qs = Picklist.objects.filter(
142142
name='Default Collection Object Group Types',
143-
tablename='CollectionObjectGroupType',
143+
tablename='Collectionobjectgrouptype',
144144
collection=collection
145145
)
146146
if cog_type_picklist_qs.exists():
@@ -152,7 +152,7 @@ def set_discipline_for_taxon_treedefs():
152152
for treedef in Taxontreedef.objects.all():
153153
if treedef.discipline:
154154
continue
155-
cot = CollectionObjectType.objects.filter(taxontreedef=treedef).first()
155+
cot = Collectionobjecttype.objects.filter(taxontreedef=treedef).first()
156156
if cot:
157157
treedef.discipline = cot.collection.discipline
158158
treedef.save()
@@ -186,7 +186,7 @@ def revert_cosolidated_python_django_migration_operations(apps, schema_editor):
186186

187187
operations = [
188188
migrations.CreateModel(
189-
name='CollectionObjectType',
189+
name='Collectionobjecttype',
190190
fields=[
191191
('id', models.AutoField(db_column='CollectionObjectTypeID', primary_key=True, serialize=False)),
192192
('name', models.CharField(db_column='Name', max_length=255)),
@@ -207,7 +207,7 @@ def revert_cosolidated_python_django_migration_operations(apps, schema_editor):
207207
},
208208
),
209209
migrations.CreateModel(
210-
name='CollectionObjectGroupType',
210+
name='Collectionobjectgrouptype',
211211
fields=[
212212
('id', models.AutoField(db_column='COGTypeID', primary_key=True, serialize=False)),
213213
('name', models.CharField(db_column='Name', max_length=255, null=False)),
@@ -235,7 +235,7 @@ def revert_cosolidated_python_django_migration_operations(apps, schema_editor):
235235
field=models.ForeignKey(db_column='CollectionObjectTypeID', null=True, on_delete=models.SET_NULL, related_name='collections', to='specify.collectionobjecttype'),
236236
),
237237
migrations.CreateModel(
238-
name='CollectionObjectGroup',
238+
name='Collectionobjectgroup',
239239
fields=[
240240
('id', models.AutoField(db_column='collectionobjectgroupid', primary_key=True, serialize=False)),
241241
('name', models.CharField(blank=True, db_column='Name', max_length=255, null=True)),
@@ -268,7 +268,7 @@ def revert_cosolidated_python_django_migration_operations(apps, schema_editor):
268268
},
269269
),
270270
migrations.CreateModel(
271-
name='CollectionObjectGroupJoin',
271+
name='Collectionobjectgroupjoin',
272272
fields=[
273273
('id', models.AutoField(db_column='collectionobjectgroupjoinid', primary_key=True, serialize=False)),
274274
('isprimary', models.BooleanField(blank=True, db_column='IsPrimary', null=True)),

0 commit comments

Comments
 (0)