Merge pull request #490 from biocore/master

Merge master into master-overhaul
biocore · Nov 22, 2022 · 5d00b26 · 5d00b26
2 parents 910089c + bdfad32
commit 5d00b26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/microsetta_private_api/admin/tests/test_admin_repo.py b/microsetta_private_api/admin/tests/test_admin_repo.py
@@ -20,10 +20,10 @@
 
 STANDARD_ACCT_ID = "12345678-bbbb-cccc-dddd-eeeeffffffff"
 ADMIN_ACCT_ID = "12345678-1234-1234-1234-123412341234"
-FIRST_LIVE_DAK_ARTICLE = {'dak_article_code': '3510000E',
-                          'short_description': 'TMI 1 tube',
+FIRST_LIVE_DAK_ARTICLE = {'dak_article_code': '3510005E',
+                          'short_description': 'TMI 1matrix tube',
                           'detailed_description':
-                              'TMI 1 tube, American English'
+                              'TMI 1 matrix tube, American English'
                           }
 # This is the first one in the db, but it is retired
 FIRST_DAK_ARTICLE = {'dak_article_code': '350103',
@@ -994,7 +994,7 @@ def test_get_daklapack_articles_not_retired(self):
         with Transaction() as t:
             admin_repo = AdminRepo(t)
             articles = admin_repo.get_daklapack_articles()
-            self.assertEqual(11, len(articles))
+            self.assertEqual(8, len(articles))
             first_article = articles[0]
             first_article.pop("dak_article_id")
             self.assertEqual(FIRST_LIVE_DAK_ARTICLE, first_article)
@@ -1003,7 +1003,7 @@ def test_get_daklapack_articles_all(self):
         with Transaction() as t:
             admin_repo = AdminRepo(t)
             articles = admin_repo.get_daklapack_articles(include_retired=True)
-            self.assertEqual(19, len(articles))
+            self.assertEqual(24, len(articles))
             first_article = articles[0]
             first_article.pop("dak_article_id")
             self.assertEqual(FIRST_DAK_ARTICLE, first_article)

diff --git a/microsetta_private_api/db/patches/0105.sql b/microsetta_private_api/db/patches/0105.sql
@@ -0,0 +1,9 @@
+-- Add new article codes for matrix tube kits
+INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510005E', 'TMI 1matrix tube', 'TMI 1 matrix tube, American English');
+INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510006E', 'TMI 1matrix tube', 'TMI 1 matrix tube, American English, no inbound label');
+INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510006M', 'TMI 1matrix tube', 'TMI 1 matrix tube, Mexican Spanish, no inbound label');
+INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510006S', 'TMI 1matrix tube', 'TMI 1 matrix tube, Spanish, no inbound label');
+INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510006J', 'TMI 1matrix tube', 'TMI 1 matrix tube, Japanese, no inbound label');
+
+-- Retire old kit configurations that we won't be using in the future
+UPDATE barcodes.daklapack_article SET retired = true WHERE dak_article_code IN ('3510000E', '3510001E', '3511000E', '3541002E', '3510001M', '3510001S', '3510001J', '3521003E');