From a348db9f082f92c55c4b6d2eed0810f4cb3cae3e Mon Sep 17 00:00:00 2001 From: titima15 Date: Tue, 20 Dec 2022 15:47:30 +0000 Subject: [PATCH] fixed tests for catalog --- sgn_test.conf | 32 ++++++++++++----------- t/data/stock/catalog_items.xls | Bin 7168 -> 7168 bytes t/data/stock/catalog_items.xlsx | Bin 8940 -> 7212 bytes t/unit_fixture/CXGN/Stock/CatalogOrder.t | 27 ++++++++++++++----- 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/sgn_test.conf b/sgn_test.conf index 16013c6b9c..e062968756 100644 --- a/sgn_test.conf +++ b/sgn_test.conf @@ -124,21 +124,23 @@ solyc_conversion_files /home/production/solcyc_conversion_files/tomato_unigenes_ search_path gem - -#ODK Services -odk_crossing_data_service_name ONA -odk_crossing_data_service_url https://ona.io -odk_crossing_data_service_username seedtracker -odk_crossing_data_service_password Seedtracking101 -odk_crossing_data_form_name BTractTest -odk_crossing_data_test_form_name NULL -odk_crossing_data_separate_wishlist_by_location 1 -odk_phenotyping_data_service_name NULL -odk_phenotyping_data_service_url https://bio.smap.com.au -odk_phenotyping_data_service_username SMAPUSER -odk_phenotyping_data_service_password SMAPPASS -crontab_file NULL -crontab_log_filepath NULL +order_properties Quantity,Comments +order_properties_dialog Quantity,Comments + +##ODK Services +##odk_crossing_data_service_name NULL +##odk_crossing_data_service_url https://ona.io +##odk_crossing_data_service_username seedtracker +##odk_crossing_data_service_password Seedtracking101 +##odk_crossing_data_form_name BTractTest +##odk_crossing_data_test_form_name NULL +##odk_crossing_data_separate_wishlist_by_location 1 +##odk_phenotyping_data_service_name NULL +##odk_phenotyping_data_service_url https://bio.smap.com.au +##odk_phenotyping_data_service_username SMAPUSER +##odk_phenotyping_data_service_password SMAPPASS +##crontab_file NULL +##crontab_log_filepath NULL noaa_ncdc_access_token DLPxdOEIwKyoiMSuQMRYrtMaiIUpNAwk diff --git a/t/data/stock/catalog_items.xls b/t/data/stock/catalog_items.xls index dfa7bfb88fcfa4efd39ee421b580aaac8e88bfd3..5a34a2310f26f8c07f828d1eb6cc4d6a47301e42 100644 GIT binary patch delta 628 zcmY+AL2DCH5Xb*-v)Qb==_YB^CWjMn3_KPBgqm5W*V+5$DU#UUyk%e$|~}T&RZ|;?4rPl zEMEpZ={6U9r|EWm*bJFvd0@|^LX(&B@ zj|W&;c6>R&){%{%?)pWi)pFVyK)NkiRE2)MsEQK6wb|SHK_Ug*4;p?gP!G-B8Y`Dd zrSTX?dB)F-SU~hLT@@V@kCfmunCCh8C@uJ#9PDWg8lKrboj?LN`?L-nZ*skS5=m71 zw82XZ`}(Jl!p<4yqj~$BxWK!?KF=l?vw5dom13ous+`8wMuuKzZk+A%+JC&pO_?Vn zD=mX*!8J@6(Pnl^2s7Hw{bEDgxl#I-e@oBxp(s2)CyteYX~toFjOq7@qPaiuWNS13 zQ_zN9q3M(1R$*P^haVIkiw*iycqlH>+NqA1pgsOi(%R`xa*E3(^Vg}QoAg!x^bf&Q BjmrQ4 delta 596 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 PT*NVeU~V<)o2&l3c< literal 8940 zcmeHMXH*p1mL^EfStMt)$&z!82Y=5(NPXA|MJF$Ow`pC&?KB$&!>H zponCUJdNIa9U1SN_tw0%W`0a{ch#z@{`T4Dt6k^p^KE@C%uAGLKQ(S_VQu6C2O}-{yrHhra;P1%Cm4Z*z}#e51^EP6nZa)MFc8GeQHJ$~ zkt(k^D>Kr=)(vFq3UdR?u=;?Jta7r_-z_ksux>~hRwoY+xFkP6(%uOSwMFv5;9xh@ z9S0Z!YU_bIML6=qZS7rb9l`uU0s^A^_CLJf^*Hx}RaROV>|lG#)q|N?#T(__4@bP9 z4y??7xO?7~3@ZeBZor%O{0{%`L2x(6--6Ds{|&?$4*osn`;ET=p*nY=9a}iu6=HAe zfg+Lr{O;cX5nxy3KR|lAfi958`v-A+DCBqRNGAv!3HS$1*g@R>wH9Cw4iI}V2xfl^ ziV6)rm@8P%&KYd)aoz_#RA3+=ATTqtzAeH-*A|L;4*aOU>LXxqBtNRt=OOezY7Tt< z$U$HbFC1kOjPQVf|LWa8ZrmP*0RQW)|4HXL`k!sm+m+u7hHybTfx#X~{_h9Df4$`k zG$Y{%ur27jF{mrwU-tievcK*7ZyXW&zv9UC|1C$5PPPaz$j}3U8nBT6W+#5J{og$r zq=%0y_}}iqcccGZ)92x12ZOo%+q;j7cs{5t#O+T9_`eVPvig6_GPtNYg$1oT+~dwQ zbTl+Y3^X(n)RjNN^iPLk9_YYY1PH^P)v4vK3%Rj>8F125=3OCrb-Z@MkX*)1I!}9m=)^{=d$V7Dg;4<@x?Pk+Wp3^ z+@7XIg3!lx<>&mLxqscl0DMx-QDu<4Z4daQ1R5d+2fG<04-#}?D?7x`_QnahHkzvr zXnv(N>P?R24vNw{i-Or+}9AD1M!x9C1ENmdujGR}KP~Z|l3h zBO7h+LagqLuXiE*SY}cZJugu=sxOf@XUu zwjtOp4sa)-B}g2JIq;;G-f+$|49U2z)KXf@zfDrQC^6=tLOc2-#YM~TV1a>A*PeqQ z`7_xEi{u<(&N_s{*8;M(h3!>s^}8m7irA|3nLVj5)5P#*6YI`|#lI#6?cLHoZQI4j z7sprWrm>*mev~~}@}Q95-I65wvd0(ZCw+iqc~EKuGye6?7{w}Ox(C1M+!m0e7yUlV^V z*niwwa5Yj<)qn`DQdR+}=zBwN;KCiotdS4ZzHZQ^Q;jCbk(_|)%m1^6KZG>=1o2m!}TcR07E!#YRX zS}J4>uPU(G|KmIA8<2%gpMFs>4r{WCT$tK3FBX;e81wyyrbw^7kD_~lWnLj(xFcs% z^6$Ns4qHWFkL#?CJ=>^{i=nNZZ!CoIojde ziL1gey3-*~u2E!!_pqHVPSR$oz)4;|cFFLvO_g$c2`(>4G-%?;>9JO|s__h?(C+6e zI2NLB^kQvavpm7maPQuE<&XDxyYlQVd-NC-w4^!Vj$BN4qJsV>)tbcty z^s>fvIZ&fcDC!kC&v;Rz&M(9D`B)ee|5mqEfKVlnqen_hEDKKux*v3j3GH@K{YZIm z8(yhYX(JaExjL`9^wR9aYgvTmV+d_?=K2E|^_gQL&_u$IJMv&LPyD>U@37(Z0L!pse zJMPT7FFSWqrLS6D`DhF;>^`#%G^_9pPXH}K2k_?32h#0ZdHY?Wb?o5I>>G-9o*$&{ z8&>AuUyc?pTQRt=6jrh`htc2q&W9^MPc%L#k&mi2uJ)ebS!LHJck>5Eb$4YKWZ)R) zX*2=Z-|p0YjBn3O$va*R#GqXW$_k=2#>2Y#Xp+J}ZgZ#j>-`?6@=@iN%`0l37p$Mm zp04Cf1CQ{2rIl@uV515}Co_s#Qq=KcviEGD86P#8V}CHAZK%^#;2MHPNRlec9lgy09tXiCjR%5EJ#`X(zNb^B;RNWnUL`>1s_^h%};WV8^IUAE^HUbqyx z^C0Fv`aAQdyF2_Z3w=*$bi>1=tgbHgSEy=4GW5=PB4|C;K@HtN2IWHIBsHYx|C3CS2N}5T;O9Ghq67v#A`>{Mv4504Y`Jmg<}41!g{V zJGnhcPf2z^T^2jLC?jy}3*Aly`eb_?`NIfZU;e4Sf(r1WW+&W zN`UFzThr0=YLK0rXln=`MkczW$4auiDEX;r$KuM80;EXY@qm1j^U&OFC;1CDU+)l4 z-JPXlnTC%}ipQXm*V6(LS|;`+NtZpKFTW z0r{)hep>_B!>DB^n|I}D+-9D#d)UuONTQ_lRRkoTipK}DQBAmw=?SNg#0z~hG6J{R z*^p}No6$(=Hx0ovOamqR(X(Zd#T1idw}!i*cMTOM3o0j~@00Rc~!SuAsr;s>AVgLN9Rii)s zROc1GR9c#tM`tyRDR(p2yx!p%9vTdBIhGut{Yr<;=7WH9It($<(5|44s8QtyBmX(Y z`p!B%aPU4h z#MKkFz-%P|WU9aOl3O87taL#= zeTi8OjgGn8JX|vW*AS&EBFjRzgq)Fs3_Z0xFi?tP6C{W9c0Tjknn;90A)z|E}sH28)yRQaOTn`O4IMkKfHYH{=%-eSJ#(*XNRXB%&|H(6JHL!3}@XP zQyQhl%d%Q2*3cR?xYs!7Pbb3@ibz>~+D93RPJndOhR$lc6~44ShIG$sY2 zKVmVGGA(sjc$+q7!Zq1~V}nNRvz=?Ed3=%%skcgTvZ^}lohgI|AC7Sm-1C>Bq{lIP>sM{(p`R>wcK~s%PCHGhZ<0EKX)_bOrkJO##7N+6WzSsaHC}N| zY&?B|ifAF#aS}OB%V_4266Ya2$LbIHJF9dwRSA4OYcd`Rv)9a}$-#nTdXp zzKu6Nu?wpQQ43?Gc=W~~WD+S)VgR&DN0w}W8s3BFf zrH9TM)V|*sY5Ywc)g4TMOnDIbjtOiFn%hbWoA-9$RL!Lv_aw}h1|Ss=%CU%yrViPg z^euJAUi+R7=P&EM-3)Q;BnglS__pz_nO|kYWx{KIqDr`X#zesStTlrUU| z>ZFcz^Ve*pu_D#DV}?cObrS77HS5?Ynu)5}(gvwni*&!zs;<@9WjK+|*RIk=F!bLH zkFvwD7-7u$Ts;d@Vmz9f9pHr;GS8F!ZxebMZij&`&bp`jh99_0}7IOqZE zv886r$-DH*5Am^7wOT-&VLLVA6@74KF_1*m*DO~m^x@pwXHvPXH`AM-2q#5mOF;mo zVp1uA$)>Vx@x-++rQ(a&#%}2>M~1d^bX-)I5|l2hHIT)=WcF~t7y%6 zjz<>BNU7*%)4%Wl8ZdaPl!kIj#b1p0(3DX=$ELjZMrpuwpX~`DUDU}(vRmQgyJ1wH zMQ=@iu^G8eVY^prlsWV!>JT8pubO_lp?wKUX0F{UR<5M70t+XorB6pRKRXB%^%)_U z!K4~K*+CKbSYGtGSnf9Vt=Y8MbnJ@qYYh(OLgxA&fG6*3ccvbfR(-)2&52&izse?- z^{$ION&Iu`mu@Fv#w}jAuwVjfqA1N|Q+Y{@@DO$Q?$sM#Uq@jM=Gk$uiw_Ng1tT%| z<`i9$4G%Oq##Q*ExxJ+gJpL#L3#s%-#1PY!02OYXx6S)gE>d)?poKJO%v}5>>jtz%jTv)6D03Mu>f4-HURNrfih=J zb_~TtwBFEI7m{neF{)|_>;823(qqzi#4K@tG;-xCTT8dMwre8o$I`se6(`R8+3kC* zcJCP&(pjEF$PmuvseKa9AlD5UJqQWXv`PiPe0TE|z;KHuC>n#BuZ;)3Sx{WLwW_21 zxIg0VX}4vUzyU~nE^~Oxa*g+}D9t$a=&P&0SUy7=R|T+#OmsT(lB&8%cxC%tgv3r= zQ?{pdlghPTRXFAy=Ny@!q*FnQx-fc9$z_Z5{Remxx4`+En z>Jk&J-`ll5%Bm9!-i_Mul?+_1k)TsQd7LDRNwgjuHU*02((WE|eK>7`;kA6$iBTX> zYBOL!jQ20BL7qdxcD&6ear;B*iqddl}`m`gbm>3EdCl zcR58Fb!tbr7sH-A+=o)(n3qKcI_8k~#D_ip*5EBHld2mQuV0O4c1nj#JDE;mAHLcj zNhMAxzBA%2G41!j5~Diy4sdY4%QF9-L&_7i&3^wHQO6l*Kin*_#k8u;f4|Ve$7mU; zS0csUIL*L~&Ib4WmL3Nr>Y(MM$5%O%vPr9X%bLk07!Mbcj3bfezD8NT(WAlA6HnL1 zE6H%W+OVny^t(NGO_+$Xy-@EdlVBcy@yYgz9>Lcw4RyC}8P6$9^_rnF*bN`{GsWDYX*fMsBG!Z1V zR=locLt5GE-GUyvxAwU~MKLA7mlsjaW}$D~PuN*bq}&slU2ZWD%{0(U5*HlW2987; z$0u)w<1P&Q)jA%lxZ=j)e#=gxrMsFB=q2wCqclw_VC7(@UBG&@(KG%iSG+lom8$0B zq^A>A(j(POcsu`Fo13Z>uWY(2nX_G$#k)&GzqE%L&!_FBSY*4!}%2Nk;Zjfl_!&s#8N7f&ph#3v-JUDXkb8jt(z8I18x<}Mr_QqQhKiP`f zN6yDtApUaEc<)_hM7(-@%a(w?%%(|n!^j7kl~*o;RA{X%gs}`YEIzW=i)`VWPZG36 z3S0F>fG{Ri^OwbEO>glD5UpF*!ii6k$>_K_XlIwU;?~yjEMe@6b5Cq-(m()qKyANo zbm&LL8S|1G!EFR)qI$=Zltau#&`GksdtW8Hp3=b0(W@xncEh`@Vqc4a=*3hUzQIj| ziei_+2fV%GH{BMiGYitdSTX>iRyetJit7Y^Xl>AHxaUBuDi&v9lk&b)3D-hFE?5Qi z5Bv9N3p`|80%Z?`Wg`bmI*XT=XbaPYyoex(bY zAu85+TyVLowjE6xvF3@!_^y)PewL_-&2SwjEpQfn{VC>iUFlcHWny;0Vh%sP&6l_P z>B^c=-yv$%yW@+1B^NXNhY5u0l@j+jgZHY+ZSyvl&TdmD6d1gC+4QU_Lk+-bTk%ixU7%{;{PG;756PQvV3YQMC&3D)U@PpI1 zf+~q6qTG3U6PcnH#{7l=QH^??(jvyZy^wflMb0BDrh3oig#$T#E%ZO6O;p;0DzjWH z=AU2vx&5ZJ|I@(l>on(JlmLd>98k&Cg{sX(@WpDxIqV0x0q2MK`d9huBJ`qC`x82i z{{wolgm=-xMN#snh3ka>RieCzzNq&7L|;bLRsIq<|J432!Y?XhKjCb|zvyKbffu!; zpFkm0ne6YCrHghhsxCk6=%WAwW%Jy-eq4{{g%X@D~68 diff --git a/t/unit_fixture/CXGN/Stock/CatalogOrder.t b/t/unit_fixture/CXGN/Stock/CatalogOrder.t index 3fb4d14140..039ba97c70 100644 --- a/t/unit_fixture/CXGN/Stock/CatalogOrder.t +++ b/t/unit_fixture/CXGN/Stock/CatalogOrder.t @@ -43,18 +43,33 @@ for my $extension ("xls", "xlsx") { my $program_id = $schema->resultset('Project::Project')->find({ name => 'test' })->project_id(); - my $item_id = $schema->resultset("Stock::Stock")->find({ name => 'UG120001' })->stock_id(); + my $item_rs = $schema->resultset("Stock::Stock")->find({ name => 'UG120001' }); + my $item_id = $item_rs->stock_id(); my $stock_catalog = CXGN::Stock::Catalog->new({ bcs_schema => $schema, parent_id => $item_id, }); + my $variety_type_id = SGN::Model::Cvterm->get_cvterm_row($schema, 'variety', 'stock_property')->cvterm_id(); + my $organism_id = $item_rs->organism_id(); + my $organism = $schema->resultset("Organism::Organism")->find({organism_id => $organism_id}); + my $item_species = $organism->species(); + my $item_variety; + my $item_stockprop = $schema->resultset("Stock::Stockprop")->find({stock_id => $item_id, type_id => $variety_type_id}); + if ($item_stockprop) { + $item_variety = $item_stockprop->value(); + } else { + $item_variety = 'NA'; + } + $stock_catalog->item_type('single item'); + $stock_catalog->material_type('plant'); + $stock_catalog->material_source('BTI'); $stock_catalog->category('released variety'); - $stock_catalog->description('test item'); - $stock_catalog->material_source('Sendusu'); + $stock_catalog->species($item_species); + $stock_catalog->variety($item_variety); $stock_catalog->breeding_program($program_id); - $stock_catalog->availability('in stock'); + $stock_catalog->additional_info('test adding info'); $stock_catalog->contact_person_id($johndoe_id); ok($stock_catalog->store(), "check adding catalog"); @@ -107,10 +122,10 @@ for my $extension ("xls", "xlsx") { bcs_schema => $schema, item_type => $catalog_info_hash{item_type}, category => $catalog_info_hash{category}, - description => $catalog_info_hash{description}, + material_type => $catalog_info_hash{material_type}, material_source => $catalog_info_hash{material_source}, breeding_program => $catalog_info_hash{breeding_program}, - availability => $catalog_info_hash{availability}, + additional_info => $catalog_info_hash{additional_info}, contact_person_id => $catalog_info_hash{contact_person_id}, parent_id => $stock_id });