Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new tables and fields for MOTs #5008

Closed
wants to merge 10 commits into from
Closed

Add new tables and fields for MOTs #5008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e32161
init collectionobjecttype django model and datamodel
acwhite211 Jun 14, 2024
1bd81ed
add empty text fields
acwhite211 Jun 17, 2024
af9dcc0
fix text field in migration
acwhite211 Jun 17, 2024
ddf2d3c
Add CollectionObjectType to model_names_by_app
acwhite211 Jun 17, 2024
f4dffeb
fix id field in datamodel
acwhite211 Jun 17, 2024
fecf05e
Merge branch 'production' into issue-4640-collectionobjecttype
acwhite211 Jun 18, 2024
65019b6
make datamodel rel names camelCase
acwhite211 Jun 18, 2024
5e62f14
fix underscores if IDs in datamodel
acwhite211 Jun 18, 2024
baa72d8
specifyuser_id datamodel fix
acwhite211 Jun 18, 2024
6544cf4
fix other datamodel ID with underscores
acwhite211 Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 52 additions & 20 deletions specifyweb/specify/datamodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7875,10 +7875,10 @@

],
relationships=[
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='Collection_ID'),
Relationship(name='specifyuser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='createdbyagent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgent_ID'),
Relationship(name='modifiedbyagent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgent_ID'),
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID'),
Relationship(name='specifyUser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID'),
],
fieldAliases=[

Expand Down Expand Up @@ -7949,7 +7949,7 @@

],
relationships=[
Relationship(name='user', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='user_id'),
Relationship(name='user', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='userid'),
],
fieldAliases=[

Expand Down Expand Up @@ -7980,10 +7980,10 @@

],
relationships=[
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='Collection_ID'),
Relationship(name='specifyuser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='createdbyagent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgent_ID'),
Relationship(name='modifiedbyagent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgent_ID')
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID'),
Relationship(name='specifyUser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID')
],
fieldAliases=[

Expand All @@ -8006,8 +8006,8 @@

],
relationships=[
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='Collection_ID'),
Relationship(name='specifyuser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID')
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID'),
Relationship(name='specifyUser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID')
],
fieldAliases=[

Expand All @@ -8030,7 +8030,7 @@

],
relationships=[
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='Collection_ID')
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID')
],
fieldAliases=[

Expand Down Expand Up @@ -8075,8 +8075,8 @@

],
relationships=[
Relationship(name='specifyuser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='role', type='many-to-one', required=True, relatedModelName='Role', column='Role_ID')
Relationship(name='specifyUser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='role', type='many-to-one', required=True, relatedModelName='Role', column='RoleID')
],
fieldAliases=[

Expand All @@ -8099,7 +8099,7 @@

],
relationships=[
Relationship(name='role', type='many-to-one', required=True, relatedModelName='Role', column='Role_ID')
Relationship(name='role', type='many-to-one', required=True, relatedModelName='Role', column='RoleID')
],
fieldAliases=[

Expand All @@ -8122,7 +8122,7 @@

],
relationships=[
Relationship(name='role', type='many-to-one', required=True, relatedModelName='LibraryRole', column='Role_ID') # maybe name libraryrole instead
Relationship(name='role', type='many-to-one', required=True, relatedModelName='LibraryRole', column='RoleID') # maybe name libraryrole instead
],
fieldAliases=[

Expand Down Expand Up @@ -8154,10 +8154,42 @@

],
relationships=[
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='Collection_ID'),
Relationship(name='specifyuser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUser_ID'),
Relationship(name='createdbyagent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgent_ID'),
Relationship(name='modifiedbyagent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgent_ID')
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID'),
Relationship(name='specifyUser', type='many-to-one', required=True, relatedModelName='SpecifyUser', column='SpecifyUse_ID'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo here? SpecifyUse_ID. Also does it need an underscore or does it have to be removed like the other ID columns?

Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID')
],
fieldAliases=[

]
),
Table( # CollectionObjectType
acwhite211 marked this conversation as resolved.
Show resolved Hide resolved
sp7_only=True,
django_app='specify',
classname='edu.ku.brc.specify.datamodel.CollectionObjectType',
table='collectionobjecttype',
tableId=1013,
idColumn='CollectionObjectTypeID',
idFieldName='collectionObjectTypeId',
idField=IdField(name='collectionObjectTypeId', column='collectionObjectTypeID', type='java.lang.Integer'),
fields=[
Field(name='name', column='Name', indexed=False, unique=False, required=True, type='java.lang.String', length=255),
Field(name='isloanable', column='IsLoanable', indexed=False, unique=False, required=True, type='java.lang.Boolean'),
Field(name='version', column='Version', indexed=False, unique=False, required=False, type='java.lang.Integer'),
Field(name='timestampcreated', column='TimestampCreated', indexed=False, unique=False, required=True, type='java.sql.Timestamp'),
Field(name='timestampmodified', column='TimestampModified', indexed=False, unique=False, required=False, type='java.sql.Timestamp'),
Field(name='text1', column='Text1', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
Field(name='text2', column='Text2', indexed=False, unique=False, required=False, type='java.lang.String', length=255),
Field(name='text3', column='Text3', indexed=False, unique=False, required=False, type='java.lang.String', length=255)
],
indexes=[

],
relationships=[
Relationship(name='collection', type='many-to-one', required=False, relatedModelName='Collection', column='CollectionID'),
Relationship(name='taxonTreeDef', type='many-to-one', required=False, relatedModelName='TaxonTreeDef', column='TaxonTreeDefID'),
Relationship(name='createdByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='CreatedByAgentID'),
Relationship(name='modifiedByAgent', type='many-to-one', required=False, relatedModelName='Agent', column='ModifiedByAgentID')
],
fieldAliases=[

Expand Down
37 changes: 37 additions & 0 deletions specifyweb/specify/migrations/0002_collectionobjecttype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Generated by Django 3.2.15 on 2024-06-14 20:42

from django.db import migrations, models
import django.utils.timezone
import specifyweb.specify.models


class Migration(migrations.Migration):

dependencies = [
('specify', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='CollectionObjectType',
fields=[
('id', models.AutoField(db_column='CollectionObjectTypeID', primary_key=True, serialize=False)),
('name', models.CharField(db_column='Name', max_length=255)),
('isloanable', models.BooleanField(blank=True, db_column='IsLoanable', null=True)),
('version', models.IntegerField(blank=True, db_column='Version', default=0, null=True)),
('timestampcreated', models.DateTimeField(db_column='TimestampCreated', default=django.utils.timezone.now)),
('timestampmodified', models.DateTimeField(blank=True, db_column='TimestampModified', default=django.utils.timezone.now, null=True)),
('text1', models.TextField(blank=True, db_column='Text1', null=True)),
('text2', models.TextField(blank=True, db_column='Text2', null=True)),
('text3', models.TextField(blank=True, db_column='Text3', null=True)),
('collection', models.ForeignKey(db_column='CollectionID', on_delete=specifyweb.specify.models.protect_with_blockers, related_name='collectionobjecttypes', to='specify.collection')),
('createdbyagent', models.ForeignKey(db_column='CreatedByAgentID', null=True, on_delete=specifyweb.specify.models.protect_with_blockers, related_name='+', to='specify.agent')),
('modifiedbyagent', models.ForeignKey(db_column='ModifiedByAgentID', null=True, on_delete=specifyweb.specify.models.protect_with_blockers, related_name='+', to='specify.agent')),
('taxontreedef', models.ForeignKey(db_column='TaxonTreeDefID', on_delete=specifyweb.specify.models.protect_with_blockers, related_name='collectionobjecttypes', to='specify.taxontreedef')),
],
options={
'db_table': 'collectionobjecttype',
'ordering': (),
},
),
]
29 changes: 29 additions & 0 deletions specifyweb/specify/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7462,3 +7462,32 @@ class Meta:

timestamptracker = FieldTracker(fields=['timestampcreated', 'timestampmodified'])
save = partialmethod(custom_save)

class CollectionObjectType(models.Model):
specify_model = datamodel.get_table('collectionobjecttype')

# ID Field
id = models.AutoField(primary_key=True, db_column='CollectionObjectTypeID')

# Fields
name = models.CharField(blank=False, max_length=255, null=False, unique=False, db_column='Name', db_index=False)
isloanable = models.BooleanField(blank=True, null=True, unique=False, db_column='IsLoanable', db_index=False)
version = models.IntegerField(blank=True, null=True, unique=False, db_column='Version', db_index=False, default=0)
timestampcreated = models.DateTimeField(blank=False, null=False, unique=False, db_column='TimestampCreated', db_index=False, default=timezone.now)
timestampmodified = models.DateTimeField(blank=True, null=True, unique=False, db_column='TimestampModified', db_index=False, default=timezone.now)
text1 = models.TextField(blank=True, null=True, unique=False, db_column='Text1', db_index=False)
text2 = models.TextField(blank=True, null=True, unique=False, db_column='Text2', db_index=False)
text3 = models.TextField(blank=True, null=True, unique=False, db_column='Text3', db_index=False)

# Relationships: Many-to-One
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
collection = models.ForeignKey('Collection', db_column='CollectionID', related_name='collectionobjecttypes', null=False, on_delete=protect_with_blockers)
taxontreedef = models.ForeignKey('TaxonTreeDef', db_column='TaxonTreeDefID', related_name='collectionobjecttypes', null=False, on_delete=protect_with_blockers)

class Meta:
db_table = 'collectionobjecttype'
ordering = ()

timestamptracker = FieldTracker(fields=['timestampcreated', 'timestampmodified'])
save = partialmethod(custom_save)
6 changes: 4 additions & 2 deletions specifyweb/specify/models_by_table_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@
1009:'UserRole',
1010:'RolePolicy',
1011:'LibraryRolePolicy',
1012:'Spdataset'
1012:'Spdataset',
1013:'CollectionObjectType',
}

model_names_by_app = {
Expand Down Expand Up @@ -414,7 +415,8 @@
'Workbenchrowexportedrelationship',
'Workbenchrowimage',
'Workbenchtemplate',
'Workbenchtemplatemappingitem'
'Workbenchtemplatemappingitem',
'CollectionObjectType',
}
}

Expand Down
Loading