Skip to content

Commit

Permalink
Merge branch 'feature/rename_tables' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@luissian
luissian committed Aug 26, 2024
2 parents 7de00dd + 215c7a4 commit 79858be
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
22 changes: 11 additions & 11 deletions core/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@

ISKLIMS_REST_API = "/wetlab/api/"
# REST API TO iSkyLIMS
ISKLIMS_GET_LABORATORY_PARAMETERS = ["laboratoryData", "laboratory"]
ISKLIMS_PUT_LABORATORY_PARAMETER = "updateLab"
ISKLIMS_GET_SAMPLE_FIELDS = "sampleFields"
ISKLIMS_GET_SAMPLE_INFORMATION = ["fetchSampleInformation", "sample"]
ISKLIMS_GET_SAMPLE_PARAMETER_INFORMATION = ["fetchSampleInformation", "parameter"]
ISKLIMS_GET_SAMPLE_PROJECT_PARAMETER_INFORMATION = ["fetchSampleInformation"]
ISKLIMS_GET_SAMPLE_PROJECT_FIELDS = ["sampleProjectFields", "project"]
ISKLIMS_GET_SUMMARIZE_DATA = "summarizeDataInformation"
ISKLIMS_GET_STATS_DATA = "statisticsInformation"
ISKLIMS_FETCH_SAMPLES_ON_CONDITION = ["fetchSampleInformation", "parameter"]
ISKLIMS_POST_SAMPLE_DATA = "createSampleData"
ISKLIMS_GET_LABORATORY_PARAMETERS = ["lab-data", "laboratory"]
ISKLIMS_PUT_LABORATORY_PARAMETER = "update-lab"
ISKLIMS_GET_SAMPLE_FIELDS = "sample-fields"
ISKLIMS_GET_SAMPLE_INFORMATION = ["sample-info", "sample"]
ISKLIMS_GET_SAMPLE_PARAMETER_INFORMATION = ["sample-info", "parameter"]
ISKLIMS_GET_SAMPLE_PROJECT_PARAMETER_INFORMATION = ["sample-info"]
ISKLIMS_GET_SAMPLE_PROJECT_FIELDS = ["sample-fields", "project"]
ISKLIMS_GET_SUMMARIZE_DATA = "summarize-info"
ISKLIMS_GET_STATS_DATA = "stats-info"
ISKLIMS_FETCH_SAMPLES_ON_CONDITION = ["sample-info", "parameter"]
ISKLIMS_POST_SAMPLE_DATA = "create-sample"

# API requested information
FIELDS_ON_SAMPLE_TABLE = [
Expand Down
58 changes: 29 additions & 29 deletions core/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Profile(models.Model):
code_id = models.CharField(max_length=40, null=True, blank=True)

class Meta:
db_table = "profile"
db_table = "core_profile"

def __str__(self):
return self.user.username
Expand All @@ -39,7 +39,7 @@ class BioinfoMetadataFile(models.Model):
created_at = models.DateTimeField(auto_now_add=True, verbose_name=("created at"))

class Meta:
db_table = "bioinfo_metadata_file"
db_table = "core_bioinfo_metadata_file"

def __str__(self):
return "%s" % (self.title)
Expand Down Expand Up @@ -79,7 +79,7 @@ class Schema(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "metadata_schema"
db_table = "core_metadata_schema"

def __str__(self):
return "%s_%s" % (self.schema_name, self.schema_version)
Expand Down Expand Up @@ -121,7 +121,7 @@ class Classification(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "metadata_classification"
db_table = "core_metadata_classification"

def __str__(self):
return "%s" % (self.classification_name)
Expand Down Expand Up @@ -185,7 +185,7 @@ class SchemaProperties(models.Model):
fill_mode = models.CharField(max_length=50, null=True, blank=True)

class Meta:
db_table = "metadata_schema_properties"
db_table = "core_metadata_schema_properties"

def __str__(self):
return "%s" % (self.property)
Expand Down Expand Up @@ -248,7 +248,7 @@ class PropertyOptions(models.Model):
ontology = models.CharField(max_length=40, null=True, blank=True)

class Meta:
db_table = "metadata_schema_property_option"
db_table = "core_metadata_schema_property_option"

def __str__(self):
return "%s" % (self.enum)
Expand Down Expand Up @@ -282,7 +282,7 @@ class MetadataVisualization(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "metadata_visualization"
db_table = "core_metadata_visualization"

def __str__(self):
return "%s" % (self.label_name)
Expand Down Expand Up @@ -318,7 +318,7 @@ class BioinfoAnalysisField(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "bioinfo_analysis_field"
db_table = "core_bioinfo_analysis_field"

def __str__(self):
return "%s" % (self.property_name)
Expand Down Expand Up @@ -358,7 +358,7 @@ class BioinfoAnalysisValue(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "bioinfo_analysis_value"
db_table = "core_bioinfo_analysis_value"

def __str__(self):
return "%s" % (self.value)
Expand All @@ -381,7 +381,7 @@ class LineageInfo(models.Model):
created_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "lineage_info"
db_table = "core_lineage_info"

def __str__(self):
return "%s" % (self.lineage_name)
Expand Down Expand Up @@ -409,7 +409,7 @@ class LineageFields(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "lineage_field"
db_table = "core_lineage_field"

def __str__(self):
return "%s" % (self.property_name)
Expand All @@ -429,7 +429,7 @@ class LineageValues(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "lineage_value"
db_table = "core_lineage_value"

def __str__(self):
return "%s" % (self.value)
Expand All @@ -449,7 +449,7 @@ class Filter(models.Model):
created_at = models.DateTimeField(auto_now_add=True, verbose_name=("created at"))

class Meta:
db_table = "vcf_filter"
db_table = "core_vcf_filter"

def __str__(self):
return "%s" % (self.filter)
Expand All @@ -466,7 +466,7 @@ class Effect(models.Model):
created_at = models.DateTimeField(auto_now_add=True, verbose_name=("created at"))

class Meta:
db_table = "vcf_effect"
db_table = "core_vcf_effect"

def __str__(self):
return "%s" % (self.effect)
Expand All @@ -489,7 +489,7 @@ class Chromosome(models.Model):
created_at = models.DateTimeField(auto_now_add=True, verbose_name=("created at"))

class Meta:
db_table = "chromosome"
db_table = "core_chromosome"

def __str__(self):
return "%s" % (self.chromosome)
Expand Down Expand Up @@ -529,7 +529,7 @@ class OrganismAnnotation(models.Model):
organism_code_version = models.CharField(max_length=10)

class Meta:
db_table = "organism_annotation"
db_table = "core_organism_annotation"

def __str__(self):
return "%s.%s" % (self.organism_code, self.organism_code_version)
Expand Down Expand Up @@ -583,7 +583,7 @@ class Gene(models.Model):
created_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "gene"
db_table = "core_gene"

def __str__(self):
return "%s" % (self.gene_name)
Expand All @@ -606,7 +606,7 @@ class SampleState(models.Model):
description = models.CharField(max_length=255, null=True, blank=True)

class Meta:
db_table = "sample_state"
db_table = "core_sample_state"

def __str__(self):
return "%s" % (self.state)
Expand All @@ -628,7 +628,7 @@ class Error(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "error"
db_table = "core_error"

def __str__(self):
return "%s" % (self.error_name)
Expand Down Expand Up @@ -691,7 +691,7 @@ class Sample(models.Model):
created_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "sample"
db_table = "core_sample"

def __str__(self):
return "%s" % (self.sequencing_sample_id)
Expand Down Expand Up @@ -785,7 +785,7 @@ class PublicDatabaseType(models.Model):
created_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "public_database_type"
db_table = "core_public_database_type"

def __str__(self):
return "%s" % (self.public_type_name)
Expand Down Expand Up @@ -817,7 +817,7 @@ class PublicDatabaseFields(models.Model):
generated_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "public_database_field"
db_table = "core_public_database_field"

def __str__(self):
return "%s" % (self.property_name)
Expand Down Expand Up @@ -845,7 +845,7 @@ class PublicDatabaseValues(models.Model):
generated_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)

class Meta:
db_table = "public_database_value"
db_table = "core_public_database_value"

def __str__(self):
return "%s" % (self.value)
Expand All @@ -863,7 +863,7 @@ class DateUpdateState(models.Model):
date = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "date_update_state"
db_table = "core_date_update_state"

def __str__(self):
return "%s_%s" % (self.stateID, self.sampleID)
Expand Down Expand Up @@ -897,7 +897,7 @@ class Variant(models.Model):
alt = models.CharField(max_length=100, null=True, blank=True)

class Meta:
db_table = "variant"
db_table = "core_variant"

def __str__(self):
return "%s_%s" % (self.pos, self.alt)
Expand Down Expand Up @@ -936,7 +936,7 @@ class VariantInSample(models.Model):
created_at = models.DateTimeField(auto_now_add=True, verbose_name=("created at"))

class Meta:
db_table = "variant_in_sample"
db_table = "core_variant_in_sample"

def __str__(self):
return "%s_%s" % (self.sampleID_id, self.variantID_id)
Expand Down Expand Up @@ -1002,7 +1002,7 @@ class VariantAnnotation(models.Model):
hgvs_p_1_letter = models.CharField(max_length=100)

class Meta:
db_table = "variant_annotation"
db_table = "core_variant_annotation"

def __str__(self):
return "%s" % (self.variantID_id)
Expand Down Expand Up @@ -1043,7 +1043,7 @@ class TemporalSampleStorage(models.Model):
generated_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "temporal_sample_storage"
db_table = "core_temporal_sample_storage"

def __str__(self):
return "%s,%s" % (self.sample_name, self.field)
Expand Down Expand Up @@ -1076,7 +1076,7 @@ class ConfigSetting(models.Model):
generated_at = models.DateTimeField(auto_now_add=True)

class Meta:
db_table = "config_setting"
db_table = "core_config_setting"

def __str__(self):
return "%s" % (self.configuration_name)
Expand Down

0 comments on commit 79858be

Please sign in to comment.