Skip to content

Commit

Permalink
Merge branch 'release/0.3.80' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikvw
erikvw committed Dec 5, 2023
2 parents 6219da6 + 823beab commit 3cf2349
Show file tree
Hide file tree
Showing 4 changed files with 177 additions and 72 deletions.
105 changes: 105 additions & 0 deletions ...ata/migrations/0028_remove_requisitionmetadata_edc_metadat_subject_51288a_idx_and_more.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Generated by Django 4.2.7 on 2023-12-04 22:19

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("edc_metadata", "0027_alter_crfmetadata_options_and_more"),
]

operations = [
migrations.RemoveIndex(
model_name="requisitionmetadata",
name="edc_metadat_subject_51288a_idx",
),
migrations.RemoveIndex(
model_name="requisitionmetadata",
name="edc_metadat_entry_s_865e45_idx",
),
migrations.RenameIndex(
model_name="crfmetadata",
new_name="edc_metadat_site_id_d3b213_idx",
old_name="edc_metadata_crfm_site_ent_idx",
),
migrations.RenameIndex(
model_name="crfmetadata",
new_name="edc_metadat_subject_dd4400_idx",
old_name="edc_metadata_crfm_subjid_v_idx",
),
migrations.AlterUniqueTogether(
name="requisitionmetadata",
unique_together=set(),
),
migrations.AddIndex(
model_name="crfmetadata",
index=models.Index(
fields=["subject_identifier"], name="edc_metadat_subject_25f5bc_idx"
),
),
migrations.AddIndex(
model_name="crfmetadata",
index=models.Index(
fields=["modified", "created"], name="edc_metadat_modifie_948bce_idx"
),
),
migrations.AddIndex(
model_name="crfmetadata",
index=models.Index(
fields=["user_modified", "user_created"],
name="edc_metadat_user_mo_10db17_idx",
),
),
migrations.AddIndex(
model_name="requisitionmetadata",
index=models.Index(
fields=["subject_identifier"], name="edc_metadat_subject_feb080_idx"
),
),
migrations.AddIndex(
model_name="requisitionmetadata",
index=models.Index(
fields=["modified", "created"], name="edc_metadat_modifie_be0dc2_idx"
),
),
migrations.AddIndex(
model_name="requisitionmetadata",
index=models.Index(
fields=["user_modified", "user_created"],
name="edc_metadat_user_mo_a239a3_idx",
),
),
migrations.AddIndex(
model_name="requisitionmetadata",
index=models.Index(
fields=[
"subject_identifier",
"visit_schedule_name",
"schedule_name",
"visit_code",
"visit_code_sequence",
"model",
"panel_name",
"entry_status",
"timepoint",
"show_order",
],
name="edc_metadat_subject_04cc77_idx",
),
),
migrations.AddConstraint(
model_name="requisitionmetadata",
constraint=models.UniqueConstraint(
fields=(
"subject_identifier",
"visit_schedule_name",
"schedule_name",
"visit_code",
"visit_code_sequence",
"model",
"panel_name",
),
name="edc_metadata_requisitionmetadata_subject_iden_visit_uniq",
),
),
]
60 changes: 31 additions & 29 deletions edc_metadata/models/crf_metadata.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,34 @@ class Meta(CrfMetadataModelMixin.Meta, BaseUuidModel.Meta):
name="%(app_label)s_%(class)s_subject_iden_visit_uniq",
)
]
indexes = [
models.Index(
fields=[
"site",
"entry_status",
"visit_code",
"visit_code_sequence",
"model",
"subject_identifier",
"schedule_name",
"visit_schedule_name",
],
name="%(app_label)s_crfm_site_ent_idx",
),
models.Index(
fields=[
"subject_identifier",
"visit_schedule_name",
"schedule_name",
"visit_code",
"visit_code_sequence",
"model",
"entry_status",
"timepoint",
"show_order",
],
name="%(app_label)s_crfm_subjid_v_idx",
),
]
indexes = (
CrfMetadataModelMixin.Meta.indexes
+ BaseUuidModel.Meta.indexes
+ [
models.Index(
fields=[
"site",
"entry_status",
"visit_code",
"visit_code_sequence",
"model",
"subject_identifier",
"schedule_name",
"visit_schedule_name",
],
),
models.Index(
fields=[
"subject_identifier",
"visit_schedule_name",
"schedule_name",
"visit_code",
"visit_code_sequence",
"model",
"entry_status",
"timepoint",
"show_order",
],
),
]
)
3 changes: 2 additions & 1 deletion edc_metadata/models/crf_metadata_model_mixin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,6 @@ def get_site_on_create(self) -> Site:
"""
return self.site

class Meta(NonUniqueSubjectIdentifierFieldMixin.Meta):
class Meta(SiteModelMixin.Meta, NonUniqueSubjectIdentifierFieldMixin.Meta):
abstract = True
indexes = NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
81 changes: 39 additions & 42 deletions edc_metadata/models/requisition_metadata.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import models
from django.db.models import UniqueConstraint
from edc_model.models import BaseUuidModel
from edc_sites.models import CurrentSiteManager

Expand Down Expand Up @@ -69,32 +70,8 @@ class Meta(CrfMetadataModelMixin.Meta, BaseUuidModel.Meta):
app_label = "edc_metadata"
verbose_name = "Requisition collection status"
verbose_name_plural = "Requisition collection status"
unique_together = (
(
"subject_identifier",
"visit_schedule_name",
"schedule_name",
"visit_code",
"visit_code_sequence",
"model",
"panel_name",
),
)
indexes = [
models.Index(
fields=[
"site",
"entry_status",
"visit_code",
"visit_code_sequence",
"model",
"panel_name",
"subject_identifier",
"schedule_name",
"visit_schedule_name",
]
),
models.Index(
constraints = [
UniqueConstraint(
fields=[
"subject_identifier",
"visit_schedule_name",
Expand All @@ -103,20 +80,40 @@ class Meta(CrfMetadataModelMixin.Meta, BaseUuidModel.Meta):
"visit_code_sequence",
"model",
"panel_name",
"entry_status",
"show_order",
]
),
models.Index(
fields=[
"entry_status",
"model",
"panel_name",
"schedule_name",
"subject_identifier",
"visit_code",
"visit_code_sequence",
"visit_schedule_name",
]
),
],
name="%(app_label)s_%(class)s_subject_iden_visit_uniq",
)
]
indexes = (
CrfMetadataModelMixin.Meta.indexes
+ BaseUuidModel.Meta.indexes
+ [
models.Index(
fields=[
"site",
"entry_status",
"visit_code",
"visit_code_sequence",
"model",
"panel_name",
"subject_identifier",
"schedule_name",
"visit_schedule_name",
],
),
models.Index(
fields=[
"subject_identifier",
"visit_schedule_name",
"schedule_name",
"visit_code",
"visit_code_sequence",
"model",
"panel_name",
"entry_status",
"timepoint",
"show_order",
],
),
]
)

0 comments on commit 3cf2349

Please sign in to comment.