Merge pull request wtsi-npg#246 from wtsi-npg/devel

pull from devel to master to create release 6.34.0
mgcam · Oct 24, 2024 · 9022819 · 9022819
2 parents 41f715e + 72c766e
commit 9022819
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,11 @@
 LIST OF CHANGES
 ---------------
 
+release 6.34.0 (2024-10-24)
+ - Added new delegated methods to WTSI::DNAP::Warehouse::Schema::Result::IseqFlowcell,
+   sample_uuid and sample_lims.
+ - Updated ORM classes by ingesting changes from the prod database
+
 release 6.33.1 (2024-10-04)
  - Added .github/dependabot.yml file to auto-update GitHub actions
  - GitHub CI - updated deprecated v2 runner action to v3

diff --git a/lib/WTSI/DNAP/Warehouse/Schema/Result/IseqFlowcell.pm b/lib/WTSI/DNAP/Warehouse/Schema/Result/IseqFlowcell.pm
@@ -601,7 +601,9 @@ Readonly my @USER_ROLES => qw/manager follower owner/;
 
 Readonly my %DELEGATION_TO_SAMPLE => {
     'sample_id'                => 'id_sample_lims',
+    'sample_uuid'              => 'uuid_sample_lims',
     'sample_name'              => 'name',
+    'sample_lims'              => 'id_lims',
     'sample_reference_genome'  => 'reference_genome',
     'organism'                 => 'organism',
     'sample_accession_number'  => 'accession_number',

diff --git a/lib/WTSI/DNAP/Warehouse/Schema/Result/Sample.pm b/lib/WTSI/DNAP/Warehouse/Schema/Result/Sample.pm
@@ -67,7 +67,7 @@ LIMS-specific sample uuid
 
   data_type: 'varchar'
   is_nullable: 0
-  size: 20
+  size: 255
 
 LIMS-specific sample identifier
 
@@ -459,7 +459,7 @@ __PACKAGE__->add_columns(
   'uuid_sample_lims',
   { data_type => 'varchar', is_nullable => 1, size => 36 },
   'id_sample_lims',
-  { data_type => 'varchar', is_nullable => 0, size => 20 },
+  { data_type => 'varchar', is_nullable => 0, size => 255 },
   'last_updated',
   {
     data_type => 'datetime',
@@ -798,8 +798,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07051 @ 2023-10-23 16:35:44
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:SBUvcjIuSMo1rqiCwp0AEA
+# Created by DBIx::Class::Schema::Loader v0.07052 @ 2024-10-09 15:42:26
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:S5eGEf8q9fTn5qKSp/Et/g
 
 our $VERSION = '0';
 

diff --git a/lib/WTSI/DNAP/Warehouse/Schema/Result/Study.pm b/lib/WTSI/DNAP/Warehouse/Schema/Result/Study.pm
@@ -306,6 +306,12 @@ The data destination type(s) for the study. It could be 'standard', '14mg' or 'g
   is_nullable: 1
   size: 255
 
+=head2 programme
+
+  data_type: 'varchar'
+  is_nullable: 1
+  size: 255
+
 =cut
 
 __PACKAGE__->add_columns(
@@ -412,6 +418,8 @@ __PACKAGE__->add_columns(
   { data_type => 'varchar', is_nullable => 1, size => 255 },
   'contaminated_human_data_access_group',
   { data_type => 'varchar', is_nullable => 1, size => 255 },
+  'programme',
+  { data_type => 'varchar', is_nullable => 1, size => 255 },
 );
 
 =head1 PRIMARY KEY
@@ -580,8 +588,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07052 @ 2024-08-08 13:33:16
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cSZp6NXki9BI3+HAAlBY9w
+# Created by DBIx::Class::Schema::Loader v0.07052 @ 2024-10-09 15:42:26
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5p/5azacjlWMHTtTSrJtew
 
 with 'WTSI::DNAP::Warehouse::Schema::Query::LimsFlags';
 

diff --git a/lib/WTSI/DNAP/Warehouse/Schema/Result/TolSampleBioproject.pm b/lib/WTSI/DNAP/Warehouse/Schema/Result/TolSampleBioproject.pm
@@ -61,7 +61,7 @@ __PACKAGE__->table('tol_sample_bioproject');
 =head2 library_type
 
   data_type: 'enum'
-  extra: {list => ['Chromium genome','Haplotagging','Hi-C','Hi-C - Arima v1','Hi-C - Arima v2','Hi-C - Dovetail','Hi-C - Omni-C','Hi-C - Qiagen','PacBio - CLR','PacBio - HiFi','ONT','RNA PolyA','RNA-seq dUTP eukaryotic','Standard','unknown','HiSeqX PCR free','PacBio - HiFi (ULI)','PacBio - IsoSeq']}
+  extra: {list => ['Chromium genome','Haplotagging','Hi-C','Hi-C - Arima v1','Hi-C - Arima v2','Hi-C - Dovetail','Hi-C - Omni-C','Hi-C - Qiagen','PacBio - CLR','PacBio - HiFi','ONT','RNA PolyA','RNA-seq dUTP eukaryotic','Standard','unknown','HiSeqX PCR free','PacBio - HiFi (ULI)','PacBio - IsoSeq','ATAC-seq']}
   is_nullable: 1
 
 =head2 tolid
@@ -144,6 +144,7 @@ __PACKAGE__->add_columns(
         'HiSeqX PCR free',
         'PacBio - HiFi (ULI)',
         'PacBio - IsoSeq',
+        'ATAC-seq',
       ],
     },
     is_nullable => 1,
@@ -221,8 +222,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07051 @ 2023-04-21 14:32:17
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+03wqzLzH0LFAZwFGbEKOA
+# Created by DBIx::Class::Schema::Loader v0.07052 @ 2024-10-09 15:42:26
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:P7s1muBNrElt8Hd3xqTL3w
 
 our $VERSION = '0';