Index: .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7.xml =================================================================== --- .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7.xml (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -4498,9 +4498,42 @@ 202776||202775|C|G 202776||202775|T|G -206312||17780|c|G -206312||18298|c|G -206312||17780|C|G -206312||17780|T|G - 143831 +209728||209727|c|G +209728||209727|C|G +209728||209727|T|G +209731||209730|c|G +209731||209730|C|G +209731||209730|T|G +209734||209733|c|G +209734||209733|C|G +209734||209733|T|G +209737||209736|c|G +209737||209736|C|G +209737||209736|T|G +209740||209739|c|G +209740||209739|C|G +209740||209739|T|G +209743||209742|c|G +209743||209742|C|G +209743||209742|T|G +209746||209745|c|G +209746||209745|C|G +209746||209745|T|G +209749||209748|c|G +209749||209748|C|G +209749||209748|T|G +209752||209751|c|G +209752||209751|C|G +209752||209751|T|G +209755||209754|c|G +209755||209754|C|G +209755||209754|T|G +209758||209757|c|G +209758||209757|C|G +209758||209757|T|G +217893||17780|c|G +217893||18298|c|G +217893||17780|C|G +217893||17780|T|G + 147246 14.1 1642285030 @@ -8107,5 +8140,5 @@ - 206312 + 217893 db_201920z_va_vezhbi_owner @@ -8210,9505 +8243,9648 @@ db_202122z_va_prj_db_ispit_183060_20220105_owner - + + 209728 + db_202122z_va_prj_db_ispit_191151_20220127_owner + + + 209731 + db_202122z_va_prj_db_ispit_191215_20220127_owner + + 202755 db_202122z_va_prj_db_ispit_193012_20220105_owner - + + 209749 + db_202122z_va_prj_db_ispit_193012_20220127_owner + + + 209743 + db_202122z_va_prj_db_ispit_193026_20220127_owner + + + 209737 + db_202122z_va_prj_db_ispit_193038_20220127_owner + + 202749 db_202122z_va_prj_db_ispit_193041_20220105_owner - + + 209752 + db_202122z_va_prj_db_ispit_193041_20220127_owner + + + 209740 + db_202122z_va_prj_db_ispit_193064_20220127_owner + + 202773 db_202122z_va_prj_db_ispit_193085_20220105_owner - + + 209734 + db_202122z_va_prj_db_ispit_193085_20220127_owner + + 202746 db_202122z_va_prj_db_ispit_193113_20220105_owner - + 202761 db_202122z_va_prj_db_ispit_193140_20220105_owner - + + 209755 + db_202122z_va_prj_db_ispit_193140_20220127_owner + + 202752 db_202122z_va_prj_db_ispit_193181_20220105_owner - + 202767 db_202122z_va_prj_db_ispit_193187_20220105_owner - + 202764 db_202122z_va_prj_db_ispit_193230_20220105_owner - + + 209758 + db_202122z_va_prj_db_ispit_193230_20220127_owner + + 202776 db_202122z_va_prj_db_ispit_195115_20220105_owner - + 202770 db_202122z_va_prj_db_ispit_196021_20220105_owner - + + 209746 + db_202122z_va_prj_db_ispit_196021_20220127_owner + + 122376 db_202122z_va_prj_drinkservice_owner - + 122418 db_202122z_va_prj_droneracer_owner - + 122379 db_202122z_va_prj_eatnow_owner - + 122382 db_202122z_va_prj_educatum_owner - + 122421 db_202122z_va_prj_farmatiko_owner - + 122385 db_202122z_va_prj_freeparkingspace_owner - + 122618 db_202122z_va_prj_letstravel_owner - + 122388 db_202122z_va_prj_medweb_owner - + 122391 db_202122z_va_prj_moviezilla_owner - + 122394 db_202122z_va_prj_musion_owner - + 122397 db_202122z_va_prj_ordersandstocksmanagement_owner - + 122400 db_202122z_va_prj_pcpicco_owner - + 122621 db_202122z_va_prj_secretsanta_owner - + 122403 db_202122z_va_prj_shopaholic_owner - + 122406 db_202122z_va_prj_thebookspot_owner - + 144223 db_202122z_va_prj_tunetalk_owner - + 185336 db_202122z_va_prj_vacayaway_owner - + 122409 db_202122z_va_prj_vintagelibrary_owner - + 1 122412 db_202122z_va_prj_wediscussmovies_owner - + 122415 db_202122z_va_prj_weservice_owner - + 122339 db_202122z_va_vezhbi_owner - + 137331 dba_202122z_va_prj_sisng_owner - + 111242 ispit_owner_111221 - + 111268 ispit_owner_111223 - + 111294 ispit_owner_114003 - + 111320 ispit_owner_121038 - + 111346 ispit_owner_121058 - + 111372 ispit_owner_122040 - + 111398 ispit_owner_122082 - + 111424 ispit_owner_123041 - + 111450 ispit_owner_123064 - + 111476 ispit_owner_123085 - + 111502 ispit_owner_123107 - + 111528 ispit_owner_13082 - + 111554 ispit_owner_131119 - + 111580 ispit_owner_133001 - + 111609 ispit_owner_133060 - + 111636 ispit_owner_133064 - + 111663 ispit_owner_136005 - + 111689 ispit_owner_141197 - + 111715 ispit_owner_141213 - + 111741 ispit_owner_142013 - + 111767 ispit_owner_142067 - + 111793 ispit_owner_143036 - + 111819 ispit_owner_143043 - + 111846 ispit_owner_143067 - + 111872 ispit_owner_143094 - + 111898 ispit_owner_143096 - + 111924 ispit_owner_143102 - + 111950 ispit_owner_143127 - + 111976 ispit_owner_145011 - + 112002 ispit_owner_147002 - + 112028 ispit_owner_151004 - + 112054 ispit_owner_151074 - + 112080 ispit_owner_151090 - + 112106 ispit_owner_151096 - + 112132 ispit_owner_151112 - + 112158 ispit_owner_151140 - + 112184 ispit_owner_151145 - + 112210 ispit_owner_151152 - + 112236 ispit_owner_151164 - + 112262 ispit_owner_151170 - + 112288 ispit_owner_151181 - + 112314 ispit_owner_151182 - + 112340 ispit_owner_151226 - + 112366 ispit_owner_151241 - + 112392 ispit_owner_152014 - + 112418 ispit_owner_152015 - + 112444 ispit_owner_152020 - + 112470 ispit_owner_152023 - + 112496 ispit_owner_152030 - + 112522 ispit_owner_152060 - + 112548 ispit_owner_152068 - + 112574 ispit_owner_153004 - + 112600 ispit_owner_153036 - + 112626 ispit_owner_153064 - + 112652 ispit_owner_153075 - + 112678 ispit_owner_153089 - + 112704 ispit_owner_153095 - + 112730 ispit_owner_153100 - + 112756 ispit_owner_153101 - + 112782 ispit_owner_153133 - + 112808 ispit_owner_153141 - + 112834 ispit_owner_153153 - + 112860 ispit_owner_153157 - + 112886 ispit_owner_153160 - + 112912 ispit_owner_153165 - + 112938 ispit_owner_153174 - + 112964 ispit_owner_153187 - + 112990 ispit_owner_153188 - + 113016 ispit_owner_155028 - + 113042 ispit_owner_161032 - + 113068 ispit_owner_161160 - + 113094 ispit_owner_161174 - + 113120 ispit_owner_161187 - + 113146 ispit_owner_161191 - + 113172 ispit_owner_161247 - + 113198 ispit_owner_161249 - + 113224 ispit_owner_161251 - + 113250 ispit_owner_161252 - + 113276 ispit_owner_161258 - + 113302 ispit_owner_161532 - + 113328 ispit_owner_161543 - + 113354 ispit_owner_162001 - + 113380 ispit_owner_162003 - + 113406 ispit_owner_162005 - + 113432 ispit_owner_162009 - + 113458 ispit_owner_162013 - + 113484 ispit_owner_162018 - + 113510 ispit_owner_162055 - + 113536 ispit_owner_162067 - + 113562 ispit_owner_163029 - + 113588 ispit_owner_163037 - + 113614 ispit_owner_163042 - + 113640 ispit_owner_163045 - + 113666 ispit_owner_163047 - + 113692 ispit_owner_163054 - + 113718 ispit_owner_163064 - + 113744 ispit_owner_163074 - + 113770 ispit_owner_163075 - + 113796 ispit_owner_163086 - + 113822 ispit_owner_163088 - + 113848 ispit_owner_163102 - + 113874 ispit_owner_163106 - + 113900 ispit_owner_163110 - + 113926 ispit_owner_163142 - + 113952 ispit_owner_163158 - + 113978 ispit_owner_163165 - + 114004 ispit_owner_163180 - + 114030 ispit_owner_163183 - + 114056 ispit_owner_163189 - + 114082 ispit_owner_163200 - + 114108 ispit_owner_163206 - + 114134 ispit_owner_163212 - + 114160 ispit_owner_163218 - + 114186 ispit_owner_163221 - + 114212 ispit_owner_163250 - + 114238 ispit_owner_165003 - + 114264 ispit_owner_165023 - + 114290 ispit_owner_166008 - + 114316 ispit_owner_171009 - + 114342 ispit_owner_171223 - + 114368 ispit_owner_171228 - + 114394 ispit_owner_171241 - + 114420 ispit_owner_172002 - + 114446 ispit_owner_172017 - + 114472 ispit_owner_172037 - + 114498 ispit_owner_173005 - + 114524 ispit_owner_173008 - + 114550 ispit_owner_173014 - + 114576 ispit_owner_173016 - + 114602 ispit_owner_173020 - + 114628 ispit_owner_173023 - + 114654 ispit_owner_173029 - + 114680 ispit_owner_173037 - + 114706 ispit_owner_173038 - + 114732 ispit_owner_173048 - + 114758 ispit_owner_173049 - + 114784 ispit_owner_173054 - + 114810 ispit_owner_173061 - + 114836 ispit_owner_173072 - + 114862 ispit_owner_173076 - + 114888 ispit_owner_173082 - + 114914 ispit_owner_173110 - + 114940 ispit_owner_173112 - + 114966 ispit_owner_173125 - + 114992 ispit_owner_173132 - + 115018 ispit_owner_173157 - + 115044 ispit_owner_173161 - + 115070 ispit_owner_173166 - + 115096 ispit_owner_173171 - + 115122 ispit_owner_173178 - + 115148 ispit_owner_173180 - + 115174 ispit_owner_173220 - + 115200 ispit_owner_173221 - + 115226 ispit_owner_173291 - + 115227 ispit_owner_173291_new - + 115253 ispit_owner - + 115259 ispit_owner_173294_new - + 115285 phpcasuser - + default administrative connection database 14400 postgres - + 115296 sisng_market_assessment_owner - + 115396 sqltester_owner - + 115397 test_owner - + 1 16384 - + 16385 - + 0 16386 - + 0 16387 - + 0 16388 - + 0 16389 - + 0 16390 - + 0 16391 - + 0 16392 - + 0 16393 - + 0 16394 - + 0 16395 - + 0 16396 - + 0 16397 - + 0 16398 - + 0 16399 - + 0 16400 - + 0 16401 - + 0 16402 - + 0 16403 - + 0 16404 - + 0 16405 - + 0 16406 - + 0 16407 - + 0 16408 - + 0 16409 - + 0 16410 - + 0 16411 - + 0 16412 - + 0 16413 - + 0 16414 - + 0 16415 - + 0 16416 - + 0 16417 - + 0 16418 - + 0 16419 - + 0 16420 - + 0 16421 - + 0 16422 - + 0 16423 - + 0 16424 - + 0 16425 - + 0 16426 - + 0 16427 - + 0 16428 - + 0 16429 - + 0 16430 - + 0 16431 - + 0 16432 - + 0 16433 - + 0 16434 - + 0 16435 - + 0 16436 - + 0 16437 - + 0 16438 - + 0 16439 - + 0 16440 - + 0 16441 - + 0 16442 - + 0 16443 - + 0 16444 - + 0 16445 - + 0 16446 - + 0 16447 - + 0 16448 - + 0 16449 - + 0 16450 - + 0 16451 - + 0 16452 - + 0 16453 - + 0 16454 - + 0 16455 - + 0 16456 - + 0 16457 - + 0 16458 - + 0 16459 - + 0 16460 - + 0 16461 - + 0 16462 - + 0 16463 - + 0 16464 - + 0 16465 - + 0 16466 - + 0 16467 - + 0 16468 - + 0 16469 - + 0 16470 - + 0 16471 - + 0 16472 - + 0 16473 - + 0 16474 - + 0 16475 - + 0 16476 - + 0 16477 - + 0 16478 - + 0 16479 - + 0 16480 - + 0 16481 - + 0 16482 - + 0 16483 - + 0 16484 - + 0 16485 - + 0 16486 - + 0 16487 - + 0 16488 - + 0 16489 - + 0 16490 - + 0 16491 - + 0 16492 - + 0 16493 - + 0 16494 - + 0 16495 - + 0 16496 - + 0 16497 - + 0 16498 - + 0 16499 - + 0 16500 - + 0 16501 - + 0 16502 - + 0 16503 - + 0 16504 - + 0 16505 - + 0 16506 - + 0 16507 - + 0 16508 - + 0 16509 - + 0 16510 - + 0 16511 - + 0 16512 - + 0 16513 - + 0 16514 - + 0 16515 - + 0 16516 - + 0 16517 - + 0 16518 - + 1 0 16519 - + 0 16520 - + 0 16521 - + 0 16522 - + 0 16523 - + 0 16524 - + 0 16525 - + 0 16526 - + 0 16527 - + 0 16528 - + 0 16529 - + 0 16530 - + 0 16531 - + 0 16532 - + 0 16533 - + 0 16534 - + 0 16535 - + 0 16536 - + 0 16537 - + 0 16538 - + 0 16539 - + 0 16540 - + 0 16541 - + 0 16542 - + 0 16543 - + 0 16544 - + 0 16545 - + 0 16546 - + 0 16547 - + 0 16548 - + 0 16549 - + 0 16550 - + 0 16551 - + 0 16552 - + 0 16553 - + 0 16554 - + 0 16555 - + 0 16556 - + 0 16557 - + 0 16558 - + 0 16559 - + 0 16560 - + 0 16561 - + 0 16562 - + 0 16563 - + 0 16564 - + 0 16565 - + 0 16566 - + 0 16567 - + 0 16568 - + 0 16569 - + 0 16570 - + 0 16571 - + 0 16572 - + 0 16573 - + 0 16574 - + 0 16575 - + 0 16576 - + 0 16577 - + 0 16578 - + 0 16579 - + 0 16580 - + 0 16581 - + 0 16582 - + 0 16583 - + 0 16584 - + 0 16585 - + 0 16586 - + 0 16587 - + 0 16588 - + 0 16589 - + 0 16590 - + 0 16591 - + 0 16592 - + 0 16593 - + 0 16594 - + 0 16595 - + 0 16596 - + 0 16597 - + 0 16598 - + 0 16599 - + 0 16600 - + 0 16601 - + 0 16602 - + 0 16603 - + 0 16604 - + 0 16605 - + 0 16606 - + 0 16607 - + 0 16608 - + 0 16609 - + 0 16610 - + 0 16611 - + 0 16612 - + 0 16613 - + 0 16614 - + 0 16615 - + 0 16616 - + 1 0 16617 - + 0 16618 - + 1 0 16619 - + 0 16620 - + 1 0 16621 - + 0 16622 - + 1 0 16623 - + 0 16624 - + 1 0 16625 - + 0 16626 - + 1 0 16627 - + 0 16628 - + 1 0 16629 - + 0 16630 - + 1 0 16631 - + 0 16632 - + 1 0 16633 - + 0 16634 - + 0 16635 - + 1 0 16636 - + 0 16637 - + 1 0 16638 - + 1 0 16639 - + 0 16640 - + 1 0 16641 - + 0 16642 - + 1 0 16643 - + 0 16644 - + 1 0 16645 - + 0 16646 - + 1 0 16647 - + 0 16648 - + 1 0 16649 - + 0 16650 - + 1 0 16651 - + 0 16652 - + 1 0 16653 - + 0 16654 - + 1 0 16655 - + 0 16656 - + 1 0 16657 - + 0 16658 - + 1 0 16659 - + 0 16660 - + 1 0 16661 - + 0 16662 - + 1 0 16663 - + 0 16664 - + 1 0 16665 - + 0 16666 - + 1 0 16667 - + 0 16668 - + 1 0 16669 - + 0 16670 - + 1 0 16671 - + 0 16672 - + 1 0 16673 - + 0 16674 - + 1 0 16675 - + 0 16676 - + 1 0 16677 - + 0 16678 - + 1 0 16679 - + 0 16680 - + 1 0 16681 - + 0 16682 - + 1 0 16683 - + 0 16684 - + 1 0 16685 - + 0 16686 - + 1 0 16687 - + 0 16688 - + 1 0 16689 - + 0 16690 - + 1 0 16691 - + 0 16692 - + 1 0 16693 - + 0 16694 - + 1 0 16695 - + 0 16696 - + 1 0 16697 - + 0 16698 - + 1 0 16699 - + 0 16700 - + 1 0 16701 - + 0 16702 - + 1 0 16703 - + 0 16704 - + 1 0 16705 - + 0 16706 - + 1 0 16707 - + 0 16708 - + 1 0 16709 - + 0 16710 - + 1 0 16711 - + 0 16712 - + 1 0 16713 - + 0 16714 - + 0 16715 - + 0 16716 - + 0 16717 - + 0 16718 - + 0 16719 - + 0 16720 - + 0 16721 - + 0 16722 - + 0 16723 - + 0 16724 - + 0 16725 - + 0 16726 - + 0 16727 - + 0 16728 - + 0 16729 - + 0 16730 - + 0 16731 - + 0 16732 - + 0 16733 - + 0 16734 - + 0 16735 - + 0 16736 - + 0 16737 - + 0 16738 - + 0 16739 - + 0 16740 - + 0 16741 - + 0 16742 - + 0 16743 - + 0 16744 - + 0 16745 - + 0 16746 - + 0 16747 - + 0 16748 - + 0 16749 - + 0 16750 - + 0 16751 - + 0 16752 - + 0 16753 - + 0 16754 - + 0 16755 - + 0 16756 - + 0 16757 - + 0 16758 - + 0 16759 - + 0 16760 - + 0 16761 - + 0 16762 - + 0 16763 - + 0 16764 - + 0 16765 - + 0 16766 - + 0 16767 - + 0 16768 - + 0 16769 - + 0 16770 - + 0 16771 - + 0 16772 - + 0 16773 - + 0 16774 - + 0 16775 - + 0 16776 - + 0 16777 - + 0 16778 - + 0 16779 - + 0 16780 - + 0 16781 - + 0 16782 - + 0 16783 - + 0 16784 - + 0 16785 - + 0 16786 - + 0 16787 - + 0 16788 - + 0 16789 - + 0 16790 - + 0 16791 - + 0 16792 - + 0 16793 - + 0 16794 - + 0 16795 - + 0 16796 - + 0 16797 - + 0 16798 - + 0 16799 - + 0 16800 - + 0 16801 - + 0 16802 - + 0 16803 - + 0 16804 - + 0 16805 - + 0 16806 - + 0 16807 - + 0 16808 - + 0 16809 - + 0 16810 - + 0 16811 - + 0 16812 - + 0 16813 - + 0 16814 - + 0 16815 - + 0 16816 - + 0 16817 - + 0 16818 - + 0 16819 - + 0 16820 - + 0 16821 - + 0 16822 - + 0 16823 - + 0 16824 - + 0 16825 - + 0 16826 - + 0 16827 - + 0 16828 - + 0 16829 - + 0 16830 - + 0 16831 - + 0 16832 - + 0 16833 - + 0 16834 - + 0 16835 - + 0 16836 - + 0 16837 - + 0 16838 - + 0 16839 - + 0 16840 - + 0 16841 - + 0 16842 - + 0 16843 - + 0 16844 - + 0 16845 - + 0 16846 - + 0 16847 - + 0 16848 - + 0 16849 - + 0 16850 - + 0 16851 - + 0 16852 - + 0 16853 - + 0 16854 - + 0 16855 - + 0 16856 - + 0 16857 - + 0 16858 - + 0 16859 - + 0 16860 - + 0 16861 - + 0 16862 - + 0 16863 - + 0 16864 - + 0 16865 - + 0 16866 - + 0 16867 - + 0 16868 - + 0 16869 - + 0 16870 - + 0 16871 - + 0 16872 - + 0 16873 - + 0 16874 - + 0 16875 - + 0 16876 - + 0 16877 - + 0 16878 - + 0 16879 - + 0 16880 - + 0 16881 - + 0 16882 - + 0 16883 - + 0 16884 - + 0 16885 - + 0 16886 - + 0 16887 - + 0 16888 - + 0 16889 - + 0 16890 - + 0 16891 - + 0 16892 - + 0 16893 - + 0 16894 - + 0 16895 - + 0 16896 - + 0 16897 - + 0 16898 - + 0 16899 - + 0 16900 - + 0 16901 - + 0 16902 - + 0 16903 - + 0 16904 - + 0 16905 - + 0 16906 - + 0 16907 - + 0 16908 - + 0 16909 - + 0 16910 - + 0 16911 - + 0 16912 - + 0 16913 - + 0 16914 - + 0 16915 - + 0 16916 - + 0 16917 - + 0 16918 - + 0 16919 - + 0 16920 - + 0 16921 - + 0 16922 - + 0 16923 - + 0 16924 - + 0 16925 - + 0 16926 - + 0 16927 - + 0 16928 - + 0 16929 - + 0 16930 - + 0 16931 - + 0 16932 - + 0 16933 - + 0 16934 - + 0 16935 - + 0 16936 - + 0 16937 - + 0 16938 - + 0 16939 - + 0 16940 - + 0 16941 - + 0 16942 - + 0 16943 - + 0 16944 - + 0 16945 - + 0 16946 - + 0 16947 - + 1 0 16948 - + 0 16949 - + 1 0 16950 - + 0 16951 - + 1 0 16952 - + 0 16953 - + 1 0 16954 - + 0 16955 - + 1 0 16956 - + 0 16957 - + 1 0 16958 - + 0 16959 - + 1 0 16960 - + 0 16961 - + 1 0 16962 - + 0 16963 - + 1 0 16964 - + 0 16965 - + 1 0 16966 - + 0 16967 - + 1 0 16968 - + 0 16969 - + 1 0 16970 - + 0 16971 - + 1 0 16972 - + 0 16973 - + 1 0 16974 - + 0 16975 - + 1 0 16976 - + 0 16977 - + 1 0 16978 - + 0 16979 - + 1 0 16980 - + 0 16981 - + 1 0 16982 - + 0 16983 - + 1 0 16984 - + 0 16985 - + 1 0 16986 - + 0 16987 - + 1 0 16988 - + 0 16989 - + 1 0 16990 - + 0 16991 - + 1 0 16992 - + 0 16993 - + 1 0 16994 - + 0 16995 - + 1 0 16996 - + 0 16997 - + 1 0 16998 - + 1 16999 - + 0 17000 - + 1 0 17001 - + 0 17002 - + 1 0 17003 - + 0 17004 - + 1 0 17005 - + 0 17006 - + 1 0 17007 - + 0 17008 - + 1 0 17009 - + 0 17010 - + 1 0 17011 - + 0 17012 - + 1 0 17013 - + 0 17014 - + 1 0 17015 - + 0 17016 - + 1 0 17017 - + 0 17018 - + 1 0 17019 - + 0 17020 - + 1 0 17021 - + 0 17022 - + 1 0 17023 - + 0 17024 - + 1 0 17025 - + 0 17026 - + 1 0 17027 - + 0 17028 - + 1 0 17029 - + 0 17030 - + 1 0 17031 - + 0 17032 - + 1 0 17033 - + 0 17034 - + 1 0 17035 - + 0 17036 - + 1 0 17037 - + 0 17038 - + 1 0 17039 - + 0 17040 - + 1 0 17041 - + 0 17042 - + 1 0 17043 - + 0 17044 - + 1 0 17045 - + 0 17046 - + 1 0 17047 - + 0 17048 - + 1 0 17049 - + 0 17050 - + 1 0 17051 - + 0 17052 - + 1 0 17053 - + 0 17054 - + 1 0 17055 - + 0 17056 - + 1 0 17057 - + 0 17058 - + 1 0 17059 - + 0 17060 - + 1 0 17061 - + 0 17062 - + 1 0 17063 - + 0 17064 - + 1 0 17065 - + 0 17066 - + 1 0 17067 - + 0 17068 - + 1 0 17069 - + 0 17070 - + 1 0 17071 - + 0 17072 - + 1 0 17073 - + 0 17074 - + 1 0 17075 - + 0 17076 - + 1 0 17077 - + 0 17078 - + 1 0 17079 - + 0 17080 - + 1 0 17081 - + 0 17082 - + 1 0 17083 - + 0 17084 - + 1 0 17085 - + 0 17086 - + 1 0 17087 - + 0 17088 - + 1 0 17089 - + 0 17090 - + 1 0 17091 - + 0 17092 - + 1 0 17093 - + 0 17094 - + 1 0 17095 - + 0 17096 - + 1 0 17097 - + 0 17098 - + 1 0 17099 - + 0 17100 - + 1 0 17101 - + 0 17102 - + 1 0 17103 - + 0 17104 - + 1 0 17105 - + 0 17106 - + 1 0 17107 - + 0 17108 - + 1 0 17109 - + 0 17110 - + 1 0 17111 - + 0 17112 - + 1 0 17113 - + 0 17114 - + 1 0 17115 - + 0 17116 - + 1 0 17117 - + 0 17118 - + 1 0 17119 - + 0 17120 - + 1 0 17121 - + 0 17122 - + 1 0 17123 - + 0 17124 - + 1 0 17125 - + 0 17126 - + 1 0 17127 - + 0 17128 - + 1 0 17129 - + 0 17130 - + 1 0 17131 - + 0 17132 - + 1 0 17133 - + 0 17134 - + 1 0 17135 - + 0 17136 - + 1 0 17137 - + 0 17138 - + 1 0 17139 - + 0 17140 - + 1 0 17141 - + 0 17142 - + 1 0 17143 - + 0 17144 - + 1 0 17145 - + 0 17146 - + 1 0 17147 - + 0 17148 - + 1 0 17149 - + 0 17150 - + 1 0 17151 - + 0 17152 - + 1 0 17153 - + 0 17154 - + 1 0 17155 - + 0 17156 - + 1 0 17157 - + 0 17158 - + 1 0 17159 - + 0 17160 - + 1 0 17161 - + 0 17162 - + 1 0 17163 - + 0 17164 - + 1 0 17165 - + 0 17166 - + 1 0 17167 - + 0 17168 - + 1 0 17169 - + 0 17170 - + 1 0 17171 - + 0 17172 - + 1 0 17173 - + 0 17174 - + 1 0 17175 - + 0 17176 - + 1 0 17177 - + 0 17178 - + 1 0 17179 - + 0 17180 - + 1 0 17181 - + 0 17182 - + 1 0 17183 - + 0 17184 - + 1 0 17185 - + 0 17186 - + 1 0 17187 - + 0 17188 - + 1 0 17189 - + 0 17190 - + 1 0 17191 - + 0 17192 - + 1 0 17193 - + 0 17194 - + 1 0 17195 - + 0 17196 - + 1 0 17197 - + 0 17198 - + 1 0 17199 - + 0 17200 - + 1 0 17201 - + 0 17202 - + 1 0 17203 - + 0 17204 - + 1 0 17205 - + 0 17206 - + 1 0 17207 - + 0 17208 - + 1 0 17209 - + 0 17210 - + 1 0 17211 - + 0 17212 - + 1 0 17213 - + 0 17214 - + 1 0 17215 - + 0 17216 - + 1 0 17217 - + 0 17218 - + 1 0 17219 - + 0 17220 - + 1 0 17221 - + 0 17222 - + 1 0 17223 - + 0 17224 - + 1 0 17225 - + 0 17226 - + 1 0 17227 - + 0 17228 - + 1 0 17229 - + 0 17230 - + 1 0 17231 - + 0 17232 - + 1 0 17233 - + 0 17234 - + 1 0 17235 - + 0 17236 - + 1 0 17237 - + 0 17238 - + 1 0 17239 - + 0 17240 - + 1 0 17241 - + 0 17242 - + 1 0 17243 - + 0 17244 - + 1 0 17245 - + 0 17246 - + 1 0 17247 - + 0 17248 - + 1 0 17249 - + 0 17250 - + 1 0 17251 - + 0 17252 - + 1 0 17253 - + 0 17254 - + 1 0 17255 - + 0 17256 - + 1 0 17257 - + 0 17258 - + 1 0 17259 - + 0 17260 - + 1 0 17261 - + 0 17262 - + 1 0 17263 - + 0 17264 - + 1 0 17265 - + 0 17266 - + 1 0 17267 - + 0 17268 - + 1 0 17269 - + 0 17270 - + 1 0 17271 - + 0 17272 - + 1 0 17273 - + 0 17274 - + 1 0 17275 - + 0 17276 - + 1 0 17277 - + 0 17278 - + 1 0 17279 - + 0 17280 - + 1 0 17281 - + 0 17282 - + 1 0 17283 - + 0 17284 - + 1 0 17285 - + 0 17286 - + 1 0 17287 - + 0 17288 - + 1 0 17289 - + 0 17290 - + 1 0 17291 - + 0 17292 - + 1 0 17293 - + 0 17294 - + 1 0 17295 - + 0 17296 - + 0 17297 - + 0 17298 - + 0 17299 - + 0 17300 - + 0 17301 - + 0 17302 - + 0 17303 - + 0 17304 - + 0 17305 - + 0 17306 - + 0 17307 - + 0 17308 - + 0 17309 - + 0 17310 - + 0 17311 - + 0 17312 - + 0 17313 - + 0 17314 - + 0 17315 - + 0 17316 - + 0 17317 - + 0 17318 - + 0 17319 - + 0 17320 - + 0 17321 - + 0 17322 - + 0 17323 - + 0 17324 - + 0 17325 - + 0 17326 - + 0 17327 - + 0 17328 - + 0 17329 - + 0 17330 - + 0 17331 - + 0 17332 - + 0 17333 - + 0 17334 - + 0 17335 - + 0 17336 - + 0 17337 - + 0 17338 - + 0 17339 - + 0 17340 - + 0 17341 - + 0 17342 - + 0 17343 - + 0 17344 - + 0 17345 - + 0 17346 - + 0 17347 - + 0 17348 - + 0 17349 - + 0 17350 - + 0 17351 - + 0 17352 - + 0 17353 - + 0 17354 - + 0 17355 - + 0 17356 - + 0 17357 - + 0 17358 - + 0 17359 - + 0 17360 - + 0 17361 - + 0 17362 - + 0 17363 - + 0 17364 - + 0 17365 - + 0 17366 - + 0 17367 - + 0 17368 - + 0 17369 - + 0 17370 - + 0 17371 - + 0 17372 - + 0 17373 - + 0 17374 - + 0 17375 - + 0 17376 - + 0 17377 - + 0 17378 - + 0 17379 - + 0 17380 - + 0 17381 - + 0 17382 - + 0 17383 - + 0 17384 - + 0 17385 - + 0 17386 - + 0 17387 - + 0 17388 - + 0 17389 - + 0 17390 - + 0 17391 - + 0 17392 - + 0 17393 - + 0 17394 - + 0 17395 - + 0 17396 - + 0 17397 - + 0 17398 - + 0 17399 - + 0 17400 - + 0 17401 - + 0 17402 - + 0 17403 - + 0 17404 - + 0 17405 - + 0 17406 - + 0 17407 - + 0 17408 - + 0 17409 - + 0 17410 - + 0 17411 - + 0 17412 - + 0 17413 - + 0 17414 - + 0 17415 - + 0 17416 - + 0 17417 - + 0 17418 - + 0 17419 - + 0 17420 - + 0 17421 - + 0 17422 - + 0 17423 - + 0 17424 - + 0 17425 - + 0 17426 - + 0 17427 - + 0 17428 - + 0 17429 - + 0 17430 - + 0 17431 - + 0 17432 - + 0 17433 - + 0 17434 - + 0 17435 - + 0 17436 - + 0 17437 - + 0 17438 - + 0 17439 - + 0 17440 - + 0 17441 - + 0 17442 - + 0 17443 - + 0 17444 - + 0 17445 - + 0 17446 - + 0 17447 - + 0 17448 - + 0 17449 - + 0 17450 - + 0 17451 - + 0 17452 - + 0 17453 - + 0 17454 - + 0 17455 - + 0 17456 - + 0 17457 - + 0 17458 - + 0 17459 - + 0 17460 - + 0 17461 - + 0 17462 - + 0 17463 - + 0 17464 - + 0 17465 - + 0 17466 - + 0 17467 - + 0 17468 - + 0 17469 - + 0 17470 - + 0 17471 - + 0 17472 - + 0 17473 - + 0 17474 - + 0 17475 - + 0 17476 - + 0 17477 - + 1 0 17478 - + 0 17479 - + 1 0 17480 - + 0 17481 - + 1 0 17482 - + 0 17483 - + 1 0 17484 - + 0 17485 - + 1 0 17486 - + 0 17487 - + 1 0 17488 - + 0 17489 - + 1 0 17490 - + 0 17491 - + 1 0 17492 - + 0 17493 - + 1 0 17494 - + 0 17495 - + 1 0 17496 - + 0 17497 - + 1 0 17498 - + 0 17499 - + 1 0 17500 - + 0 17501 - + 1 0 17502 - + 0 17503 - + 1 0 17504 - + 0 17505 - + 1 0 17506 - + 0 17507 - + 1 0 17508 - + 0 17509 - + 1 0 17510 - + 0 17511 - + 1 0 17512 - + 0 17513 - + 1 0 17514 - + 0 17515 - + 1 0 17516 - + 0 17517 - + 1 0 17518 - + 0 17519 - + 1 0 17520 - + 0 17521 - + 1 0 17522 - + 0 17523 - + 1 0 17524 - + 0 17525 - + 1 0 17526 - + 0 17527 - + 1 0 17528 - + 0 17529 - + 1 0 17530 - + 0 17531 - + 1 0 17532 - + 0 17533 - + 1 0 17534 - + 0 17535 - + 1 0 17536 - + 0 17537 - + 1 0 17538 - + 0 17539 - + 1 0 17540 - + 0 17541 - + 1 0 17542 - + 0 17543 - + 1 0 17544 - + 0 17545 - + 1 0 17546 - + 0 17547 - + 1 0 17548 - + 0 17549 - + 1 0 17550 - + 0 17551 - + 1 0 17552 - + 0 17553 - + 1 0 17554 - + 0 17555 - + 1 0 17556 - + 0 17557 - + 1 0 17558 - + 0 17559 - + 1 0 17560 - + 0 17561 - + 1 0 17562 - + 0 17563 - + 1 0 17564 - + 0 17565 - + 1 0 17566 - + 0 17567 - + 1 0 17568 - + 0 17569 - + 1 0 17570 - + 0 17571 - + 1 0 17572 - + 0 17573 - + 1 0 17574 - + 0 17575 - + 1 0 17576 - + 0 17577 - + 1 0 17578 - + 0 17579 - + 1 0 17580 - + 0 17581 - + 1 0 17582 - + 0 17583 - + 1 0 17584 - + 0 17585 - + 1 0 17586 - + 0 17587 - + 1 0 17588 - + 0 17589 - + 1 0 17590 - + 0 17591 - + 1 0 17592 - + 0 17593 - + 1 0 17594 - + 0 17595 - + 1 0 17596 - + 0 17597 - + 1 0 17598 - + 0 17599 - + 1 0 17600 - + 0 17601 - + 1 0 17602 - + 0 17603 - + 1 0 17604 - + 0 17605 - + 1 0 17606 - + 0 17607 - + 1 0 17608 - + 0 17609 - + 1 0 17610 - + 0 17611 - + 1 0 17612 - + 0 17613 - + 1 0 17614 - + 0 17615 - + 1 0 17616 - + 0 17617 - + 1 0 17618 - + 0 17619 - + 1 0 17620 - + 0 17621 - + 1 0 17622 - + 0 17623 - + 1 0 17624 - + 0 17625 - + 1 0 17626 - + 0 17627 - + 1 0 17628 - + 0 17629 - + 1 0 17630 - + 0 17631 - + 1 0 17632 - + 0 17633 - + 1 0 17634 - + 0 17635 - + 1 0 17636 - + 0 17637 - + 1 0 17638 - + 0 17639 - + 1 0 17640 - + 0 17641 - + 1 0 17642 - + 0 17643 - + 1 0 17644 - + 0 17645 - + 1 0 17646 - + 0 17647 - + 1 0 17648 - + 0 17649 - + 1 0 17650 - + 0 17651 - + 1 0 17652 - + 0 17653 - + 1 0 17654 - + 0 17655 - + 1 0 17656 - + 0 17657 - + 1 0 17658 - + 0 17659 - + 1 0 17660 - + 0 17661 - + 1 0 17662 - + 0 17663 - + 1 0 17664 - + 0 17665 - + 1 0 17666 - + 0 17667 - + 1 0 17668 - + 0 17669 - + 1 0 17670 - + 0 17671 - + 1 0 17672 - + 0 17673 - + 1 0 17674 - + 0 17675 - + 1 0 17676 - + 0 17677 - + 1 0 17678 - + 0 17679 - + 1 0 17680 - + 0 17681 - + 1 0 17682 - + 0 17683 - + 1 0 17684 - + 0 17685 - + 1 0 17686 - + 0 17687 - + 1 0 17688 - + 0 17689 - + 1 0 17690 - + 0 17691 - + 1 0 17692 - + 0 17693 - + 1 0 17694 - + 0 17695 - + 1 0 17696 - + 0 17697 - + 1 0 17698 - + 0 17699 - + 1 0 17700 - + 0 17701 - + 1 0 17702 - + 0 17703 - + 1 0 17704 - + 0 17705 - + 1 0 17706 - + 0 17707 - + 1 0 17708 - + 0 17709 - + 1 0 17710 - + 0 17711 - + 1 0 17712 - + 0 17713 - + 1 0 17714 - + 0 17715 - + 1 0 17716 - + 0 17717 - + 1 0 17718 - + 0 17719 - + 1 0 17720 - + 0 17721 - + 1 0 17722 - + 0 17723 - + 1 0 17724 - + 0 17725 - + 1 0 17726 - + 0 17727 - + 1 0 17728 - + 0 17729 - + 1 0 17730 - + 0 17731 - + 1 0 17732 - + 0 17733 - + 1 0 17734 - + 0 17735 - + 1 0 17736 - + 0 17737 - + 1 0 17738 - + 0 17739 - + 1 0 17740 - + 0 17741 - + 1 0 17742 - + 0 17743 - + 1 0 17744 - + 0 17745 - + 1 0 17746 - + 0 17747 - + 1 0 17748 - + 0 17749 - + 1 0 17750 - + 0 17751 - + 1 0 17752 - + 0 17753 - + 1 0 17754 - + 0 17755 - + 1 0 17756 - + 0 17757 - + 1 0 17758 - + 0 17759 - + 1 0 17760 - + 0 17761 - + 1 0 17762 - + 0 17763 - + 1 0 17764 - + 0 17765 - + 1 0 17766 - + 0 17767 - + 1 0 17768 - + 0 17769 - + 1 0 17770 - + 0 17771 - + 1 0 17772 - + 0 17773 - + 1 0 17774 - + 0 17775 - + 1 0 17776 - + 0 17777 - + 1 0 17778 - - 0 - 206311 - - + + 0 + 217892 + + 1 0 17780 - + 0 17781 - + 1 0 17782 - + 0 17783 - + 1 0 17784 - + 0 17785 - + 1 0 17786 - + 0 17787 - + 1 0 17788 - + 0 17789 - + 1 0 17790 - + 0 17791 - + 1 0 17792 - + 0 17793 - + 1 0 17794 - + 0 17795 - + 1 0 17796 - + 0 17797 - + 1 0 17798 - + 0 17799 - + 1 0 17800 - + 0 17801 - + 1 0 17802 - + 0 17803 - + 1 0 17804 - + 0 17805 - + 1 0 17806 - + 0 17807 - + 1 0 17808 - + 0 17809 - + 1 0 17810 - + 0 17811 - + 1 0 17812 - + 0 17813 - + 1 0 17814 - + 0 17815 - + 1 0 17816 - + 0 17817 - + 1 0 17818 - + 0 17819 - + 1 0 17820 - + 0 17821 - + 1 0 17822 - + 0 122371 - + 1 0 122372 - + 0 122613 - + 1 0 122614 - + 0 185331 - + 1 0 185332 - + 0 202756 - + 1 0 202757 - + + 0 + 209726 + + + 1 + 0 + 209727 + + + 0 + 209729 + + + 1 + 0 + 209730 + + 0 202753 - + 1 0 202754 - + + 0 + 209747 + + + 1 + 0 + 209748 + + + 0 + 209741 + + + 1 + 0 + 209742 + + + 0 + 209735 + + + 1 + 0 + 209736 + + 0 202747 - + 1 0 202748 - + + 0 + 209750 + + + 1 + 0 + 209751 + + + 0 + 209738 + + + 1 + 0 + 209739 + + 0 202771 - + 1 0 202772 - + + 0 + 209732 + + + 1 + 0 + 209733 + + 0 202744 - + 1 0 202745 - + 0 202759 - + 1 0 202760 - + + 0 + 209753 + + + 1 + 0 + 209754 + + 0 202750 - + 1 0 202751 - + 0 202765 - + 1 0 202766 - + 0 202762 - + 1 0 202763 - + + 0 + 209756 + + + 1 + 0 + 209757 + + 0 202774 - + 1 0 202775 - + 0 202768 - + 1 0 202769 - + + 0 + 209744 + + + 1 + 0 + 209745 + + 0 122374 - + 1 0 122375 - + 0 122416 - + 1 0 122417 - + 0 122377 - + 1 0 122378 - + 0 122380 - + 1 0 122381 - + 0 122419 - + 1 0 122420 - + 0 122383 - + 1 0 122384 - + 0 122616 - + 1 0 122617 - + 0 122386 - + 1 0 122387 - + 0 122389 - + 1 0 122390 - + 0 122392 - + 1 0 122393 - + 0 122395 - + 1 0 122396 - + 0 122398 - + 1 0 122399 - + 0 122619 - + 1 0 122620 - + 0 122401 - + 1 0 122402 - + 0 122404 - + 1 0 122405 - + 0 144221 - + 1 0 144222 - + 0 185334 - + 1 0 185335 - + 0 122407 - + 1 0 122408 - + 0 122410 - + 1 0 122411 - + 0 122413 - + 1 0 122414 - + 1 0 151761 - + 0 122337 - + 1 0 122338 - + 0 137329 - + 128630 - + 128629 - + 1 0 137330 - + 128628 - + 17823 - + 0 17824 - + 0 17825 - + 0 17826 - + 0 17827 - + 0 17828 - + 0 17829 - + 0 17830 - + 0 17831 - + 0 17832 - + 0 17833 - + 0 17834 - + 0 17835 - + 0 17836 - + 0 17837 - + 0 17838 - + 0 17839 - + 0 17840 - + 0 17841 - + 0 17842 - + 0 17843 - + 0 17844 - + 0 17845 - + 0 17846 - + 0 17847 - + 0 17848 - + 0 17849 - + 0 17850 - + 0 17851 - + 0 17852 - + 0 17853 - + 0 17854 - + 0 17855 - + 0 17856 - + 0 17857 - + 0 17858 - + 0 17859 - + 0 17860 - + 0 17861 - + 0 17862 - + 0 17863 - + 0 17864 - + 0 17865 - + 0 17866 - + 0 17867 - + 0 17868 - + 0 17869 - + 0 17870 - + 0 17871 - + 0 17872 - + 0 17873 - + 0 17874 - + 0 17875 - + 0 17876 - + 0 17877 - + 0 17878 - + 0 17879 - + 0 17880 - + 0 17881 - + 0 17882 - + 0 17883 - + 0 17884 - + 0 17885 - + 0 17886 - + 0 17887 - + 0 17888 - + 0 17889 - + 0 17890 - + 0 17891 - + 0 17892 - + 0 17893 - + 0 17894 - + 0 17895 - + 0 17896 - + 0 17897 - + 0 17898 - + 0 17899 - + 0 17900 - + 0 17901 - + 0 17902 - + 0 17903 - + 0 17904 - + 0 17905 - + 0 17906 - + 0 17907 - + 0 17908 - + 0 17909 - + 0 17910 - + 0 17911 - + 0 17912 - + 0 17913 - + 0 17914 - + 0 17915 - + 0 17916 - + 0 17917 - + 0 17918 - + 0 17919 - + 0 17920 - + 0 17921 - + 0 17922 - + 0 17923 - + 0 17924 - + 0 17925 - + 0 17926 - + 0 17927 - + 0 17928 - + 0 17929 - + 0 17930 - + 0 17931 - + 0 17932 - + 0 17933 - + 0 17934 - + 0 17935 - + 0 17936 - + 0 17937 - + 0 17938 - + 0 17939 - + 0 17940 - + 0 17941 - + 0 17942 - + 0 17943 - + 0 17944 - + 0 17945 - + 0 17946 - + 0 17947 - + 0 17948 - + 0 17949 - + 0 17950 - + 0 17951 - + 0 17952 - + 0 17953 - + 0 17954 - + 0 17955 - + 0 17956 - + 0 17957 - + 0 17958 - + 0 17959 - + 0 17960 - + 0 17961 - + 0 17962 - + 0 17963 - + 0 17964 - + 0 17965 - + 0 17966 - + 0 17967 - + 0 17968 - + 0 17969 - + 0 17970 - + 0 17971 - + 0 17972 - + 0 17973 - + 0 17974 - + 0 17975 - + 0 17976 - + 0 17977 - + 0 17978 - + 0 17979 - + 0 17980 - + 1 0 17981 - + 1 0 17982 - + 1 0 17983 - + 1 0 17984 - + 1 0 17985 - + 1 0 17986 - + 1 0 17987 - + 1 0 17988 - + 1 0 17989 - + 1 0 17990 - + 1 0 17991 - + 1 0 17992 - + 1 0 17993 - + 1 0 17994 - + 1 0 17995 - + 1 0 17996 - + 1 0 17997 - + 1 0 17998 - + 1 0 17999 - + 1 0 18000 - + 1 0 18001 - + 1 0 18002 - + 1 0 18003 - + 1 0 18004 - + 1 0 18005 - + 1 0 18006 - + 1 0 18007 - + 1 0 18008 - + 1 0 18009 - + 1 0 18010 - + 1 0 18011 - + 1 0 18012 - + 1 0 18013 - + 1 0 18014 - + 1 0 18015 - + 1 0 18016 - + 1 0 18017 - + 1 0 18018 - + 1 0 18019 - + 1 0 18020 - + 1 0 18021 - + 1 0 18022 - + 1 0 18023 - + 1 0 18024 - + 1 0 18025 - + 1 0 18026 - + 1 0 18027 - + 1 0 18028 - + 1 0 18029 - + 1 0 18030 - + 1 0 18031 - + 1 0 18032 - + 1 0 18033 - + 1 0 18034 - + 1 0 18035 - + 1 0 18036 - + 1 0 18037 - + 1 0 18038 - + 1 0 18039 - + 1 0 18040 - + 1 0 18041 - + 1 0 18042 - + 1 0 18043 - + 1 0 18044 - + 1 0 18045 - + 1 0 18046 - + 1 0 18047 - + 1 0 18048 - + 1 0 18049 - + 1 0 18050 - + 1 0 18051 - + 1 0 18052 - + 1 0 18053 - + 1 0 18054 - + 1 0 18055 - + 1 0 18056 - + 1 0 18057 - + 1 0 18058 - + 1 0 18059 - + 1 0 18060 - + 1 0 18061 - + 1 0 18062 - + 1 0 18063 - + 1 0 18064 - + 1 0 18065 - + 1 0 18066 - + 1 0 18067 - + 1 0 18068 - + 1 0 18069 - + 1 0 18070 - + 1 0 18071 - + 1 0 18072 - + 1 0 18073 - + 1 0 18074 - + 1 0 18075 - + 1 0 18076 - + 1 0 18077 - + 1 0 18078 - + 1 0 18079 - + 1 0 18080 - + 1 0 18081 - + 1 0 18082 - + 1 0 18083 - + 1 0 18084 - + 1 0 18085 - + 1 0 18086 - + 1 0 18087 - + 1 0 18088 - + 1 0 18089 - + 1 0 18090 - + 1 0 18091 - + 1 0 18092 - + 1 0 18093 - + 1 0 18094 - + 1 0 18095 - + 1 0 18096 - + 1 0 18097 - + 1 0 18098 - + 1 0 18099 - + 1 0 18100 - + 1 0 18101 - + 1 0 18102 - + 1 0 18103 - + 1 0 18104 - + 1 0 18105 - + 1 0 18106 - + 1 0 18107 - + 1 0 18108 - + 1 0 18109 - + 1 0 18110 - + 1 0 18111 - + 1 0 18112 - + 1 0 18113 - + 1 0 18114 - + 1 0 18115 - + 1 0 18116 - + 1 0 18117 - + 1 0 18118 - + 1 0 18119 - + 1 0 18120 - + 1 0 18121 - + 1 0 18122 - + 1 0 18123 - + 1 0 18124 - + 1 0 18125 - + 1 0 18126 - + 1 0 18127 - + 1 0 18128 - + 1 0 18129 - + 1 0 18130 - + 1 0 18131 - + 1 0 18132 - + 1 0 18133 - + 1 0 18134 - + 1 0 18135 - + 1 0 18136 - + 1 0 18137 - + 1 18138 - + 1 0 18139 - + 1 0 18140 - + 1 0 18141 - + 1 0 18142 - + 1 0 18143 - + 1 0 18144 - + 1 0 18145 - + 1 0 18146 - + 1 0 18147 - + 1 0 18148 - + 1 0 18149 - + 1 0 18150 - + 1 0 18151 - + 1 0 18152 - + 1 0 18153 - + 1 0 18154 - + 1 0 18155 - + 1 0 18156 - + 1 0 18157 - + 1 0 18158 - + 1 0 18159 - + 1 0 18160 - + 1 0 18161 - + 1 0 18162 - + 1 0 18163 - + 1 0 18164 - + 1 0 18165 - + 1 0 18166 - + 1 0 18167 - + 1 0 18168 - + 1 0 18169 - + 1 0 18170 - + 1 0 18171 - + 1 0 18172 - + 1 0 18173 - + 1 0 18174 - + 1 0 18175 - + 1 0 18176 - + 1 0 18177 - + 1 0 18178 - + 1 0 18179 - + 1 0 18180 - + 1 0 18181 - + 1 0 18182 - + 1 0 18183 - + 1 0 18184 - + 1 0 18185 - + 1 0 18186 - + 1 0 18187 - + 1 0 18188 - + 1 0 18189 - + 1 0 18190 - + 1 0 18191 - + 1 0 18192 - + 1 0 18193 - + 1 0 18194 - + 1 0 18195 - + 1 0 18196 - + 1 0 18197 - + 1 0 18198 - + 1 0 18199 - + 1 0 18200 - + 1 0 18201 - + 1 0 18202 - + 1 0 18203 - + 1 0 18204 - + 1 0 18205 - + 1 0 18206 - + 1 0 18207 - + 1 0 18208 - + 1 0 18209 - + 1 0 18210 - + 1 0 18211 - + 1 0 18212 - + 1 0 18213 - + 1 0 18214 - + 1 0 18215 - + 1 0 18216 - + 1 0 18217 - + 1 0 18218 - + 1 0 18219 - + 1 0 18220 - + 1 0 18221 - + 1 0 18222 - + 1 0 18223 - + 1 0 18224 - + 1 0 18225 - + 1 0 18226 - + 1 0 18227 - + 1 0 18228 - + 1 0 18229 - + 1 0 18230 - + 1 0 18231 - + 1 0 18232 - + 1 0 18233 - + 1 0 18234 - + 1 0 18235 - + 1 0 18236 - + 1 0 18237 - + 1 0 18238 - + 1 0 18239 - + 1 0 18240 - + 1 0 18241 - + 1 0 18242 - + 1 0 18243 - + 1 0 18244 - + 1 0 18245 - + 1 0 18246 - + 1 0 18247 - + 1 0 18248 - + 1 0 18249 - + 1 0 18250 - + 1 0 18251 - + 1 0 18252 - + 1 0 18253 - + 1 0 18254 - + 1 0 18255 - + 1 0 18256 - + 1 0 18257 - + 1 0 18258 - + 1 0 18259 - + 1 0 18260 - + 1 0 18261 - + 1 0 18262 - + 1 0 18263 - + 1 0 18264 - + 1 0 18265 - + 1 0 18266 - + 1 0 18267 - + 1 0 18268 - + 1 0 18269 - + 1 0 18270 - + 1 0 18271 - + 1 0 18272 - + 1 0 18273 - + 1 0 18274 - + 1 0 18275 - + 1 0 18276 - + 1 0 18277 - + 1 0 18278 - + 1 0 18279 - + 1 0 18280 - + 1 0 18281 - + 1 0 18282 - + 1 0 18283 - + 1 0 18284 - + 1 0 18285 - + 1 0 18286 - + 1 0 18287 - + 1 0 18288 - + 1 0 18289 - + 1 0 18290 - + 1 0 18291 - + 1 0 18292 - + 1 0 18293 - + 6171 - + 4571 - + 3373 - + 6181 - + 3374 - + 3375 - + 4569 - + 4200 - + 3377 - + 6182 - + 4570 - + 1 18294 - + 1 1 @@ -17718,2049 +17894,2049 @@ 1 - + 18295 - + 18296 - + 18297 - + 18298 - + 0 18299 - + 1 0 18300 - + 1 18301 - + 18302 - + 0 18303 - + 1 0 18304 - + 1 18305 - + 1 0 18306 - + 1 18307 - + 1 18308 - + 1 0 18309 - + 1 18310 - + 1 0 18311 - + 1 0 18312 - + 1 0 18313 - + 1 0 18314 - + 1 0 18315 - + 1 0 18316 - + 1 0 18317 - + 1 0 18318 - + 1 18319 - + 1 0 18320 - + 1 0 18321 - + 1 0 18322 - + 1 0 18323 - + 1 0 18324 - + 1 0 18325 - + 1 18326 - + 1 0 18327 - + 1 18328 - + 1 18329 - + 1 18330 - + 1 18331 - + 1 0 18332 - + 1 18333 - + 1 0 18334 - + 1 0 18335 - + 1 0 18336 - + 1 18337 - + 1 18338 - + 1 0 18339 - + 1 0 18340 - + 1 0 18341 - + 1 0 18342 - + 1 0 18343 - + 1 0 18344 - + 1 0 18345 - + 1 0 18346 - + 1 0 18347 - + 1 18348 - + 1 18349 - + 1 0 18350 - + 1 0 18351 - + 1 18352 - + 1 18353 - + 1 0 18354 - + 1 0 18355 - + 1 0 18356 - + 1 0 18357 - + 1 0 18358 - + 1 0 18359 - + 1 0 18360 - + 1 0 18361 - + 1 18362 - + 1 0 18363 - + 1 18364 - + 1 0 18365 - + 1 0 18366 - + 1 0 18367 - + 1 0 18368 - + 1 0 18369 - + 1 0 18370 - + 1 0 18371 - + 1 0 18372 - + 1 0 18373 - + 1 0 18374 - + 1 0 18375 - + 1 0 18376 - + 1 18377 - + 1 0 18378 - + 1 18379 - + 1 0 18380 - + 1 18381 - + 1 18382 - + 1 0 18383 - + 1 0 18384 - + 1 0 18385 - + 1 0 18386 - + 1 18387 - + 1 18388 - + 1 18389 - + 1 0 18390 - + 1 0 18391 - + 1 18392 - + 1 18393 - + 1 0 18394 - + 1 18395 - + 1 18396 - + 1 0 18397 - + 1 18398 - + 1 0 18399 - + 1 0 18400 - + 1 0 18401 - + 1 0 18402 - + 1 18403 - + 1 0 18404 - + 1 0 18405 - + 1 0 18406 - + 1 0 18407 - + 1 0 18408 - + 1 0 18409 - + 1 0 18410 - + 1 0 18411 - + 1 0 18412 - + 1 0 18413 - + 1 0 18414 - + 1 0 18415 - + 1 0 18416 - + 1 0 18417 - + 1 0 18418 - + 1 0 18419 - + 1 18420 - + 1 0 18421 - + 1 0 18422 - + 1 0 18423 - + 1 0 18424 - + 1 0 18425 - + 1 0 18426 - + 1 18427 - + 1 0 18428 - + 1 0 18429 - + 1 18430 - + 1 0 18431 - + 1 0 18432 - + 1 0 18433 - + 1 0 18434 - + 1 0 18435 - + 1 0 18436 - + 1 0 18437 - + 1 0 18438 - + 1 0 18439 - + 1 0 18440 - + 1 18441 - + 1 0 18442 - + 1 0 18443 - + 1 0 18444 - + 1 0 18445 - + 1 0 18446 - + 1 0 18447 - + 1 0 18448 - + 1 0 18449 - + 1 0 18450 - + 1 0 18451 - + 1 0 18452 - + 1 0 18453 - + 1 0 18454 - + 1 0 18455 - + 1 18456 - + 1 0 18457 - + 1 0 18458 - + 1 0 18459 - + 1 18460 - + 1 0 18461 - + 1 0 18462 - + 1 0 18463 - + 1 0 18464 - + 1 0 18465 - + 1 0 18466 - + 1 18467 - + 1 0 18468 - + 1 0 18469 - + 1 0 18470 - + 1 0 18471 - + 1 0 18472 - + 1 18473 - + 1 0 18474 - + 1 0 18475 - + 1 0 18476 - + 1 0 18477 - + 1 18478 - + 1 0 18479 - + 1 18480 - + 1 0 18481 - + 1 0 18482 - + 1 18483 - + 1 0 18484 - + 1 0 18485 - + 1 0 18486 - + 1 18487 - + 1 0 18488 - + 1 0 18489 - + 1 0 18490 - + 1 0 18491 - + 1 0 18492 - + 1 0 18493 - + 1 0 18494 - + 1 0 18495 - + 1 18496 - + 1 0 18497 - + 1 18498 - + 1 0 18499 - + 1 0 18500 - + 1 0 18501 - + 1 0 18502 - + 1 0 18503 - + 1 0 18504 - + 1 0 18505 - + 1 18506 - + 1 0 18507 - + 1 18508 - + 1 18509 - + 1 0 18510 - + 1 0 18511 - + 1 0 18512 - + 1 0 18513 - + 1 0 18514 - + 1 0 18515 - + 1 0 18516 - + 1 18517 - + 1 18518 - + 1 0 18519 - + 1 0 18520 - + 1 0 18521 - + 1 0 18522 - + 1 0 18523 - + 1 0 18524 - + 1 0 18525 - + 1 18526 - + 1 18527 - + 1 0 18528 - + 1 0 18529 - + 1 18530 - + 1 18531 - + 1 0 18532 - + 1 0 18533 - + 1 0 18534 - + 1 0 18535 - + 1 0 18536 - + 1 0 18537 - + 1 0 18538 - + 1 18539 - + 1 0 18540 - + 1 0 18541 - + 1 0 18542 - + 1 0 18543 - + 1 0 18544 - + 1 0 18545 - + 1 0 18546 - + 1 0 18547 - + 1 0 18548 - + 1 0 18549 - + 1 0 18550 - + 1 0 18551 - + 1 0 18552 - + 1 0 18553 - + 1 18554 - + 1 0 18555 - + 1 0 18556 - + 1 0 18557 - + 1 0 18558 - + 1 0 18559 - + 1 18560 - + 1 0 18561 - + 1 0 18562 - + 1 0 18563 - + 1 0 18564 - + 1 18565 - + 1 0 18566 - + 1 0 18567 - + 1 18568 - + 1 18569 - + 1 18570 - + 1 18571 - + 1 0 18572 - + 1 0 18573 - + 1 0 18574 - + 1 0 18575 - + 1 0 18576 - + 1 18577 - + 1 18578 - + 1 0 18579 - + 1 0 18580 - + 1 0 18581 - + 1 18582 - + 1 0 18583 - + 1 18584 - + 1 0 18585 - + 1 0 18586 - + 1 18587 - + 1 0 18588 - + 1 18589 - + 1 0 18590 - + 1 18591 - + 1 18592 - + 1 0 18593 - + 1 0 18594 - + 1 0 18595 - + 1 0 18596 - + 1 0 18597 - + 1 0 18598 - + 1 0 18599 - + 1 0 18600 - + 1 0 18601 - + 1 18602 - + 1 0 18603 - + 1 0 18604 - + 1 0 18605 - + 1 18606 - + 1 0 18607 - + 1 0 18608 - + 1 18609 - + 1 0 18610 - + 1 0 18611 - + 1 18612 - + 1 0 18613 - + 1 0 18614 - + 1 0 18615 - + 1 18616 - + 1 18617 - + 1 18618 - + 1 18619 - + 1 0 18620 - + 1 0 18621 - + 1 0 18622 - + 1 18623 - + 1 18624 - + 1 0 18625 - + 1 18626 - + 1 0 18627 - + 1 0 18628 - + 1 18629 - + 1 0 18630 - + 1 0 18631 - + 1 0 18632 - + 1 0 18633 - + 1 0 18634 - + 1 0 18635 - + 1 0 18636 - + 1 0 18637 - + 1 0 18638 - + 1 0 18639 - + 1 0 18640 - + 1 0 18641 - + 1 0 18642 - + 1 0 18643 - + 1 0 18644 - + 1 18645 - + 1 0 18646 - + 1 0 18647 - + 1 0 18648 - + 1 18649 - + 1 18650 - + 1 0 18651 - + 1 0 18652 - + 1 0 18653 - + 1 18654 - + 1 0 18655 - + 1 18656 - + 1 18657 - + 1 18658 - + 1 0 18659 - + 1 18660 - + 1 0 18661 - + 1 18662 - + 1 18663 - + 1 18664 - + 1 0 18665 - + 1 0 18666 - + 1 18667 - + 1 0 18668 - + 1 0 18669 - + 1 0 18670 - + 1 0 18671 - + 1 0 18672 - + 1 0 18673 - + 1 18674 - + 1 0 18675 - + 1 0 18676 - + 1 18677 - + 1 0 18678 - + 1 0 18679 - + 1 18680 - + 1 0 18681 - + 1 0 18682 - + 1 18683 - + 1 18684 - + 1 0 18685 - + 1 0 18686 - + 1 0 18687 - + 1 0 18688 - + 1 18689 - + 1 18690 - + 1 0 18691 - + 1 0 18692 - + 1 0 18693 - + 1 0 18694 - + 1 18695 - + 1 18696 - + 1 0 18697 - + 1 0 18698 - + 1 0 18699 - + 1 0 18700 - + 1 0 18701 - + 1 0 18702 - + 1 18703 - + 1 18704 - + 1 0 18705 - + 1 18706 - + 1 18707 - + 1 0 18708 - + 1 0 18709 - + 1 18710 - + 1 18711 - + 1 0 18712 - + 1 0 18713 - + 1 18714 - + 1 0 18715 - + 1 0 18716 - + 1 0 18717 - + 18718 - + 1 0 18719 - + 1 0 18720 - + 1663 1 postgres - + 1664 1 postgres - + 143551 137067 db_202122z_va_prj_wediscussmovies_owner - + 201921 142344 db_202122z_va_prj_wediscussmovies_owner - + 142713 136769 db_202122z_va_prj_wediscussmovies_owner - + 142749 136805 db_202122z_va_prj_wediscussmovies_owner - + 145812 137537 db_202122z_va_prj_wediscussmovies_owner - + 14034 532 postgres - + system catalog schema 11 @@ -19768,29 +19944,29 @@ postgres - - 143832 + + 147247 152130 137939 db_202122z_va_prj_wediscussmovies_owner - + standard public schema 1 - 143832 + 146485 2200 125863 postgres - + integer - 156298 + 217017 character 0.0 - 47 - 138316 + 55 + 146453 sql db_202122z_va_prj_wediscussmovies_owner - + integer 156299 @@ -19802,5 +19978,5 @@ db_202122z_va_prj_wediscussmovies_owner - + integer|0s 157243 @@ -19808,5 +19984,5 @@ db_202122z_va_prj_wediscussmovies_owner - + integer|0s 157141 @@ -19814,5 +19990,5 @@ db_202122z_va_prj_wediscussmovies_owner - + integer|0s 157124 @@ -19820,5 +19996,5 @@ db_202122z_va_prj_wediscussmovies_owner - + integer|0s 157114 @@ -19826,5 +20002,5 @@ db_202122z_va_prj_wediscussmovies_owner - + integer|0s 157268 @@ -19832,5 +20008,5 @@ db_202122z_va_prj_wediscussmovies_owner - + integer|0s 157102 @@ -19838,5 +20014,5 @@ db_202122z_va_prj_wediscussmovies_owner - +
157244138394 @@ -19844,5 +20020,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157142138394 @@ -19850,5 +20026,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157211138394 @@ -19856,5 +20032,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157181138394 @@ -19862,5 +20038,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157166138394 @@ -19868,5 +20044,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157150138394 @@ -19874,5 +20050,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157125138394 @@ -19880,5 +20056,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157227138394 @@ -19886,5 +20062,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157115139960 @@ -19892,5 +20068,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157269138394 @@ -19898,5 +20074,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157196138394 @@ -19904,5 +20080,5 @@ db_202122z_va_prj_wediscussmovies_owner
- +
157103141874 @@ -19910,21 +20086,21 @@ db_202122z_va_prj_wediscussmovies_owner
- + R char|0s - + integer|0s 1 - + R char|0s - + integer|0s 1 - + type movie_id @@ -19934,5 +20110,5 @@ 138394 - + integer|0s nextval('project.discussions_discussion_id_seq'::regclass) @@ -19942,5 +20118,5 @@ 23 - + char|0s 1 @@ -19949,5 +20125,5 @@ 1042 - + varchar(1000)|0s 1 @@ -19956,5 +20132,5 @@ 1043 - + varchar(250)|0s 1 @@ -19963,5 +20139,5 @@ 1043 - + date|0s 1 @@ -19970,5 +20146,5 @@ 1082 - + integer|0s 1 @@ -19977,5 +20153,5 @@ 23 - + integer|0s 7 @@ -19983,5 +20159,5 @@ 23 - + integer|0s 8 @@ -19989,5 +20165,5 @@ 23 - + user_id 157253 @@ -20001,5 +20177,5 @@ users - + movie_id 157258 @@ -20013,5 +20189,5 @@ movies - + person_id 157263 @@ -20025,5 +20201,5 @@ persons - + 1978 discussion_id @@ -20036,5 +20212,5 @@ 403 - + discussion_id 1 @@ -20044,5 +20220,5 @@ 157251 - + integer|0s nextval('project.genres_genre_id_seq'::regclass) @@ -20052,5 +20228,5 @@ 23 - + varchar(100)|0s 1 @@ -20059,5 +20235,5 @@ 1043 - + 1978 genre_id @@ -20070,5 +20246,5 @@ 403 - + 3126 genre_type @@ -20081,5 +20257,5 @@ 403 - + genre_id 1 @@ -20089,5 +20265,5 @@ 157146 - + genre_type 1 @@ -20096,5 +20272,5 @@ 157148 - + actor_id 157214 @@ -20102,5 +20278,5 @@ 138394 - + integer|0s 1 @@ -20109,5 +20285,5 @@ 23 - + integer|0s 1 @@ -20116,5 +20292,5 @@ 23 - + movie_id 157217 @@ -20128,5 +20304,5 @@ movies - + actor_id 157222 @@ -20140,5 +20316,5 @@ persons - + 1978,1978 movie_id @@ -20151,5 +20327,5 @@ 403 - + movie_id actor_id @@ -20159,5 +20335,5 @@ 157215 - + integer|0s 1 @@ -20166,5 +20342,5 @@ 23 - + integer|0s 1 @@ -20173,5 +20349,5 @@ 23 - + movie_id 157186 @@ -20185,5 +20361,5 @@ movies - + genre_id 157191 @@ -20197,5 +20373,5 @@ genres - + 1978,1978 movie_id @@ -20208,5 +20384,5 @@ 403 - + movie_id genre_id @@ -20216,5 +20392,5 @@ 157184 - + integer|0s 1 @@ -20223,5 +20399,5 @@ 23 - + integer|0s 1 @@ -20230,5 +20406,5 @@ 23 - + movie_id 157171 @@ -20242,5 +20418,5 @@ movies - + user_id 157176 @@ -20254,5 +20430,5 @@ users - + 1978,1978 movie_id @@ -20265,5 +20441,5 @@ 403 - + movie_id user_id @@ -20273,5 +20449,5 @@ 157169 - + stars_rated 157153 @@ -20279,5 +20455,5 @@ 138394 - + integer|0s 1 @@ -20286,5 +20462,5 @@ 23 - + integer|0s 1 @@ -20293,5 +20469,5 @@ 23 - + varchar(300)|0s 1 @@ -20300,5 +20476,5 @@ 1043 - + integer|0s 1 @@ -20307,5 +20483,5 @@ 23 - + movie_id 157156 @@ -20319,5 +20495,5 @@ movies - + user_id 157161 @@ -20331,5 +20507,5 @@ users - + 1978,1978 movie_id @@ -20342,5 +20518,5 @@ 403 - + movie_id user_id @@ -20350,5 +20526,5 @@ 157154 - + director_id 157129 @@ -20356,5 +20532,5 @@ 138394 - + integer|0s nextval('project.movies_movie_id_seq'::regclass) @@ -20364,5 +20540,5 @@ 23 - + varchar(150)|0s 1 @@ -20371,5 +20547,5 @@ 1043 - + varchar(1000)|0s 1 @@ -20378,5 +20554,5 @@ 1043 - + varchar(300)|0s 1 @@ -20385,5 +20561,5 @@ 1043 - + date|0s 1 @@ -20392,5 +20568,5 @@ 1082 - + double precision|0s 6 @@ -20398,5 +20574,5 @@ 701 - + integer|0s 7 @@ -20404,5 +20580,5 @@ 23 - + director_id 157136 @@ -20416,5 +20592,5 @@ persons - + 1978 movie_id @@ -20427,5 +20603,5 @@ 403 - + 3126 title @@ -20438,5 +20614,5 @@ 403 - + movie_id 1 @@ -20446,5 +20622,5 @@ 157132 - + title 1 @@ -20453,5 +20629,5 @@ 157134 - + stars_rated 157230 @@ -20459,5 +20635,5 @@ 138394 - + integer|0s 1 @@ -20466,5 +20642,5 @@ 23 - + integer|0s 1 @@ -20473,5 +20649,5 @@ 23 - + varchar(300)|0s 1 @@ -20480,5 +20656,5 @@ 1043 - + integer|0s 1 @@ -20487,5 +20663,5 @@ 23 - + person_id 157233 @@ -20499,5 +20675,5 @@ persons - + user_id 157238 @@ -20511,5 +20687,5 @@ users - + 1978,1978 person_id @@ -20522,5 +20698,5 @@ 403 - + person_id user_id @@ -20530,5 +20706,5 @@ 157231 - + type 157119 @@ -20536,5 +20712,5 @@ 138394 - + integer|0s nextval('project.persons_person_id_seq'::regclass) @@ -20544,5 +20720,5 @@ 23 - + varchar(100)|0s 1 @@ -20551,5 +20727,5 @@ 1043 - + varchar(100)|0s 1 @@ -20558,5 +20734,5 @@ 1043 - + char|0s 1 @@ -20565,5 +20741,5 @@ 1042 - + date|0s 1 @@ -20572,5 +20748,5 @@ 1082 - + varchar(400)|0s 1 @@ -20579,5 +20755,5 @@ 1043 - + varchar(400)|0s 7 @@ -20585,5 +20761,5 @@ 1043 - + 1978 person_id @@ -20596,5 +20772,5 @@ 403 - + person_id 1 @@ -20604,5 +20780,5 @@ 157122 - + integer|0s 1 @@ -20611,5 +20787,5 @@ 23 - + integer|0s nextval('project.replies_reply_id_seq'::regclass) @@ -20619,5 +20795,5 @@ 23 - + varchar(1000)|0s 1 @@ -20626,5 +20802,5 @@ 1043 - + date|0s 1 @@ -20633,5 +20809,5 @@ 1082 - + integer|0s 1 @@ -20640,5 +20816,5 @@ 23 - + discussion_id 157282 @@ -20652,5 +20828,5 @@ discussions - + user_id 157277 @@ -20664,5 +20840,5 @@ users - + 1978,1978 discussion_id @@ -20675,5 +20851,5 @@ 403 - + discussion_id reply_id @@ -20683,5 +20859,5 @@ 157275 - + integer|0s 1 @@ -20690,5 +20866,5 @@ 23 - + integer|0s 1 @@ -20697,5 +20873,5 @@ 23 - + user_id 157201 @@ -20709,5 +20885,5 @@ users - + genre_id 157206 @@ -20721,5 +20897,5 @@ genres - + 1978,1978 user_id @@ -20732,5 +20908,5 @@ 403 - + user_id genre_id @@ -20740,5 +20916,5 @@ 157199 - + password 191584 @@ -20746,5 +20922,5 @@ 141874 - + integer|0s nextval('project.users_user_id_seq'::regclass) @@ -20754,5 +20930,5 @@ 23 - + varchar(50)|0s 1 @@ -20761,5 +20937,5 @@ 1043 - + varchar(50)|0s 1 @@ -20768,5 +20944,5 @@ 1043 - + varchar(50)|0s 1 @@ -20775,5 +20951,5 @@ 1043 - + varchar(100)|0s 1 @@ -20782,5 +20958,5 @@ 1043 - + varchar(128)|0s 1 @@ -20789,5 +20965,5 @@ 1043 - + 1978 user_id @@ -20800,5 +20976,5 @@ 403 - + 3126 username @@ -20811,5 +20987,5 @@ 403 - + 3126 email @@ -20822,5 +20998,5 @@ 403 - + user_id 1 @@ -20830,5 +21006,5 @@ 157108 - + username 1 @@ -20837,5 +21013,5 @@ 157110 - + email 1 Index: .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7/storage_v2/_src_/database/db_202122z_va_prj_wediscussmovies.LUavmg/schema/project.GUuQ7Q.meta =================================================================== --- .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7/storage_v2/_src_/database/db_202122z_va_prj_wediscussmovies.LUavmg/schema/project.GUuQ7Q.meta (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7/storage_v2/_src_/database/db_202122z_va_prj_wediscussmovies.LUavmg/schema/project.GUuQ7Q.meta (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,2 +1,2 @@ #n:project -! [143832, 0, null, null, -2147483648, -2147483648] +! [147247, 0, null, null, -2147483648, -2147483648] Index: .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7/storage_v2/_src_/database/db_202122z_va_prj_wediscussmovies.LUavmg/schema/public.abK9xQ.meta =================================================================== --- .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7/storage_v2/_src_/database/db_202122z_va_prj_wediscussmovies.LUavmg/schema/public.abK9xQ.meta (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ .idea/dataSources/14a5fbd7-f501-41df-a0af-e3b168b536f7/storage_v2/_src_/database/db_202122z_va_prj_wediscussmovies.LUavmg/schema/public.abK9xQ.meta (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,2 +1,2 @@ #n:public -! [143832, 0, null, null, -2147483648, -2147483648] +! [146485, 0, null, null, -2147483648, -2147483648] Index: .idea/inspectionProfiles/Project_Default.xml =================================================================== --- .idea/inspectionProfiles/Project_Default.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) +++ .idea/inspectionProfiles/Project_Default.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -0,0 +1,15 @@ + + + + Index: .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_6_2.xml =================================================================== --- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_6_2.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) +++ .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_6_2.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + Index: .idea/libraries/Maven__org_springframework_security_spring_security_config_5_6_1.xml =================================================================== --- .idea/libraries/Maven__org_springframework_security_spring_security_config_5_6_1.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) +++ .idea/libraries/Maven__org_springframework_security_spring_security_config_5_6_1.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + Index: pom.xml =================================================================== --- pom.xml (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ pom.xml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -22,8 +22,8 @@ spring-boot-starter-jdbc - - - - + + org.springframework.boot + spring-boot-starter-security + org.springframework.boot Index: project.iml =================================================================== --- project.iml (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ project.iml (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -53,4 +53,10 @@ + + + + + + @@ -73,7 +79,4 @@ - - - @@ -112,7 +115,6 @@ - - - + + Index: src/main/java/com/wediscussmovies/project/WeDiscussMoviesApplication.java =================================================================== --- src/main/java/com/wediscussmovies/project/WeDiscussMoviesApplication.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/WeDiscussMoviesApplication.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,9 +1,10 @@ package com.wediscussmovies.project; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; @SpringBootApplication @@ -14,4 +15,8 @@ SpringApplication.run(WeDiscussMoviesApplication.class, args); } + @Bean + PasswordEncoder getPasswordEncoder(){ + return new BCryptPasswordEncoder(10); + } Index: c/main/java/com/wediscussmovies/project/exception/MovieIdNotFoundException.java =================================================================== --- src/main/java/com/wediscussmovies/project/exception/MovieIdNotFoundException.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ (revision ) @@ -1,7 +1,0 @@ -package com.wediscussmovies.project.exception; - -public class MovieIdNotFoundException extends RuntimeException{ - public MovieIdNotFoundException(Integer id){ - super("Movie with that id=" + id + " does not exist!"); - } -} Index: src/main/java/com/wediscussmovies/project/repository/DiscussionRepository.java =================================================================== --- src/main/java/com/wediscussmovies/project/repository/DiscussionRepository.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/repository/DiscussionRepository.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,12 +1,16 @@ package com.wediscussmovies.project.repository; +import com.wediscussmovies.project.model.Discussion; +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.Person; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; -import com.wediscussmovies.project.model.*; @Repository public interface DiscussionRepository extends JpaRepository { - public List findAllByTitleLike(String title); + List findAllByTitleLike(String title); + List findAllByMovie(Movie movie); + List findAllByPerson (Person person); } Index: src/main/java/com/wediscussmovies/project/repository/GenreRepository.java =================================================================== --- src/main/java/com/wediscussmovies/project/repository/GenreRepository.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/repository/GenreRepository.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,12 +1,22 @@ package com.wediscussmovies.project.repository; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.Genre; +import com.wediscussmovies.project.querymodels.GenreLikes; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import javax.transaction.Transactional; import java.util.List; @Repository public interface GenreRepository extends JpaRepository { - public List findAllByGenreType(String genre); + List findAllByGenreType(String genre); + + @Query(value = "select new com.wediscussmovies.project.querymodels.GenreLikes(g.genreType, count(ug.id.userId)) from Genre g" + + " left join UserGenres ug on ug.id.genreId = g.genreId" + + " group by g.genreType" + + " order by count(ug.id.userId) desc") + @Transactional + List findAllWithLikes(); } Index: src/main/java/com/wediscussmovies/project/repository/MovieRepository.java =================================================================== --- src/main/java/com/wediscussmovies/project/repository/MovieRepository.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/repository/MovieRepository.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,12 +1,15 @@ package com.wediscussmovies.project.repository; +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.Person; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; -import com.wediscussmovies.project.model.*; @Repository public interface MovieRepository extends JpaRepository { - public List findAllByTitleLike(String Title); + List findAllByTitleLike(String Title); + List findAllByDirector(Person director); + List findAllByDirectorIsNull(); } Index: src/main/java/com/wediscussmovies/project/repository/PersonRepository.java =================================================================== --- src/main/java/com/wediscussmovies/project/repository/PersonRepository.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/repository/PersonRepository.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,17 +1,16 @@ package com.wediscussmovies.project.repository; -import com.wediscussmovies.project.model.*; -import com.wediscussmovies.project.model.enumerations.PersonType; +import com.wediscussmovies.project.model.Person; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Optional; @Repository public interface PersonRepository extends JpaRepository { - public List findAllByType(Character type); - public List findAllByTypeAndNameLike(Character type, String name); - public List findAllByTypeAndSurnameLike(Character type, String surname); - public Optional findPersonByPersonIdAndType(Integer id, Character type); + List findAllByType(Character type); + List findAllByTypeAndNameLike(Character type, String name); + List findAllByTypeAndSurnameLike(Character type, String surname); + // Optional findPersonByPersonIdAndType(Integer id, Character type); + List findAllByTypeAndNameLikeOrSurnameLike(Character type,String name, String surname); } Index: src/main/java/com/wediscussmovies/project/repository/ReplyRepository.java =================================================================== --- src/main/java/com/wediscussmovies/project/repository/ReplyRepository.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/repository/ReplyRepository.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,10 +1,26 @@ package com.wediscussmovies.project.repository; +import com.wediscussmovies.project.model.Discussion; +import com.wediscussmovies.project.model.Reply; +import com.wediscussmovies.project.model.primarykeys.ReplyPK; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.wediscussmovies.project.model.*; + +import javax.transaction.Transactional; +import java.sql.Date; +import java.util.List; @Repository -public interface ReplyRepository extends JpaRepository { +public interface ReplyRepository extends JpaRepository { + List findAllByDiscussion(Discussion discussion); + + @Modifying + @Query(value = "insert into project.replies (text,date,user_id,discussion_id) values(:text,:date,:user_id,:discussion_id)",nativeQuery = true) + @Transactional + void insertInto(@Param("text") String text, @Param("date")Date date, + @Param("user_id")Integer userId,@Param("discussion_id")Integer discussionId); } Index: src/main/java/com/wediscussmovies/project/repository/UserRepository.java =================================================================== --- src/main/java/com/wediscussmovies/project/repository/UserRepository.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/repository/UserRepository.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,5 +1,5 @@ package com.wediscussmovies.project.repository; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -9,7 +9,4 @@ @Repository public interface UserRepository extends JpaRepository { - public Optional findByEmailAndPassword(String email, String password); - public Optional findByUsernameAndPassword(String email, String password); - public Optional findByUsername(String username); - public Optional findByEmail(String email); + Optional findByUsername(String username); } Index: src/main/java/com/wediscussmovies/project/service/DiscussionService.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/DiscussionService.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/DiscussionService.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,13 +1,18 @@ package com.wediscussmovies.project.service; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.Discussion; +import com.wediscussmovies.project.model.User; import java.util.List; -import java.util.Optional; public interface DiscussionService { List listAll(); List listAllByTitle(String title); - Optional findById(Integer id); - void save(Discussion discussion); + Discussion findById(Integer id); + void save(Character type,Integer id, String title, String text, User user); + void edit(Integer discussionId,Character type,Integer id, String title, String text); + void deleteById(Integer discussionId); + void likeDiscussion(Integer discussionId,Integer userId); + void unlikeDiscussion(Integer discussionId,Integer userId); + List findAllForPersonOrMovie(Integer id,Character type); } Index: src/main/java/com/wediscussmovies/project/service/GenreService.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/GenreService.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/GenreService.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,15 +1,17 @@ package com.wediscussmovies.project.service; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.Genre; +import com.wediscussmovies.project.querymodels.GenreLikes; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Optional; @Service public interface GenreService { - public List findAll(); - public Optional findById(Integer id); - public List findAllByType(String genre); - public Genre save(String genreName); + List findAll(); + Genre findById(Integer id); + List findAllByType(String genre); + Genre save(String genreName); + List findAllWithLikes(); + } Index: src/main/java/com/wediscussmovies/project/service/MovieService.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/MovieService.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/MovieService.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,14 +1,35 @@ package com.wediscussmovies.project.service; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.ajaxmodels.Grade; +import com.wediscussmovies.project.model.Genre; +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.Person; +import com.wediscussmovies.project.model.User; +import java.sql.Date; import java.util.List; -import java.util.Optional; public interface MovieService { - public List listAll(); - public List searchByTitle(String title); - public Optional findById(Integer id); - public Movie save(Movie movie); - public void deleteById(Integer id); + List listAll(); + List listAllByType(Character type); + List listAllWithoutDirector(); + List searchByTitle(String title); + Movie findById(Integer id); + Movie save(String title, String description, String imageUrl, Date airingDate,Double rating, + Integer directorId,List actorIds,List genreIds); + + Movie edit(Integer movieId,String title, String description, String imageUrl, Date airingDate,Double rating, + Integer directorId,List actorIds, List genreIds); + + List findAllActorsForMovie(Movie movie); + List findAllGenresForMovie(Movie movie); + + void likeMovie(Integer movieId, Integer userId); + void unlikeMovie(Integer movieId,Integer userId); + + List findLikedMoviesByUser(User user); + + void deleteById(Integer id); + + void addGradeMovie(Integer movieId, User user, Grade grade); } Index: src/main/java/com/wediscussmovies/project/service/PersonService.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/PersonService.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/PersonService.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,20 +1,30 @@ package com.wediscussmovies.project.service; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.ajaxmodels.Grade; +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.Person; +import com.wediscussmovies.project.model.User; +import java.sql.Date; import java.util.List; -import java.util.Optional; public interface PersonService { + List findAll(); List findAllDirectors(); List findAllActors(); - Optional findById(Integer person_id); - Optional findActorById(Integer id); - Optional findDirectorById(Integer id); - boolean save(Person person); - List findActorsByNameLike(String name); - List findActorsBySurnameLike(String surname); - List findDirectorsByNameLike(String name); - List findDirectorsBySurnameLike(String surname); + Person findById(Integer person_id); + + Person save(String name, String surname, Character type, + Date birthDate, String image_url, String description, List movieIds); + + Person edit(Integer personId, String name, String surname, Character type, + Date birthDate, String image_url, String description, List movieIds); + + List findPersonsByNameOrSurname(Character type,String searchQuery); + + List findAllMoviesByPerson(Person person); + + void deleteById(Integer id); + void addGradePerson(Integer personId, User user, Grade grade); } Index: src/main/java/com/wediscussmovies/project/service/ReplyService.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/ReplyService.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/ReplyService.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,12 +1,21 @@ package com.wediscussmovies.project.service; +import com.wediscussmovies.project.model.Discussion; import com.wediscussmovies.project.model.Reply; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.model.primarykeys.ReplyPK; -import java.util.Optional; +import java.util.List; public interface ReplyService { - public Reply save(Reply r); - public void delete(Reply r); - Optional findById(Long id); + Reply edit(Integer replyId, Integer discussionId, String text); + void delete(Integer discussionId,Integer replyId); + Reply findById(Integer discussionId, Integer replyId); + void save(Integer discussionId, String text, User user); + void likeReply(Integer replyId,Integer userId); + void unlikeReply(Integer replyId,Integer userId); + List findAllByDiscussion(Discussion discussion); + + } Index: src/main/java/com/wediscussmovies/project/service/UserService.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/UserService.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/UserService.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,11 +1,12 @@ package com.wediscussmovies.project.service; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.User; +import org.springframework.security.core.userdetails.UserDetailsService; import javax.servlet.http.HttpServletRequest; import java.util.Optional; -public interface UserService { - public Optional login(String email, String password); - public Optional register(HttpServletRequest request, String email, String password, String confirmPassword, String username, String name, String surname); +public interface UserService extends UserDetailsService { + User findByUsername(String username); + User register(String email, String username, String password, String confirmPassword, String name, String surname); } Index: src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,38 +1,145 @@ package com.wediscussmovies.project.service.impl; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.exception.DiscussionNotExistException; +import com.wediscussmovies.project.model.exception.MovieIdNotFoundException; +import com.wediscussmovies.project.model.exception.PersonNotExistException; +import com.wediscussmovies.project.model.exception.UserNotExistException; import com.wediscussmovies.project.repository.DiscussionRepository; +import com.wediscussmovies.project.model.Discussion; +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.Person; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.repository.MovieRepository; +import com.wediscussmovies.project.repository.PersonRepository; +import com.wediscussmovies.project.repository.UserRepository; import com.wediscussmovies.project.service.DiscussionService; +import com.wediscussmovies.project.service.MovieService; +import com.wediscussmovies.project.service.PersonService; +import com.wediscussmovies.project.service.UserService; import org.springframework.stereotype.Service; +import java.sql.Date; +import java.time.LocalDate; import java.util.List; -import java.util.Optional; @Service public class DiscussionServiceImpl implements DiscussionService { + private final DiscussionRepository discussionRepository; + private final UserRepository userRepository; - public DiscussionServiceImpl(DiscussionRepository discussionRepository) { + private final MovieRepository movieRepository; + private final PersonRepository personRepository; + + public DiscussionServiceImpl(DiscussionRepository discussionRepository, UserRepository userRepository, + MovieRepository movieRepository, PersonRepository personRepository) { this.discussionRepository = discussionRepository; + this.userRepository = userRepository; + this.movieRepository = movieRepository; + this.personRepository = personRepository; + } + + + + + @Override + public List listAll() { + return this.discussionRepository.findAll(); } @Override - public List listAll() { - return discussionRepository.findAll(); - } + public void save(Character type,Integer id,String title, String text,User user) { + Date date = Date.valueOf(LocalDate.now()); + Discussion discussion; - @Override - public void save(Discussion discussion) { + if (type.equals('M')) { + discussion = new Discussion('M',text,title,date,user); + this.addMovieForDiscussion(id,discussion); + } + else{ + discussion = new Discussion('P',text,title,date,user); + this.addPersonForDiscussion(id,discussion); + } + + + discussionRepository.save(discussion); } @Override - public Optional findById(Integer id) { - return discussionRepository.findById(id); + public void edit(Integer discussionId, Character type, Integer id, String title, String text) { + Discussion discussion = this.findById(discussionId); + + discussion.setText(text); + discussion.setTitle(title); + discussion.setType(type); + discussion.setMovie(null); + discussion.setPerson(null); + + if (type.equals('M')) { + this.addMovieForDiscussion(id,discussion); + } + else{ + this.addPersonForDiscussion(id,discussion); + } + this.discussionRepository.save(discussion); + + } + + @Override + public void deleteById(Integer discussionId) { + this.discussionRepository.deleteById(discussionId); + } + + @Override + public void likeDiscussion(Integer discussionId, Integer userId) { + //ova fali od dijagram + } + + @Override + public void unlikeDiscussion(Integer discussionId, Integer userId) { + // ova fali od dijagram + } + + @Override + public List findAllForPersonOrMovie(Integer id,Character type) { + if (type.equals('M')) + { + Movie movie = this.findMovieById(id); + return this.discussionRepository.findAllByMovie(movie); + } + Person person = this.findPersonById(id); + return this.discussionRepository.findAllByPerson(person); + + } + + @Override + public Discussion findById(Integer id) { + return discussionRepository.findById(id).orElseThrow(() -> new DiscussionNotExistException(id)); } @Override public List listAllByTitle(String title) { + if(title == null || title.isEmpty()) + return this.listAll(); return discussionRepository.findAllByTitleLike("%"+title+"%"); } + private void addMovieForDiscussion(Integer id,Discussion discussion){ + Movie movie = findMovieById(id); + discussion.setMovie(movie); + + } + + private void addPersonForDiscussion(Integer id, Discussion discussion){ + Person person = findPersonById(id); + discussion.setPerson(person); + + } + private Movie findMovieById(Integer id){ + return this.movieRepository.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id)); + } + private Person findPersonById(Integer id){ + return this.personRepository.findById(id).orElseThrow(() -> new PersonNotExistException(id)); + + } } Index: src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,11 +1,12 @@ package com.wediscussmovies.project.service.impl; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.exception.GenreNotExistException; +import com.wediscussmovies.project.querymodels.GenreLikes; import com.wediscussmovies.project.repository.GenreRepository; +import com.wediscussmovies.project.model.Genre; import com.wediscussmovies.project.service.GenreService; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Optional; @Service @@ -18,11 +19,11 @@ @Override - public Optional findById(Integer id) { - return genreRepository.findById(id); + public Genre findById(Integer id) { + return this.genreRepository.findById(id).orElseThrow(() -> new GenreNotExistException(id)); } @Override public List findAllByType(String genre) { - return genreRepository.findAllByGenreType(genre); + return this.genreRepository.findAllByGenreType(genre); } @@ -30,10 +31,15 @@ public Genre save(String genreName) { Genre genre = new Genre(genreName); - return genreRepository.save(genre); + return this.genreRepository.save(genre); + } + + @Override + public List findAllWithLikes() { + return this.genreRepository.findAllWithLikes(); } @Override public List findAll() { - return genreRepository.findAll(); + return this.genreRepository.findAll(); } } Index: src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,43 +1,211 @@ package com.wediscussmovies.project.service.impl; + +import com.wediscussmovies.project.ajaxmodels.Grade; import com.wediscussmovies.project.model.*; -import com.wediscussmovies.project.repository.MovieRepository; +import com.wediscussmovies.project.model.exception.GenreNotExistException; +import com.wediscussmovies.project.model.exception.PersonNotExistException; +import com.wediscussmovies.project.model.exception.UserNotExistException; +import com.wediscussmovies.project.model.primarykeys.MovieLikesPK; +import com.wediscussmovies.project.model.primarykeys.MovieRatesPK; +import com.wediscussmovies.project.model.relation.MovieActors; +import com.wediscussmovies.project.model.relation.MovieGenres; +import com.wediscussmovies.project.model.relation.MovieLikes; +import com.wediscussmovies.project.model.relation.MovieRates; +import com.wediscussmovies.project.repository.*; +import com.wediscussmovies.project.model.exception.MovieIdNotFoundException; import com.wediscussmovies.project.service.MovieService; import org.springframework.stereotype.Service; +import javax.swing.text.html.Option; +import javax.transaction.Transactional; +import java.sql.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; @Service public class MovieServiceImpl implements MovieService { + private final MovieRepository movieRepository; - - public MovieServiceImpl(MovieRepository movieRepository) { + private final PersonRepository personRepository; + private final GenreRepository genreRepository; + private final MovieActorsRepository movieActorsRepository; + private final MovieGenresRepository movieGenresRepository; + private final UserRepository userRepository; + private final MovieLikesRepository movieLikesRepository; + private final MovieRatesRepository movieRatesRepository; + + public MovieServiceImpl(MovieRepository movieRepository, PersonRepository personRepository, + GenreRepository genreRepository, MovieActorsRepository movieActorsRepository, + MovieGenresRepository movieGenresRepository, + UserRepository userRepository, MovieLikesRepository movieLikesRepository, + MovieRatesRepository movieRatesRepository) { + this.movieRepository = movieRepository; + this.personRepository = personRepository; + this.genreRepository = genreRepository; + this.movieActorsRepository = movieActorsRepository; + this.movieGenresRepository = movieGenresRepository; + this.userRepository = userRepository; + this.movieLikesRepository = movieLikesRepository; + this.movieRatesRepository = movieRatesRepository; } @Override public List listAll() { - return movieRepository.findAll(); - } - - @Override - public Optional findById(Integer id) { - return movieRepository.findById(1); - } - - @Override - public Movie save(Movie movie) { - return movieRepository.save(movie); - } + return this.movieRepository.findAll(); + } + + @Override + public List listAllByType(Character type) { + if (type.equals('A')) + return this.listAll(); + return this.listAllWithoutDirector(); + } + + @Override + public List listAllWithoutDirector() { + return this.movieRepository.findAllByDirectorIsNull(); + } + + @Override + public Movie findById(Integer id) { + return this.movieRepository.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id)); + } + + @Override + @Transactional + public Movie save(String title, String description, String imageUrl, + Date airingDate, Double rating, Integer directorId,List actorIds,List genreIds) { + + + Person director =getDirector(directorId); + Movie movie = new Movie(title,description,imageUrl,airingDate,rating,director); + movie = this.movieRepository.saveAndFlush(movie); + addActorsAndGenresForMovie(movie,actorIds,genreIds); + return movie; + } + + + @Transactional + @Override + public Movie edit(Integer movieId, String title, String description, + String imageUrl, Date airingDate, Double rating, + Integer directorId, List actorIds,List genreIds) { + + + Person director =getDirector(directorId); + Movie movie = this.findById(movieId); + + movie.setTitle(title); + movie.setDescription(description); + movie.setImageUrl(imageUrl); + movie.setAiringDate(airingDate); + movie.setImdbRating(rating); + movie.setDirector(director); + + this.movieActorsRepository.deleteAllByMovie(movie); + this.movieGenresRepository.deleteAllByMovie(movie); + + movie = this.movieRepository.save(movie); + this.addActorsAndGenresForMovie(movie,actorIds,genreIds); + + return movie; + } + + @Override + public List findAllActorsForMovie(Movie movie) { + return this.movieActorsRepository.findAllByMovie(movie) + .stream() + .map(MovieActors::getPerson) + .collect(Collectors.toList()); + } + + @Override + public List findAllGenresForMovie(Movie movie) { + return this.movieGenresRepository.findAllByMovie(movie) + .stream() + .map(MovieGenres::getGenre) + .collect(Collectors.toList()); + } + + @Override + public void likeMovie(Integer movieId, Integer userId) { + User user = this.userRepository.findById(userId).orElseThrow(() -> new UserNotExistException(userId.toString())); + Movie movie = this.findById(movieId); + + this.movieLikesRepository.save(new MovieLikes(movie, user)); + } + + @Override + public void unlikeMovie(Integer movieId, Integer userId) { + MovieLikesPK movieLikesPK = new MovieLikesPK(movieId,userId); + this.movieLikesRepository.deleteById(movieLikesPK); + } + + @Override + public List findLikedMoviesByUser(User user) { + return + this.movieLikesRepository + .findAllByUser(user) + .stream() + .map(MovieLikes::getMovie) + .collect(Collectors.toList()); + } + @Override public void deleteById(Integer id) { - movieRepository.deleteById(id); + this.movieRepository.deleteById(id); + } + + @Override + public void addGradeMovie(Integer movieId, User user, Grade grade) { + MovieRatesPK key = new MovieRatesPK(movieId, user.getUserId()); + Optional movieRates = this.movieRatesRepository.findById(key); + if (movieRates.isPresent()){ + MovieRates rates = movieRates.get(); + rates.setReason(grade.getReason()); + rates.setStarsRated(grade.getRating()); + this.movieRatesRepository.save(rates); + } + else{ + Movie movie = this.findById(movieId); + MovieRates rates = new MovieRates(user,movie,grade.getReason(),grade.getRating()); + this.movieRatesRepository.save(rates); + } } @Override public List searchByTitle(String title) { - return movieRepository.findAllByTitleLike("%"+title+"%"); + return this.movieRepository.findAllByTitleLike("%"+title+"%"); + } + + @Transactional + void addActorsAndGenresForMovie(Movie movie, List actorIds, List genreIds) + { + + actorIds.stream() + .map(this::findPersonById) + .forEach(actor -> this.movieActorsRepository.save(new MovieActors(movie,actor))); + + genreIds.stream() + .map(this::findGenreById) + .forEach(genre -> this.movieGenresRepository.save(new MovieGenres(movie,genre))); + + } + private Person getDirector(Integer directorId){ + + if (directorId != null) + return this.findPersonById(directorId); + return null; + + } + private Person findPersonById(Integer id){ + return this.personRepository.findById(id).orElseThrow(() -> new PersonNotExistException(id)); + } + private Genre findGenreById(Integer id){ + return this.genreRepository.findById(id).orElseThrow(() -> new GenreNotExistException(id)); } } Index: src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,73 +1,187 @@ package com.wediscussmovies.project.service.impl; -import com.wediscussmovies.project.model.*; -import com.wediscussmovies.project.model.enumerations.PersonType; +import com.wediscussmovies.project.ajaxmodels.Grade; +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.model.exception.MovieHasAlreadyDirector; +import com.wediscussmovies.project.model.exception.MovieIdNotFoundException; +import com.wediscussmovies.project.model.exception.PersonNotExistException; +import com.wediscussmovies.project.model.primarykeys.PersonRatesPK; +import com.wediscussmovies.project.model.relation.MovieActors; +import com.wediscussmovies.project.model.relation.MovieRates; +import com.wediscussmovies.project.model.relation.PersonRates; +import com.wediscussmovies.project.repository.MovieActorsRepository; +import com.wediscussmovies.project.repository.MovieRepository; +import com.wediscussmovies.project.repository.PersonRatesRepository; import com.wediscussmovies.project.repository.PersonRepository; +import com.wediscussmovies.project.model.Person; import com.wediscussmovies.project.service.PersonService; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; +import java.sql.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; @Service public class PersonServiceImpl implements PersonService { + private final PersonRepository personRepository; + private final MovieRepository movieRepository; + private final MovieActorsRepository movieActorsRepository; + private final PersonRatesRepository personRatesRepository; - public PersonServiceImpl(PersonRepository personRepository) { + public PersonServiceImpl(PersonRepository personRepository, + MovieRepository movieRepository, MovieActorsRepository movieActorsRepository, + PersonRatesRepository personRatesRepository) { this.personRepository = personRepository; + this.movieRepository = movieRepository; + this.movieActorsRepository = movieActorsRepository; + this.personRatesRepository = personRatesRepository; + } + + @Override + public List findAll() { + return this.personRepository.findAll(); } @Override public List findAllDirectors() { - return personRepository.findAllByType('D'); + return this.personRepository.findAllByType('D'); } @Override - public Optional findActorById(Integer id) { - return personRepository.findPersonByPersonIdAndType(id, 'A'); + public Person findById(Integer id) { + return this.personRepository.findById(id).orElseThrow(() -> new PersonNotExistException(id)); + } + + + + @Override + public List findAllActors() { + return this.personRepository.findAllByType('A'); } @Override - public Optional findById(Integer person_id) { - return personRepository.findById(person_id); + @Transactional + public Person save(String name, String surname, Character type, Date birthDate, String image_url, + String description,List movieIds) { + + Person person = this.personRepository.saveAndFlush(new Person(name,surname,type,birthDate,image_url,description)); + + if (movieIds!= null) { + if (type.equals('A')) + this.addActorForMovies(person, movieIds); + else + this.addDirectorForMovies(person, movieIds); + } + return person; + } @Override - public Optional findDirectorById(Integer id) { - return personRepository.findPersonByPersonIdAndType(id, 'D'); + @Transactional + public Person edit(Integer personId, String name, String surname, + Character type, Date birthDate, String image_url, String description, List movieIds) { + Person person = this.findById(personId); + + person.setName(name); + person.setSurname(surname); + person.setDateOfBirth(birthDate); + person.setImageUrl(image_url); + person.setType(type); + person.setDescription(description); + + + person = this.personRepository.saveAndFlush(person); + + this.movieActorsRepository.deleteAllByPerson(person); + this.removeMovieDirectorsBeforeEdit(person); + if (movieIds != null) { + if (type.equals('A')) + this.addActorForMovies(person, movieIds); + else + this.addDirectorForMovies(person, movieIds); + } + + return person; + } @Override - public List findAllActors() { - return personRepository.findAllByType('A'); + public List findPersonsByNameOrSurname(Character type,String searchQuery) { + if (searchQuery != null && searchQuery.isEmpty()) + return this.personRepository.findAllByTypeAndNameLikeOrSurnameLike(type,searchQuery,searchQuery); + if (type.equals('D')) + return this.findAllDirectors(); + return this.findAllActors(); + } @Override - public boolean save(Person person) { - Person p = personRepository.save(person); - if(p != null) - return true; - return false; + public List findAllMoviesByPerson(Person person) { + if (person.getType().equals('A')) + return this.movieActorsRepository + .findAllByPerson(person) + .stream() + .map(MovieActors::getMovie) + .collect(Collectors.toList()); + return this.movieRepository.findAllByDirector(person); } @Override - public List findActorsByNameLike(String name) { - return personRepository.findAllByTypeAndNameLike('A', name); + public void deleteById(Integer id) { + this.personRepository.deleteById(id); } @Override - public List findActorsBySurnameLike(String surname) { - return personRepository.findAllByTypeAndSurnameLike('A', surname); + public void addGradePerson(Integer personId, User user, Grade grade) { + PersonRatesPK key = new PersonRatesPK(personId, user.getUserId()); + Optional personRates = this.personRatesRepository.findById(key); + if (personRates.isPresent()){ + PersonRates rates = personRates.get(); + rates.setReason(grade.getReason()); + rates.setStarsRated(grade.getRating()); + this.personRatesRepository.save(rates); + } + else{ + Person person = this.findById(personId); + PersonRates rates = new PersonRates(user,person,grade.getReason(),grade.getRating()); + this.personRatesRepository.save(rates); + } + } - @Override - public List findDirectorsByNameLike(String name) { - return personRepository.findAllByTypeAndNameLike('D', name); + + private void addActorForMovies(Person person, List movieIds){ + + movieIds.stream() + .map(this::findMovieById) + .forEach(m -> this.movieActorsRepository.save(new MovieActors(m,person))); + + } + private void addDirectorForMovies(Person person, List movieIds){ + movieIds.stream() + .map(this::findMovieById) + .forEach(m -> this.addMovieDirector(m,person)); + } + private void addMovieDirector(Movie movie,Person person){ + Person director = movie.getDirector(); + if (director != null) + throw new MovieHasAlreadyDirector(movie.getTitle(),director.getName(),director.getSurname()); + movie.setDirector(person); + this.movieRepository.save(movie); + } + private void removeMovieDirectorsBeforeEdit(Person person){ + this.movieRepository.findAllByDirector(person) + .forEach(m ->{ m.setDirector(null); this.movieRepository.save(m); }); + } - @Override - public List findDirectorsBySurnameLike(String surname) { - return personRepository.findAllByTypeAndSurnameLike('D', surname); + private Movie findMovieById(Integer id){ + return this.movieRepository.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id)); } + } Index: src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,32 +1,78 @@ package com.wediscussmovies.project.service.impl; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.model.Discussion; +import com.wediscussmovies.project.model.exception.DiscussionNotExistException; +import com.wediscussmovies.project.model.exception.ReplyNotExistException; +import com.wediscussmovies.project.model.primarykeys.ReplyPK; +import com.wediscussmovies.project.repository.DiscussionRepository; import com.wediscussmovies.project.repository.ReplyRepository; +import com.wediscussmovies.project.model.Reply; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.repository.UserRepository; import com.wediscussmovies.project.service.ReplyService; import org.springframework.stereotype.Service; -import java.util.Optional; +import java.sql.Date; +import java.time.LocalDate; +import java.util.List; @Service public class ReplyServiceImpl implements ReplyService { + private final ReplyRepository replyRepository; + private final DiscussionRepository discussionRepository; - public ReplyServiceImpl(ReplyRepository replyRepository) { + public ReplyServiceImpl(ReplyRepository replyRepository, + DiscussionRepository discussionRepository) { this.replyRepository = replyRepository; + this.discussionRepository = discussionRepository; + } + + + + @Override + public void save(Integer discussionId, String text,User user) { + + Discussion discussion = this.discussionRepository.findById(discussionId).orElseThrow(() -> new DiscussionNotExistException(discussionId)); + + Date date = Date.valueOf(LocalDate.now()); + this.replyRepository.insertInto(text,date,user.getUserId(),discussionId); + } @Override - public Optional findById(Long id) { - return replyRepository.findById(1); + public void likeReply(Integer replyId, Integer userId) { + //da se implementira, promena vo baza } @Override - public void delete(Reply r) { - replyRepository.delete(r); + public void unlikeReply(Integer replyId, Integer userId) { + // da se implementira, promena vo baza } @Override - public Reply save(Reply r) { - return replyRepository.save(r); + public List findAllByDiscussion(Discussion discussion) { + return this.replyRepository.findAllByDiscussion(discussion); + } + + + @Override + public Reply edit(Integer replyId,Integer discussionId,String text) { + ReplyPK replyPK = new ReplyPK(discussionId,replyId); + Reply reply = this.replyRepository.findById(replyPK).orElseThrow(); + reply.setText(text); + return this.replyRepository.save(reply); + } + + @Override + public void delete(Integer discussionId, Integer replyId) { + this.replyRepository.deleteById(new ReplyPK(discussionId,replyId)); + } + + @Override + public Reply findById(Integer discussionId, Integer replyId) { + ReplyPK replyPK = new ReplyPK(discussionId,replyId); + return this.replyRepository.findById(replyPK).orElseThrow(() -> new ReplyNotExistException(replyPK)); + } } Index: src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java =================================================================== --- src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,58 +1,53 @@ package com.wediscussmovies.project.service.impl; -import com.wediscussmovies.project.model.*; -import com.wediscussmovies.project.model.exception.PasswordsDontMatchException; -import com.wediscussmovies.project.model.exception.UserWithEmailAlreadyExists; -import com.wediscussmovies.project.model.exception.UserWithUsernameAlreadyExists; +import com.wediscussmovies.project.model.exception.InvalidArgumentsException; +import com.wediscussmovies.project.model.exception.PasswordsDoNotMatchException; +import com.wediscussmovies.project.model.exception.UserNotExistException; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.model.exception.UsernameAlreadyExistsException; import com.wediscussmovies.project.repository.UserRepository; import com.wediscussmovies.project.service.UserService; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import java.util.Optional; @Service public class UserServiceImpl implements UserService { + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; - public UserServiceImpl(UserRepository userRepository) { + + public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder) { this.userRepository = userRepository; + this.passwordEncoder = passwordEncoder; } @Override - public Optional login(String email, String password) { - Optional userEmail = userRepository.findByEmailAndPassword(email, password); - Optional userUsername = userRepository.findByUsernameAndPassword(email, password); - if(userEmail.isPresent()) - return userEmail; - else if(userUsername.isPresent()) - return userUsername; - else - return Optional.empty(); + public User findByUsername(String username) { + return this.userRepository.findByUsername(username).orElseThrow(() -> new UserNotExistException(username)); + } + + + + @Override + public User register( String email, String username, String password, String confirmPassword + , String name, String surname) { + + if ( username.isEmpty() || password.isEmpty()) + throw new InvalidArgumentsException(); + if (!password.equals(confirmPassword)) + throw new PasswordsDoNotMatchException(); + if(this.userRepository.findByUsername(username).isPresent()) + throw new UsernameAlreadyExistsException(username); + User user = new User(email,username,passwordEncoder.encode(password),name,surname); + return userRepository.save(user); + } @Override - public Optional register(HttpServletRequest request, String email, String password, String confirmPassword, - String username, String name, String surname) { - if(email == null || email.isEmpty() || password == null || password.isEmpty() || - confirmPassword == null || confirmPassword.isEmpty() || username == null || username.isEmpty() || - name == null || name.isEmpty() || surname == null || surname.isEmpty()) { - request.getSession().setAttribute("error", "Not all of the fields had a value in them, check again."); - return Optional.empty(); - } - if(userRepository.findByUsername(username).isPresent()){ - request.getSession().setAttribute("error", new UserWithUsernameAlreadyExists(username).getMessage()); - return Optional.empty(); - } - if(userRepository.findByEmail(email).isPresent()){ - request.getSession().setAttribute("error", new UserWithEmailAlreadyExists(email).getMessage()); - return Optional.empty(); - } - if(!password.equals(confirmPassword)){ - request.getSession().setAttribute("error", new PasswordsDontMatchException().getMessage()); - return Optional.empty(); - } - User user = new User(email, username, password, name, surname); - return Optional.of(userRepository.save(user)); + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + return this.findByUsername(username); } } Index: src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) +++ src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -0,0 +1,175 @@ +package com.wediscussmovies.project.web.controller; + +import com.wediscussmovies.project.LoggedUser; +import com.wediscussmovies.project.model.Discussion; +import com.wediscussmovies.project.model.Reply; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.service.DiscussionService; +import com.wediscussmovies.project.service.MovieService; +import com.wediscussmovies.project.service.PersonService; +import com.wediscussmovies.project.service.ReplyService; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Controller +@RequestMapping("/discussions") +public class DiscussionController { + + private final DiscussionService discussionService; + private final ReplyService replyService; + private final MovieService movieService; + private final PersonService personService; + + public DiscussionController(DiscussionService discussionService, ReplyService replyService, MovieService movieService, PersonService personService) { + this.discussionService = discussionService; + this.replyService = replyService; + this.movieService = movieService; + this.personService = personService; + } + + @GetMapping() + public String getDiscussions(@RequestParam(required = false) String titleSearch, + Model model){ + /* 1.Validacija i na frontend so, da ne se isprakja baranjeto, ako titleSearch e null ili empty + da ne se preoptovaruva serverot so baranja za titleSearch koga e null! + + */ + List discussions = discussionService.listAllByTitle(titleSearch); + model.addAttribute("discussions", discussions); + model.addAttribute("contentTemplate", "discussionsList"); + model.addAttribute("user",LoggedUser.getLoggedUser()); + return "template"; + } + + @GetMapping("/{id}") + public String getDiscussion( + @PathVariable Integer id, + Model model){ + /* + 2. Moze da se vrati indikator deka takva diskusija ne postoi! - postaveno + */ + try { + Discussion disc = discussionService.findById(id); + model.addAttribute("disc", disc); + model.addAttribute("contentTemplate", "discussion"); + model.addAttribute("user",LoggedUser.getLoggedUser()); + model.addAttribute("replies",this.replyService.findAllByDiscussion(disc)); + + return "template"; + } + catch (RuntimeException exception){ + return "redirect:/discussions?error="+exception.getMessage(); + + } + } + @GetMapping("/all/{id}") + public String getDiscussionForId(@PathVariable Integer id,@RequestParam Character type, Model model){ + + model.addAttribute("discussions", this.discussionService.findAllForPersonOrMovie(id,type)); + model.addAttribute("contentTemplate", "discussionForType"); + return "template"; + + } + + @GetMapping("/{id}/replies") + public String getRepliesToDiscussion( + @PathVariable Integer id, + Model model){ + + try { + Discussion discussion = discussionService.findById(id); + model.addAttribute("discussion", discussion); + model.addAttribute("contentTemplate", "discussionReply"); + return "template"; + } + catch (RuntimeException exception){ + return "redirect:/discussions?error="+exception.getMessage(); + + } + + } + + + @GetMapping("/add/{id}") + public String getFormForEdit(Model model, + @PathVariable Integer id) + { + Discussion discussion = this.discussionService.findById(id); + setModelPropertiesForForm(model); + model.addAttribute("discussion", discussion); + + return "template"; + } + @GetMapping("/add") + public String getFormForAdd(Model model) + { + setModelPropertiesForForm(model); + + return "template"; + } + + + @PostMapping("/save") + public String saveDiscussion( + @RequestParam Integer idDiscussed, + @RequestParam String title, + @RequestParam String text, + @RequestParam Character type ){ + + + + try{ + + discussionService.save(type,idDiscussed, title, text, LoggedUser.getLoggedUser()); + return "redirect:/discussions"; + + } + + catch (RuntimeException exc){ + return "redirect:/discussions?error="+exc.getMessage(); + + } + } + + @PostMapping("/save/{discussionId}/") + public String editDiscussion( + @PathVariable Integer discussionId, + @RequestParam String title, + @RequestParam String text, + @RequestParam Character type, + @RequestParam Integer idDiscussed + ){ + + + + + try{ + + + discussionService.edit(discussionId,type,idDiscussed, title, text); + return "redirect:/discussions"; + + } + + catch (RuntimeException exc){ + return "redirect:/discussions?error="+exc.getMessage(); + + } + } + + private void setModelPropertiesForForm(Model model){ + model.addAttribute("movies",this.movieService.listAll()); + model.addAttribute("persons",this.personService.findAll()); + model.addAttribute("contentTemplate", "discussionsAdd"); + + } + + +} Index: c/main/java/com/wediscussmovies/project/web/controller/DiscussionsController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/DiscussionsController.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ (revision ) @@ -1,145 +1,0 @@ -package com.wediscussmovies.project.web.controller; - -import com.wediscussmovies.project.model.*; - -import com.wediscussmovies.project.service.DiscussionService; -import com.wediscussmovies.project.service.MovieService; -import com.wediscussmovies.project.service.PersonService; -import com.wediscussmovies.project.service.ReplyService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.sql.Date; -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; - -@Controller -@RequestMapping("/discussions") -public class DiscussionsController { - private final DiscussionService discussionService; - private final ReplyService replyService; - private final MovieService movieService; - private final PersonService personService; - public DiscussionsController(DiscussionService discussionService, ReplyService replyService, MovieService movieService, PersonService personService) { - this.discussionService = discussionService; - this.replyService = replyService; - this.movieService = movieService; - this.personService = personService; - } - - @GetMapping("/") - public String getDiscussions(@RequestParam(required = false) String titleSearch, - Model model){ - List discussions = discussionService.listAll(); - if(titleSearch != null && !titleSearch.isEmpty()){ - discussions = discussionService.listAllByTitle(titleSearch); - } - model.addAttribute("discussions", discussions); - model.addAttribute("contentTemplate", "discussionsList"); - return "template"; - } - - @GetMapping("/{id}") - public String getDiscussion( - @PathVariable Integer id, - Model model){ - Optional discussion = discussionService.findById(id); - if(discussion.isEmpty()) - return "redirect:/discussions"; - model.addAttribute("discussion", discussion); - model.addAttribute("contentTemplate", "discussionsDiscussion"); - return "template"; - } - - @GetMapping("/{id}/reply") - public String getReplyToDiscussion( - @PathVariable Integer id, - Model model){ - Optional discussion = discussionService.findById(id); - if(discussion.isEmpty()) - return "redirect:/discussions"; - model.addAttribute("discussion", discussion); - model.addAttribute("contentTemplate", "discussionsReply"); - return "template"; - } - @PostMapping("/{id}/reply/confirm") - public String getReplyToDiscussionConfirm( - @PathVariable Integer id, - @RequestParam String text, - HttpServletRequest request){ - Optional discussion = discussionService.findById(id); - User user = (User) request.getSession().getAttribute("user"); - if(user == null){ - return "redirect:/login"; - } - Date date = Date.valueOf(LocalDate.now()); - if(discussion.isEmpty()) - return "redirect:/discussions"; - //Reply reply = new Reply(discussion.get(), user, date, text); - // replyService.save(reply); - return "redirect:/discussions/"+id; - } - - @GetMapping("/movies/add/{id}") - public String getAddDiscussionForMovie(Model model, - @PathVariable Integer id, - HttpServletRequest request){ - model.addAttribute("contentTemplate", "discussionsAdd"); - request.setAttribute("movieId", id); - return "template"; - } - - @PostMapping("/movies/add/confirm") - public String getAddDiscussionMovieConfirm(Model model, - HttpServletRequest request, - @RequestParam String title, - @RequestParam String text){ - User user = (User) request.getSession().getAttribute("user"); - if(user == null){ - return "redirect:/login"; - } - Integer movie_id = (Integer) request.getSession().getAttribute("movieId"); - request.getSession().setAttribute("movieId", null); - Optional movieOp = movieService.findById(movie_id); - if(movieOp.isEmpty()) - return "redirect:/movies"; - // Discussion discussion = new Discussion('M',text, title, Date.valueOf(LocalDate.now()),user,movieOp.get(),null); - // discussionService.save(discussion); - return "redirect:/discussions"; - } - - - @GetMapping("/persons/add/{id}") - public String getAddDiscussionForPerson(Model model, - @PathVariable Integer id, - HttpServletRequest request){ - model.addAttribute("contentTemplate", "discussionsAdd"); - request.setAttribute("personId", id); - return "template"; - } - - @PostMapping("/persons/add/confirm") - public String getAddDiscussionForPersonConfirm(Model model, - HttpServletRequest request, - @RequestParam String title, - @RequestParam String text){ - User user = (User) request.getSession().getAttribute("user"); - if(user == null){ - return "redirect:/login"; - } - Integer person_id = (Integer) request.getSession().getAttribute("personId"); - Optional personOp = personService.findById(person_id); - request.getSession().setAttribute("personId", null); - if(personOp.isEmpty()) - return "redirect:/discussions"; - - // Discussion discussion = new Discussion('P',title, text,Date.valueOf(LocalDate.now()),user,null,personOp.get()); - // discussionService.save(discussion); - return "redirect:/discussions"; - } - - -} Index: src/main/java/com/wediscussmovies/project/web/controller/MovieController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/MovieController.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/web/controller/MovieController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,10 +1,16 @@ package com.wediscussmovies.project.web.controller; -import com.wediscussmovies.project.exception.MovieIdNotFoundException; -import com.wediscussmovies.project.model.*; - +import com.wediscussmovies.project.model.Movie; +import com.wediscussmovies.project.model.Person; +import com.wediscussmovies.project.model.User; import com.wediscussmovies.project.service.GenreService; import com.wediscussmovies.project.service.MovieService; import com.wediscussmovies.project.service.PersonService; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -12,7 +18,6 @@ import java.sql.Date; -import java.util.LinkedList; +import java.time.LocalDate; import java.util.List; -import java.util.Optional; @Controller @@ -30,5 +35,6 @@ @GetMapping - public String getMovies(@RequestParam(required = false) String titleQuery, Model model){ + public String getMovies(@RequestParam(required = false) String titleQuery, Model model, + @RequestParam(required = false) String error){ List movies; if(titleQuery == null ) { @@ -39,8 +45,18 @@ } + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + + if (!(auth instanceof AnonymousAuthenticationToken)){ + UserDetails userDetails = (UserDetails) auth.getPrincipal(); + User user = (User) userDetails; + model.addAttribute("likedMovies",this.movieService.findLikedMoviesByUser(user)); + model.addAttribute("user",user); + } model.addAttribute("movies", movies); model.addAttribute("contentTemplate", "moviesList"); - return "list"; + if (error != null && !error.equals(" ")) + model.addAttribute("error",error); + return "template"; } @@ -48,7 +64,6 @@ @GetMapping("/add") public String addMovie(Model model){ - model.addAttribute("directors", personService.findAllDirectors()); - model.addAttribute("actors", personService.findAllActors()); - model.addAttribute("genres", genreService.findAll()); + + addModelProperties(model); model.addAttribute("contentTemplate", "moviesAdd"); return "template"; @@ -56,167 +71,91 @@ - @PostMapping("/{id}/delete") - public String addMovie(@PathVariable Integer id){ - Optional movie = movieService.findById(id); - if(movie.isPresent()){ - movieService.deleteById(movie.get().getMovieId()); - } - return "redirect:/movies"; + @GetMapping("/{id}/delete") + public String deleteMovie(@PathVariable Integer id){ + + try { + this.movieService.deleteById(id); + return "redirect:/movies"; + + } + catch (RuntimeException exc){ + return "redirect:/movies?error="+exc.getMessage(); + } } - @PostMapping("/add/confirm") - public String addMoviePost(@RequestParam String title, + @PostMapping("/save") + public String saveMovie( + + + + @RequestParam String title, @RequestParam String description, - @RequestParam String image_url, - @RequestParam Date airing_date, - @RequestParam Double rating, - @RequestParam Integer director_id, + @RequestParam String imageUrl, + @RequestParam(required = false) Double rating, + @RequestParam(required = false) Integer directorId, + @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate airingDate, @RequestParam List actors, - @RequestParam List genres, - Model model){ - if(title == null || title.isEmpty() || - description == null || description.isEmpty() || - image_url == null || image_url.isEmpty() || - airing_date == null || - rating == null || - director_id == null || - actors == null || actors.size() == 0 || - genres == null || genres.size() == 0) - { - model.addAttribute("error", "Not enough attributes, make sure all values are inputted, all of them are required"); - model.addAttribute("hasError", true); - return "redirect:/add"; + @RequestParam List genres + ){ + + try { + Movie movie = this.movieService.save(title,description,imageUrl,Date.valueOf(airingDate),rating,directorId,actors,genres); + + return "redirect:/movies"; } - List actorsList = new LinkedList<>(); - for(Integer id: actors){ - Optional person = personService.findActorById(id); - if(person.isEmpty()){ - model.addAttribute("error", "The actor with ID {" + id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/add"; - } - actorsList.add(person.get()); + catch (RuntimeException exc){ + return "redirect:/movies?error="+exc.getMessage(); } + } + @PostMapping("/save/{movieId}") + public String updateMovie( - List genreList = new LinkedList<>(); - for(Integer id: genres){ - Optional genre = genreService.findById(id); - if(genre.isEmpty()){ - model.addAttribute("error", "The genre with ID {" + id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/add"; - } - genreList.add(genre.get()); + + @PathVariable Integer movieId, + @RequestParam String title, + @RequestParam String description, + @RequestParam String imageUrl, + @RequestParam(required = false) Double rating, + @RequestParam(required = false) Integer directorId, + @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate airingDate, + @RequestParam List actors, + @RequestParam List genres + ){ + + try { + Movie movie = this.movieService.edit(movieId,title,description,imageUrl,Date.valueOf(airingDate),rating,directorId,actors,genres); + + return "redirect:/movies"; } - - Optional directorOp = personService.findDirectorById(director_id); - if(directorOp.isEmpty()){ - model.addAttribute("error", "The director with ID {" + director_id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/add"; + catch (RuntimeException exc){ + return "redirect:/movies?error="+exc.getMessage(); } - - Person director = directorOp.get(); - - Movie movie = new Movie(title, description, image_url, airing_date, - rating, director.getPersonId()); - - movieService.save(movie); - - return "redirect:/movies"; } - @PostMapping("/edit/confirm") - public String editMoviePost( - @RequestParam Integer movie_id, - @RequestParam String title, - @RequestParam String description, - @RequestParam String image_url, - @RequestParam Date airing_date, - @RequestParam Double rating, - @RequestParam Integer director_id, - @RequestParam List actors, - @RequestParam List genres, - Model model){ - if( - movie_id == null || - title == null || title.isEmpty() || - description == null || description.isEmpty() || - image_url == null || image_url.isEmpty() || - airing_date == null || - rating == null || - director_id == null || - actors == null || actors.size() == 0 || - genres == null || genres.size() == 0) - { - model.addAttribute("error", "Not enough attributes, make sure all values are inputted, all of them are required"); - model.addAttribute("hasError", true); - return "redirect:/edit"; - } - Optional movieOptional = movieService.findById(movie_id); - if(movieOptional.isEmpty()){ - model.addAttribute("error", "The movie with ID {" + movie_id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/edit"; - } - Movie movie = movieOptional.get(); - - List actorsList = new LinkedList<>(); - for(Integer id: actors){ - Optional person = personService.findActorById(id); - if(person.isEmpty()){ - model.addAttribute("error", "The actor with ID {" + id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/edit"; - } - actorsList.add(person.get()); - } - - List genreList = new LinkedList<>(); - for(Integer id: genres){ - Optional genre = genreService.findById(id); - if(genre.isEmpty()){ - model.addAttribute("error", "The genre with ID {" + id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/edit"; - } - genreList.add(genre.get()); - } - - Optional directorOp = personService.findDirectorById(director_id); - if(directorOp.isEmpty()){ - model.addAttribute("error", "The director with ID {" + director_id + "} was not found."); - model.addAttribute("hasError", true); - return "redirect:/edit"; - } - - Person director = directorOp.get(); - - movieService.deleteById(movie_id); - -// // movie.setActors(actorsList); -// movie.setDirector(director); -// movie.setGenres(genreList); -// movie.setTitle(title); -// movie.setDescription(description); -// movie.setAringDate(airing_date); -// movie.setImageUrl(image_url); -// movie.setImbdRating(rating); - - movieService.save(movie); - - return "redirect:/movies"; - } @GetMapping("/{id}/edit") public String editMovie(@PathVariable Integer id, Model model){ - Movie movie = movieService.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id)); - model.addAttribute("directors", personService.findAllDirectors()); + try { + Movie movie = movieService.findById(id); + addModelProperties(model); + model.addAttribute("movie", movie); + model.addAttribute("director",movie.getDirector()); + model.addAttribute("movieActors",movieService.findAllActorsForMovie(movie)); + model.addAttribute("movieGenres",movieService.findAllGenresForMovie(movie)); + model.addAttribute("contentTemplate", "moviesAdd"); + return "template"; + + } + catch (RuntimeException exc){ + return "redirect:/movies?error="+exc.getMessage(); + } + + } + private void addModelProperties(Model model){ + + model.addAttribute("directors", personService.findAllDirectors()); model.addAttribute("actors", personService.findAllActors()); model.addAttribute("genres", genreService.findAll()); - model.addAttribute("movie", movie); - model.addAttribute("contentTemplate", "moviesEdit"); - return "template"; } } Index: src/main/java/com/wediscussmovies/project/web/controller/PersonController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/PersonController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) +++ src/main/java/com/wediscussmovies/project/web/controller/PersonController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -0,0 +1,128 @@ +package com.wediscussmovies.project.web.controller; + +import com.wediscussmovies.project.model.Person; +import com.wediscussmovies.project.service.MovieService; +import com.wediscussmovies.project.service.PersonService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.sql.Date; +import java.util.List; + +@Controller +public class PersonController { + private final PersonService personService; + private final MovieService movieService; + + public PersonController(PersonService personService, MovieService movieService) { + this.personService = personService; + this.movieService = movieService; + } + + /* + 1. Prebaruvanjeto po ime i prezime posoodvetno e da bide na frontend + Da ne se preoptovaruva server i klient da ceka koga moze vo browser vekje dobieni da se filtrirat + */ + @GetMapping("/actors") + public String getActors(Model model, @RequestParam(required = false) String nameAndSurname){ + List persons = personService.findPersonsByNameOrSurname('A',nameAndSurname); + model.addAttribute("persons", persons); + model.addAttribute("contentTemplate", "personsList"); + + return "template"; + } + /* + 2. Prebaruvanjeto po ime i prezime posoodvetno e da bide na frontend + Da ne se preoptovaruva server i klient da ceka koga moze vo browser vekje dobieni da se filtrirat + */ + @GetMapping("/directors") + public String getDirectors(Model model, @RequestParam(required = false) String nameAndSurname){ + List persons = personService.findPersonsByNameOrSurname('D',nameAndSurname); + model.addAttribute("persons", persons); + model.addAttribute("contentTemplate", "personsList"); + return "template"; + } + + @GetMapping("/persons/add") + public String addingFormForPerson( Model model){ + + addModelPropertiesForForm(model); + return "template"; + } + @GetMapping("persons/edit/{personId}") + public String editPerson(@PathVariable Integer personId, Model model){ + + try { + Person person = this.personService.findById(personId); + addModelPropertiesForForm(model); + model.addAttribute("person",person); + model.addAttribute("movieActors",this.personService.findAllMoviesByPerson(person)); + return "template"; + } + catch (RuntimeException exc){ + return "redirect:/actors?erorr="+exc.getMessage(); + } + } + + @PostMapping("/persons/save") + public String savePerson( + @RequestParam String name, + @RequestParam String surname, + @RequestParam Character type, + @RequestParam Date birthDate, + @RequestParam String imageUrl, + @RequestParam String description, + @RequestParam(required = false) List movieIds){ + + String returnedUrl = getReturnedUrl(type); + + try { + + Person person = this.personService.save(name, surname, type, birthDate, imageUrl, description, movieIds); + return returnedUrl; + } + catch (RuntimeException exc){ + return returnedUrl + "?error" + exc.getMessage(); + } + + } + @PostMapping("/persons/save/{personId}") + public String editPerson( + @PathVariable Integer personId, + @RequestParam String name, + @RequestParam String surname, + @RequestParam Character type, + @RequestParam Date birthDate, + @RequestParam String imageUrl, + @RequestParam String description, + @RequestParam(required = false) List movieIds){ + + String returnedUrl = getReturnedUrl(type); + try { + + Person person = this.personService.edit(personId,name, surname, type, birthDate, imageUrl, description, movieIds); + return returnedUrl; + } + catch (RuntimeException exc){ + return returnedUrl + "?error" + exc.getMessage(); + } + + } + private String getReturnedUrl(Character type){ + if (type.equals('A')) + return "redirect:/actors"; + return "redirect:/directors"; + } + private void addModelPropertiesForForm(Model model){ + model.addAttribute("contentTemplate", "personsAdd"); + model.addAttribute("moviesActors",this.movieService.listAllByType('A')); + model.addAttribute("moviesDirectors",this.movieService.listAllByType('D')); + + } + + +} Index: c/main/java/com/wediscussmovies/project/web/controller/PersonsController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/PersonsController.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ (revision ) @@ -1,118 +1,0 @@ -package com.wediscussmovies.project.web.controller; - -import com.wediscussmovies.project.model.*; -import com.wediscussmovies.project.model.enumerations.PersonType; -import com.wediscussmovies.project.service.PersonService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.sql.Date; -import java.util.List; - -@Controller -public class PersonsController { - private final PersonService personSerivce; - - public PersonsController(PersonService personSerivce) { - this.personSerivce = personSerivce; - } - - @GetMapping("/actors") - public String getActorsPage(Model model, @RequestParam(required = false) String nameAndSurname){ - List actors = personSerivce.findAllActors(); - if(nameAndSurname != null && !nameAndSurname.isEmpty()){ - String [] parts = nameAndSurname.split(" "); - String name = parts[0]; - String surname = ""; - if(parts.length > 1) - surname = parts[1]; - List actorsByName = personSerivce.findActorsByNameLike("%"+name+"%"); - if(!surname.isEmpty()){ - List actorsBySurname = personSerivce.findActorsBySurnameLike("%"+surname+"%"); - for(Person p: actorsBySurname){ - boolean add = true; - for(Person a: actorsByName){ - if(a.getPersonId() == p.getPersonId()){ - add=false; - break; - } - } - if(!add) - continue; - actorsByName.add(p); - } - } - actors = actorsByName; - } - // actors.sort(Person.personComparatorByNameSurname); - model.addAttribute("actors", actors); - model.addAttribute("contentTemplate", "actorsList"); - return "template"; - } - - @GetMapping("/directors") - public String getDirectorsPage(Model model, @RequestParam(required = false) String nameAndSurname){ - List directors = personSerivce.findAllDirectors(); - if(nameAndSurname != null && !nameAndSurname.isEmpty()){ - String [] parts = nameAndSurname.split(" "); - String name = parts[0]; - String surname = ""; - if(parts.length > 1) - surname = parts[1]; - List directorsByName = personSerivce.findDirectorsByNameLike("%"+name+"%"); - if(!surname.isEmpty()){ - List directorsBySurname = personSerivce.findDirectorsBySurnameLike("%"+surname+"%"); - for(Person p: directorsBySurname){ - boolean add = true; - for(Person a: directorsByName){ - if(a.getPersonId() == p.getPersonId()){ - add=false; - break; - } - } - if(!add) - continue; - directorsByName.add(p); - } - } - directors = directorsByName; - } - // directors.sort(Person.personComparatorByNameSurname); - model.addAttribute("directors", directors); - model.addAttribute("contentTemplate", "directorsList"); - return "template"; - } - - @GetMapping("/persons/add") - public String getPersonsAddPage(Model model){ - PersonType [] types = PersonType.values(); - model.addAttribute("types", types); - model.addAttribute("contentTemplate", "personsAdd"); - return "template"; - } - - @PostMapping("/persons/add/confirm") - public String confirmPersonsAdd( - @RequestParam String name, - @RequestParam String surname, - @RequestParam Character type, - @RequestParam Date date_of_birth, - @RequestParam String image_url, - @RequestParam String description){ - Person person = new Person(name, surname, type, date_of_birth, image_url, description); - if(personSerivce.save(person)){ - String toWhere = "actors"; - //if(type == PersonType.D) - toWhere = "directors"; - return "redirect:/"+toWhere; - } - else{ - return "redirect:/persons/add"; - } - } - -} Index: src/main/java/com/wediscussmovies/project/web/controller/ReplyController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/ReplyController.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/web/controller/ReplyController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,16 +1,20 @@ package com.wediscussmovies.project.web.controller; -import com.wediscussmovies.project.model.*; +import com.wediscussmovies.project.LoggedUser; +import com.wediscussmovies.project.model.Reply; +import com.wediscussmovies.project.model.User; +import com.wediscussmovies.project.model.primarykeys.ReplyPK; import com.wediscussmovies.project.service.ReplyService; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; -import java.util.Optional; @Controller +@RequestMapping("/replies") public class ReplyController { private final ReplyService replyService; @@ -20,24 +24,62 @@ } - @GetMapping("/edit/{id}") - public String getReplyEdit(@PathVariable Long id, Model model){ - Optional reply = replyService.findById(id); - if(reply.isEmpty()) - return "redirect:/movies"; - model.addAttribute("reply", reply.get()); - model.addAttribute("templateContext", "replyEdit"); + @GetMapping("/add/{discussionId}") + public String addForm(@PathVariable Integer discussionId, Model model){ + model.addAttribute("discussionId",discussionId); + model.addAttribute("contentTemplate","repliesAdd"); return "template"; } - @PostMapping("/edit/confirm/{id}") - public String getReplyEdit(@PathVariable Long id, @RequestParam String text){ - Optional replyOp = replyService.findById(id); - if(replyOp.isEmpty()) - return "redirect:/discussions"; - Reply reply = replyOp.get(); - replyService.delete(reply); - reply.setText(text); - replyService.save(reply); - return "redirect:/discussions/"+reply.getDiscussionId(); + @GetMapping("/edit/{discussionId}/{replyId}") + public String editForm(@PathVariable Integer discussionId,@PathVariable Integer replyId, Model model){ + + try { + Reply reply = replyService.findById(discussionId,replyId); + model.addAttribute("reply", reply); + model.addAttribute("contentTemplate", "repliesAdd"); + return "template"; + + + }catch (RuntimeException exc){ + return "redirect:/discussions?error="+exc.getMessage(); + + } } + @PostMapping("/save") + public String saveReply( + @RequestParam Integer discussionId, + @RequestParam String text){ + + try { + + this.replyService.save(discussionId,text, LoggedUser.getLoggedUser()); + return "redirect:/discussions/"+discussionId; + + } + catch (RuntimeException exc){ + return "redirect:/discussions?error="+exc.getMessage(); + + } + } + + @PostMapping("/save/{replyId}") + public String editReply( + @PathVariable Integer replyId, + @RequestParam Integer discussionId, + @RequestParam String text){ + + /* + 1. Da se realizira so ajax baranje na restController + */ + try { + Reply reply = replyService.edit(replyId,discussionId, text); + + return "redirect:/discussions/" + reply.getDiscussion().getDiscussionId(); + } + catch (RuntimeException exc){ + return "redirect:/discussions?error="+exc.getMessage(); + } + + } + } Index: src/main/java/com/wediscussmovies/project/web/controller/UsersController.java =================================================================== --- src/main/java/com/wediscussmovies/project/web/controller/UsersController.java (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/java/com/wediscussmovies/project/web/controller/UsersController.java (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,98 +1,68 @@ -//package com.wediscussmovies.project.web.controller; -// -//import com.wediscussmovies.project.model.PasswordEncoder; -//import com.wediscussmovies.project.model.*; -//import com.wediscussmovies.project.model.exception.InvalidUserCredentialsException; -//import com.wediscussmovies.project.service.UserService; -//import org.springframework.stereotype.Controller; -//import org.springframework.ui.Model; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestParam; -// -//import javax.servlet.http.HttpServletRequest; -//import java.security.NoSuchAlgorithmException; -//import java.util.Optional; -// -//@Controller -//public class UsersController{ -// private final UserService userService; -// -// public UsersController(UserService userService) { -// this.userService = userService; -// } -// -// @GetMapping("/login") -// public String getLoginPage(Model model){ -// return "login"; -// } -// -// @PostMapping("/login/confirm") -// public String confirmLogin(HttpServletRequest request, Model model, -// @RequestParam String username, -// @RequestParam String password){ -// Optional user; -// try{ -// password = PasswordEncoder.getEncodedPasswordString(password); -// } -// catch (NoSuchAlgorithmException ex){ -// model.addAttribute("hasError", true); -// model.addAttribute("error", ex.getMessage()); -// return "login"; -// } -// -// try{ -// user = this.userService.login(username, password); -// request.getSession().setAttribute("user", user); -// request.getSession().setAttribute("loggedIn",true); -// return "redirect:/movies"; -// } -// catch (InvalidUserCredentialsException ex){ -// model.addAttribute("hasError", true); -// model.addAttribute("error", ex.getMessage()); -// return "login"; -// } -// } -// -// @GetMapping("/register") -// public String getRegisterPage(){ -// return "register"; -// } -// -// @PostMapping("/login/confirm") -// public String confirmRegister(HttpServletRequest request, -// @RequestParam String username, -// @RequestParam String email, -// @RequestParam String password, -// @RequestParam String confirmPassword, -// @RequestParam String name, -// @RequestParam String surname){ -// Optional user; -// -// try{ -// password = PasswordEncoder.getEncodedPasswordString(password); -// confirmPassword = PasswordEncoder.getEncodedPasswordString(confirmPassword); -// } -// catch (NoSuchAlgorithmException ex){ -// request.getSession().setAttribute("error", "Contact the administrators!"); -// request.getSession().setAttribute("hasError", "true"); -// return "redirect:/movies"; -// } -// -// user = this.userService.register(request, email, password, confirmPassword, username, name, surname); -// if(user.isEmpty()){ -// request.setAttribute("hasError", "true"); -// }else{ -// request.getSession().setAttribute("hasError", "false"); -// request.getSession().setAttribute("user", user.get()); -// request.getSession().setAttribute("loggedIn",true); -// } -// return "redirect:/movies"; -// } -// -// @GetMapping -// public String logout(HttpServletRequest request){ -// request.getSession().invalidate(); -// return "redirect:/login"; -// } -//} +package com.wediscussmovies.project.web.controller; + + +import com.wediscussmovies.project.LoggedUser; +import com.wediscussmovies.project.model.exception.InvalidArgumentsException; +import com.wediscussmovies.project.model.exception.PasswordsDoNotMatchException; +import com.wediscussmovies.project.service.MovieService; +import com.wediscussmovies.project.service.UserService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Controller +@RequestMapping +public class UsersController{ + private final UserService userService; + private final MovieService movieService; + + public UsersController(UserService userService, MovieService movieService) { + this.userService = userService; + this.movieService = movieService; + } + @PostMapping("/register") + public String register(@RequestParam String username, + @RequestParam String password, + @RequestParam String repeatedPassword, + @RequestParam String email, + @RequestParam String name, + @RequestParam String surname) { + try{ + this.userService.register(email,username,password,repeatedPassword,name,surname); + return "redirect:/login"; + } catch (InvalidArgumentsException | PasswordsDoNotMatchException exception) { + return "redirect:/register?error=" + exception.getMessage(); + } + } + @GetMapping("/register") + public String getRegisterPage(@RequestParam(required = false) String error, Model model) { + addModelError(model,error); + model.addAttribute("contentTemplate","register"); + return "template"; + } + @GetMapping("/login") + public String getLoginPage(@RequestParam(required = false) String error,Model model){ + addModelError(model,error); + model.addAttribute("contentTemplate","login"); + return "template"; + } + + private void addModelError(Model model,String error){ + if(error != null && !error.isEmpty()) { + model.addAttribute("hasError", true); + model.addAttribute("error", error); + } + } + @GetMapping("/favoriteList") + public String getFavoriteList(Model model){ + model.addAttribute("movies",this.movieService.findLikedMoviesByUser(LoggedUser.getLoggedUser())); + model.addAttribute("contentTemplate","favoriteList"); + return "template"; + + } + + +} Index: src/main/resources/application-prod.properties =================================================================== --- src/main/resources/application-prod.properties (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/resources/application-prod.properties (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,5 +1,6 @@ -spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_wediscussmovies +spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_wediscussmovies?currentSchema=project spring.datasource.username=db_202122z_va_prj_wediscussmovies_owner spring.datasource.password=7d8fb26b5697 + ## default connection pool @@ -8,4 +9,5 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true + spring.jpa.hibernate.ddl-auto=validate spring.jpa.show-sql=true Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ src/main/resources/application.properties (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -2,2 +2,6 @@ server.port=9090 + +spring.thymeleaf.cache=false + +spring.mvc.hiddenmethod.filter.enabled=true Index: target/classes/application-prod.properties =================================================================== --- target/classes/application-prod.properties (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ target/classes/application-prod.properties (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -1,5 +1,6 @@ -spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_wediscussmovies +spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_wediscussmovies?currentSchema=project spring.datasource.username=db_202122z_va_prj_wediscussmovies_owner spring.datasource.password=7d8fb26b5697 + ## default connection pool @@ -8,4 +9,5 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true + spring.jpa.hibernate.ddl-auto=validate spring.jpa.show-sql=true Index: target/classes/application.properties =================================================================== --- target/classes/application.properties (revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a) +++ target/classes/application.properties (revision e0ef1b13a29101c3f7a56f68da8dcdc8cce98b76) @@ -2,2 +2,6 @@ server.port=9090 + +spring.thymeleaf.cache=false + +spring.mvc.hiddenmethod.filter.enabled=true