From afd8e9f6d7b2c02c5aa7e81f5a0f29cbbc5f768d Mon Sep 17 00:00:00 2001 From: Vladimir Voronin Date: Tue, 7 Jan 2025 12:35:17 +0300 Subject: [PATCH] init --- .gitattributes | 3 + .gitignore | 40 + build.gradle.kts | 75 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++ gradlew.bat | 94 +++ settings.gradle.kts | 1 + .../luminic/budgerapp/BudgerAppApplication.kt | 23 + .../luminic/budgerapp/configs/AsyncConfig.kt | 20 + .../budgerapp/configs/BearerTokenFilter.kt | 60 ++ .../luminic/budgerapp/configs/CorsConfig.kt | 18 + .../budgerapp/configs/JWTAuthFilter.kt | 44 + .../JWTReactiveAuthenticationManager.kt | 33 + .../budgerapp/configs/SecurityConfig.kt | 62 ++ .../budgerapp/controllers/AuthController.kt | 45 + .../budgerapp/controllers/BudgetController.kt | 112 +++ .../controllers/CategoriesController.kt | 64 ++ .../CustomAuthenticationEntryPoint.kt | 34 + .../budgerapp/controllers/ExceptionHandler.kt | 118 +++ .../controllers/GlobalExceptionHandlerV2.kt | 51 ++ .../controllers/RecurrentController.kt | 54 ++ .../budgerapp/controllers/SubsController.kt | 19 + .../controllers/SubscriptionController.kt | 49 ++ .../controllers/TransactionController.kt | 135 +++ .../controllers/TransferController.kt | 31 + .../budgerapp/controllers/UsersController.kt | 35 + .../budgerapp/controllers/dtos/BudgetDTOs.kt | 8 + .../space/luminic/budgerapp/models/Budget.kt | 42 + .../luminic/budgerapp/models/Category.kt | 21 + .../luminic/budgerapp/models/Exceptions.kt | 4 + .../luminic/budgerapp/models/PushMessage.kt | 20 + .../luminic/budgerapp/models/Recurrent.kt | 17 + .../space/luminic/budgerapp/models/Sort.kt | 13 + .../luminic/budgerapp/models/Subscription.kt | 23 + .../space/luminic/budgerapp/models/Token.kt | 20 + .../luminic/budgerapp/models/Transaction.kt | 29 + .../budgerapp/models/TransactionEvent.kt | 20 + .../space/luminic/budgerapp/models/User.kt | 26 + .../space/luminic/budgerapp/models/Warn.kt | 22 + .../luminic/budgerapp/repos/BudgetRepo.kt | 25 + .../luminic/budgerapp/repos/CategoryRepo.kt | 15 + .../budgerapp/repos/CategoryRepoOld.kt | 11 + .../luminic/budgerapp/repos/RecurrentRepo.kt | 11 + .../budgerapp/repos/SubscriptionRepo.kt | 11 + .../luminic/budgerapp/repos/TokenRepo.kt | 17 + .../repos/TransactionReactiveRepo.kt | 20 + .../budgerapp/repos/TransactionRepo.kt | 21 + .../space/luminic/budgerapp/repos/UserRepo.kt | 19 + .../luminic/budgerapp/repos/UserRepoOld.kt | 9 + .../space/luminic/budgerapp/repos/WarnRepo.kt | 19 + .../budgerapp/repos/sqlrepo/BudgetRepoSQL.kt | 137 +++ .../repos/sqlrepo/CategoriesRepoSQL.kt | 40 + .../repos/sqlrepo/RecurrentRepoSQL.kt | 38 + .../repos/sqlrepo/TransactionsRepoSQl.kt | 65 ++ .../luminic/budgerapp/services/AuthService.kt | 69 ++ .../budgerapp/services/BudgetService.kt | 616 ++++++++++++++ .../budgerapp/services/CacheInspector.kt | 16 + .../budgerapp/services/CategoryService.kt | 362 ++++++++ .../CustomReactiveUserDetailsService.kt | 16 + .../budgerapp/services/RecurrentService.kt | 128 +++ .../budgerapp/services/SubscriptionService.kt | 100 +++ .../budgerapp/services/TokenService.kt | 42 + .../budgerapp/services/TransactionService.kt | 784 ++++++++++++++++++ .../budgerapp/services/TransferService.kt | 50 ++ .../luminic/budgerapp/services/UserService.kt | 57 ++ .../luminic/budgerapp/utils/DateSerializer.kt | 19 + .../space/luminic/budgerapp/utils/JWTUtil.kt | 54 ++ src/main/resources/application-dev.properties | 24 + .../resources/application-prod.properties | 25 + src/main/resources/application.properties | 29 + .../budgerapp/BudgerAppApplicationTests.kt | 13 + 72 files changed, 4606 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/kotlin/space/luminic/budgerapp/BudgerAppApplication.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/configs/AsyncConfig.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/configs/BearerTokenFilter.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/configs/CorsConfig.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/configs/JWTAuthFilter.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/configs/JWTReactiveAuthenticationManager.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/configs/SecurityConfig.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/AuthController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/BudgetController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/CategoriesController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/CustomAuthenticationEntryPoint.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/ExceptionHandler.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/GlobalExceptionHandlerV2.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/RecurrentController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/SubsController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/SubscriptionController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/TransactionController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/TransferController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/UsersController.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/controllers/dtos/BudgetDTOs.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Budget.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Category.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Exceptions.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/PushMessage.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Recurrent.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Sort.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Subscription.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Token.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Transaction.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/TransactionEvent.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/User.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/models/Warn.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/BudgetRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepoOld.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/RecurrentRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/SubscriptionRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/TokenRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/TransactionReactiveRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/TransactionRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/UserRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/UserRepoOld.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/WarnRepo.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/BudgetRepoSQL.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/CategoriesRepoSQL.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/RecurrentRepoSQL.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/TransactionsRepoSQl.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/AuthService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/BudgetService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/CacheInspector.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/CategoryService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/CustomReactiveUserDetailsService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/RecurrentService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/SubscriptionService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/TokenService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/TransactionService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/TransferService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/services/UserService.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/utils/DateSerializer.kt create mode 100644 src/main/kotlin/space/luminic/budgerapp/utils/JWTUtil.kt create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-prod.properties create mode 100644 src/main/resources/application.properties create mode 100644 src/test/kotlin/space/luminic/budgerapp/BudgerAppApplicationTests.kt diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a979af --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Kotlin ### +.kotlin diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..37db6a7 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,75 @@ +plugins { + kotlin("jvm") version "1.9.25" + kotlin("plugin.spring") version "1.9.25" + id("org.springframework.boot") version "3.4.0" + id("io.spring.dependency-management") version "1.1.6" + kotlin("plugin.serialization") version "2.1.0" + id("application") +} + +group = "space.luminic" +version = "v2" + +application { + mainClass.set("space.luminic.budgerapp.BudgerAppApplicationKt") // Укажи путь к главному классу +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom(configurations.annotationProcessor.get()) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-data-mongodb") +// implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-validation") + implementation("commons-logging:commons-logging:1.3.4") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + + implementation("org.springframework.boot:spring-boot-starter-cache") + implementation("org.springframework.boot:spring-boot-starter-security") + + implementation("io.jsonwebtoken:jjwt-api:0.11.5") + implementation("io.jsonwebtoken:jjwt-impl:0.11.5") + implementation("io.jsonwebtoken:jjwt-jackson:0.11.5") + implementation("com.interaso:webpush:1.2.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.7.3") + implementation("org.springframework.boot:spring-boot-starter-data-mongodb-reactive") + implementation("com.google.code.gson:gson") + + + + runtimeOnly("org.postgresql:postgresql") + compileOnly("org.projectlombok:lombok") + annotationProcessor("org.projectlombok:lombok") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +kotlin { + compilerOptions { + freeCompilerArgs.addAll("-Xjsr305=strict") + } +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf=J?1`he3W*;m4)ce8*WFq1sdP=~$5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I z%Rkz#(S8Pjz*P7bqB6L|M#Er{|QLae-Y{KA>`^} z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6 z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd zl?w-|plD8spjDF03g5ip;W3Z z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8 z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R% z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO` z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX| z)_XpaI61<+La+U&&%2a z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX zDDH;3T*GzRT@5=7ibO>N-6_XPBYxno@mD_3I#rDD?iADxX`! zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS= z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP z5MC&=c6X;XlUzrz5q?(!eO@~* zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^ zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F zZg=-~qLb~VRLpv`k zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x!*E6eqmEm*j2bE@=ZI0YZ5%Yj29!5+J$4h{s($nakA`xgbO8w zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3! zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8 zHBvRqN^;$Jizy+ z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saGsD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vlRP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd zNoE)8FvQA>Z`eR5Z@Ig6kS5?0h;`Y&OL2D&xnnAUzQz{YSdh0k zB3exx%A2TyI)M*EM6htrxSlep!Kk(P(VP`$p0G~f$smld6W1r_Z+o?=IB@^weq>5VYsYZZR@` z&XJFxd5{|KPZmVOSxc@^%71C@;z}}WhbF9p!%yLj3j%YOlPL5s>7I3vj25 z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN; z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziGwpg-GM#251sK_ z=3|kitS!j%;fpc@oWn65SEL73^N&t>Ix37xgs= zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2 z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iKuPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx z+K3GKESI4*`tYlmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4UrFWr%LHkdQ;~XU zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8 zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#O%PeD_WvFO~Kct za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2 z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi42-WYU9Vhj~3< zZSM-B;E`g_o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2 z^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2ZuYySbp@hA# ze(kc;P4i_-_UDP?%<6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=NkMk$<8- z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk= z;&0}6LsGtfVa1q)CEUPlx#(ED@-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI zfd=``2&8GsycjR?M%(zMjn;tn9agcq;&rR!Hp z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@ zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8f~#aOFytCT zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKwOd?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5 zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~ zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@ z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQdkijLSOtX6xW%Z9Nw<;M- zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7 zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~ zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S! zR|lF%n!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts z!~@&!N`10S593pVQu4FzpOh!tvg}p%zCU(aV5=~K#bKi zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~# z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H ztJBFvFfsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S zZO!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@ zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R z@As?eG!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr% zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~ zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl z+?+nMGeQQhh~??0!s4iQ#gm3!BpMpnY?04kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt zW5hd~-HWBLI_3HuO) zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*! z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q z<5!4iuB#Q_lLZ8}h|hPODI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gGW~y3nfPAoV%amgr>PSyVAd@l)}8#X zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&89}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv; zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U|0{BW!m)9 zi_9$F?m<`2!`JNFv+w8MK_K)qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<+QCzRr*NA!QjHw# z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV- zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+ zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQjFn33lODt3Wb1j8VR zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6 zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM zJuLNTUVh#WsE*a6uqiz`b#9ZYg3+2%=C(6AvZGc=u&<6??!slB1a9K)=VL zY9EL^mfyKnD zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4 z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad> z;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb z1qtl?;_yjYo)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh zhNh;+eQ9BEIs;tPz%jSVnfCP!3L&9YtEP;svoj_bNzeGSQIAjd zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm` z*>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMabv~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS12kV?AZ%O0SFB$^ zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n# z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%TFafZwZ?5KZpcuaO54Z9hX zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V zK?4jV61B|1Uj_5fBKW;8LdwOFZKWp)g{B%7g1~DgO&N& z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{& z@vY&R1QmQs83BW28qAmJfS7MYi=h(YK??@EhjL-t*5W!p z^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP# zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<0Fbh^*l6!5wfSu8MpMoh=2l z^^0Sr$UpZp*9oqa23fcCfm7`ya2<4wzJ`Axt7e4jJrRFVf?nY~2&tRL* zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU z%l6hPZia>R!`aZjwCp}I zg)%20;}f+&@t;(%5;RHL>K_&7MH^S+7<|(SZH!u zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg zBwho$phWx}x!qy8&}6y5Vr$G{yGSE*r$^r{}pw zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd z&&yX@Hp>~(wU{|(#U&Bf92+1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe| zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI zsq7L{P}^#QsZViX%KgxBvEugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D* z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06 zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5 zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z z3u0qT0TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4nFK|hVAbHcZ3x{PzytQLkCVk7hA!Lo` zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8 z@Ht|vXd^6{Fgai8*tmyRGmD_s_nv~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!AaaX;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<| zX3tt?EAy<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m zOT}u;N|x@aq)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q zE>m=zF}!lObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu zC|T!gPiI1rWGb1z$Md?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk zfF#NLe>W$3m&C^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#!B4JE@GVH zoobHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_ z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`eQq*JYgt8xdFQ6S z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823 zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P zJveQj^hJL#Sn!*4k`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHHh5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m;n{r|;MU3!q4AVkua~fieeWu2 zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^ zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM zL z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9 z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@D$zuCPrkmz@sdv+{ciyFJG2Zwy&%c7;atIeTdh!a(R^QXnu1Oq1b42*OQFWnyQ zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h= zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMeoTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb z<5eqR=ZG3>n2{6v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(s7jdu0>LD#N=$Lk#3HkG!a zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@ zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5*Im1e_8Z${JsM>Ov?nh8Z zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW_1Mmf;76{LU z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI| zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf zssobT^(R@KuShj8>@!1M7tm|2%-pYYDxz-5`rCbaTCG5{;Uxm z*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$ zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyEkXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4 zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2 zo{mLtSy&BA!mSzs&CrKWq^y40JF5a&GSXIi2= z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG_6(p^eTxD-4O#lROgon;R35=|nj#eHIfJBYPWG>H>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0 zDoQ?=?I@Hbr;*VVll1Gmd8*%tiXggMK81a+T(5Gx6;eNb8=uYn z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4 z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(Dryv zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1 zKelh3-jr2I9V?ych`{hta9wQ2c9=MM`2cC{m6^MhlL2{DLv7C^j z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0 z^l01c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O05TCV=&3g)C!lT=czLpZ@Sa%TYuoE?v8T8`V;e$#Zf2_Nj6nvBgh1)2 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..0ac0157 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "budger-app" diff --git a/src/main/kotlin/space/luminic/budgerapp/BudgerAppApplication.kt b/src/main/kotlin/space/luminic/budgerapp/BudgerAppApplication.kt new file mode 100644 index 0000000..8fac966 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/BudgerAppApplication.kt @@ -0,0 +1,23 @@ +package space.luminic.budgerapp + +import com.interaso.webpush.VapidKeys +//import org.apache.tomcat.util.codec.binary.Base64.encodeBase64 +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication +import org.springframework.cache.annotation.EnableCaching +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories +import org.springframework.scheduling.annotation.EnableAsync +import org.springframework.web.reactive.config.EnableWebFlux +import java.security.Security +import java.util.TimeZone + +@SpringBootApplication +@EnableCaching +@EnableAsync +@EnableMongoRepositories(basePackages = ["space.luminic.budgerapp.repos"]) +class BudgerAppApplication + +fun main(args: Array) { + TimeZone.setDefault(TimeZone.getTimeZone("Europe/Moscow")) + runApplication(*args) +} diff --git a/src/main/kotlin/space/luminic/budgerapp/configs/AsyncConfig.kt b/src/main/kotlin/space/luminic/budgerapp/configs/AsyncConfig.kt new file mode 100644 index 0000000..538fae5 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/configs/AsyncConfig.kt @@ -0,0 +1,20 @@ +package space.luminic.budgerapp.configs + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor +import java.util.concurrent.Executor +// +//@Configuration +//class AsyncConfig { +// @Bean(name = ["taskExecutor"]) +// fun taskExecutor(): Executor { +// val executor = ThreadPoolTaskExecutor() +// executor.corePoolSize = 5 +// executor.maxPoolSize = 10 +// executor.setQueueCapacity(25) +// executor.setThreadNamePrefix("Async-") +// executor.initialize() +// return executor +// } +//} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/configs/BearerTokenFilter.kt b/src/main/kotlin/space/luminic/budgerapp/configs/BearerTokenFilter.kt new file mode 100644 index 0000000..8b8296b --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/configs/BearerTokenFilter.kt @@ -0,0 +1,60 @@ +package space.luminic.budgerapp.configs + +import org.slf4j.LoggerFactory +import org.springframework.http.HttpHeaders +import org.springframework.http.HttpMethod +import org.springframework.http.HttpStatus +import org.springframework.security.authentication.BadCredentialsException +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +import org.springframework.security.core.AuthenticationException +import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.core.context.ReactiveSecurityContextHolder +import org.springframework.security.core.context.SecurityContext +import org.springframework.security.core.context.SecurityContextImpl +import org.springframework.security.web.server.context.SecurityContextServerWebExchangeWebFilter +import org.springframework.stereotype.Component +import org.springframework.web.server.ServerWebExchange +import org.springframework.web.server.WebFilterChain +import reactor.core.publisher.Mono +import space.luminic.budgerapp.services.AuthService + +@Component +class BearerTokenFilter(private val authService: AuthService) : SecurityContextServerWebExchangeWebFilter() { + private val logger = LoggerFactory.getLogger(BearerTokenFilter::class.java) + + override fun filter(exchange: ServerWebExchange, chain: WebFilterChain): Mono { + val token = exchange.request.headers.getFirst(HttpHeaders.AUTHORIZATION)?.removePrefix("Bearer ") + + if (exchange.request.path.value() == "/api/auth/login"){ + return chain.filter(exchange) + } + + return if (token != null) { + authService.isTokenValid(token) + .flatMap { userDetails -> + val authorities = userDetails.roles.map { SimpleGrantedAuthority(it) } + val securityContext = SecurityContextImpl( + UsernamePasswordAuthenticationToken( + userDetails.username, null, authorities + ) + ) + chain.filter(exchange) + .contextWrite(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(securityContext))) + } + .onErrorMap(AuthException::class.java) { ex -> + BadCredentialsException(ex.message ?: "Unauthorized") + } + + } else { + Mono.error(AuthException("Authorization token is missing")) + } + } + + + + +} + + +open class AuthException(msg: String) : RuntimeException(msg) \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/configs/CorsConfig.kt b/src/main/kotlin/space/luminic/budgerapp/configs/CorsConfig.kt new file mode 100644 index 0000000..29de148 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/configs/CorsConfig.kt @@ -0,0 +1,18 @@ +package space.luminic.budgerapp.configs + +import org.springframework.context.annotation.Configuration +import org.springframework.web.reactive.config.CorsRegistry +import org.springframework.web.reactive.config.WebFluxConfigurer + +@Configuration +class CorsConfig : WebFluxConfigurer { + + override fun addCorsMappings(registry: CorsRegistry) { + registry.addMapping("/**") // Разрешить все пути + .allowedOrigins("http://localhost:5173") // Разрешить домен localhost:5173 + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH") // Разрешить методы + .allowedHeaders("*") // Разрешить все заголовки + .allowCredentials(true) // Разрешить передачу cookies + } +} + diff --git a/src/main/kotlin/space/luminic/budgerapp/configs/JWTAuthFilter.kt b/src/main/kotlin/space/luminic/budgerapp/configs/JWTAuthFilter.kt new file mode 100644 index 0000000..a8ae826 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/configs/JWTAuthFilter.kt @@ -0,0 +1,44 @@ +//package space.luminic.budgerapp.configs +//import org.springframework.http.HttpHeaders +//import org.springframework.http.HttpStatus +//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +//import org.springframework.security.core.context.SecurityContextHolder +//import org.springframework.stereotype.Component +//import org.springframework.web.server.ServerWebExchange +//import org.springframework.web.server.WebFilter +//import org.springframework.web.server.WebFilterChain +//import reactor.core.publisher.Mono +//import space.luminic.budgerapp.services.AuthService +//import space.luminic.budgerapp.services.TokenService +//import space.luminic.budgerapp.utils.JWTUtil +// +//@Component +//class JWTAuthFilter( +// private val jwtUtil: JWTUtil, +// private val authService: AuthService +//) : WebFilter { +// +// override fun filter(exchange: ServerWebExchange, chain: WebFilterChain): Mono { +// val authHeader = exchange.request.headers.getFirst(HttpHeaders.AUTHORIZATION) +// +// if (authHeader != null && authHeader.startsWith("Bearer ")) { +// val token = authHeader.substring(7) +// return Mono.just(token) +// .filter { authService.isTokenValid(it) } +// .flatMap { validToken -> +// val username = jwtUtil.validateToken(validToken) +// if (username != null) { +// val auth = UsernamePasswordAuthenticationToken(username, null, emptyList()) +// SecurityContextHolder.getContext().authentication = auth +// } +// chain.filter(exchange) +// } +// .onErrorResume { +// exchange.response.statusCode = HttpStatus.UNAUTHORIZED +// exchange.response.setComplete() +// } +// } +// +// return chain.filter(exchange) +// } +//} diff --git a/src/main/kotlin/space/luminic/budgerapp/configs/JWTReactiveAuthenticationManager.kt b/src/main/kotlin/space/luminic/budgerapp/configs/JWTReactiveAuthenticationManager.kt new file mode 100644 index 0000000..aef6bb6 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/configs/JWTReactiveAuthenticationManager.kt @@ -0,0 +1,33 @@ +//package space.luminic.budgerapp.configs +// +//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +//import org.springframework.security.authentication.ReactiveAuthenticationManager +//import org.springframework.security.core.Authentication +//import org.springframework.security.core.userdetails.ReactiveUserDetailsService +//import org.springframework.security.crypto.password.PasswordEncoder +//import org.springframework.stereotype.Component +//import reactor.core.publisher.Mono +//import space.luminic.budgerapp.services.CustomReactiveUserDetailsService +//import space.luminic.budgerapp.services.TokenService +//import space.luminic.budgerapp.utils.JWTUtil +// +//@Component +//class JWTReactiveAuthenticationManager( +// private val passwordEncoder: PasswordEncoder, +// private val userDetailsService: CustomReactiveUserDetailsService +//) : ReactiveAuthenticationManager { +// +// +// override fun authenticate(authentication: Authentication): Mono { +// val username = authentication.principal as String +// val password = authentication.credentials as String +// +// return userDetailsService.findByUsername(username) +// .filter { userDetails -> password == passwordEncoder.encode(userDetails.password) } // Пример проверки пароля +// .map { userDetails -> +// UsernamePasswordAuthenticationToken(userDetails, null, userDetails.authorities) +// } +// } +// +// +//} diff --git a/src/main/kotlin/space/luminic/budgerapp/configs/SecurityConfig.kt b/src/main/kotlin/space/luminic/budgerapp/configs/SecurityConfig.kt new file mode 100644 index 0000000..35d5f91 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/configs/SecurityConfig.kt @@ -0,0 +1,62 @@ +package space.luminic.budgerapp.configs + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.http.HttpMethod +import org.springframework.security.config.web.server.SecurityWebFiltersOrder +import org.springframework.security.config.web.server.ServerHttpSecurity +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.web.server.SecurityWebFilterChain +import space.luminic.budgerapp.controllers.CustomAuthenticationEntryPoint + + +import space.luminic.budgerapp.services.AuthService + +@Configuration +class SecurityConfig( + private val authService: AuthService +) { + @Bean + fun securityWebFilterChain( + http: ServerHttpSecurity, + bearerTokenFilter: BearerTokenFilter, + customAuthenticationEntryPoint: CustomAuthenticationEntryPoint + ): SecurityWebFilterChain { + return http + .csrf { it.disable() } + .cors { it.configurationSource(corsConfigurationSource()) } + + .logout { it.disable() } + .authorizeExchange { + it.pathMatchers(HttpMethod.POST, "/auth/login").permitAll() + it.pathMatchers("/actuator/**").permitAll() + it.anyExchange().authenticated() + } + .addFilterAt( + bearerTokenFilter, + SecurityWebFiltersOrder.AUTHENTICATION + ) // BearerTokenFilter только для authenticated + .build() + } + + + @Bean + fun passwordEncoder(): PasswordEncoder { + return BCryptPasswordEncoder() + } + + @Bean + fun corsConfigurationSource(): org.springframework.web.cors.reactive.CorsConfigurationSource { + val corsConfig = org.springframework.web.cors.CorsConfiguration() + corsConfig.allowedOrigins = + listOf("https://luminic.space", "http://localhost:5173") // Ваши разрешённые источники + corsConfig.allowedMethods = listOf("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH") + corsConfig.allowedHeaders = listOf("*") + corsConfig.allowCredentials = true + + val source = org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource() + source.registerCorsConfiguration("/**", corsConfig) + return source + } +} diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/AuthController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/AuthController.kt new file mode 100644 index 0000000..5dfb2f0 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/AuthController.kt @@ -0,0 +1,45 @@ +package space.luminic.budgerapp.controllers +import org.springframework.http.ResponseEntity + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +import org.springframework.security.core.Authentication + +import org.springframework.web.bind.annotation.* +import reactor.core.publisher.Mono +//import space.luminic.budgerapp.configs.JWTReactiveAuthenticationManager +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.services.AuthService +import space.luminic.budgerapp.services.UserService +import space.luminic.budgerapp.utils.JWTUtil + +@RestController +@RequestMapping("/auth") +class AuthController( +// private val authenticationManager: JWTReactiveAuthenticationManager, + private val jwtUtil: JWTUtil, + private val userService: UserService, + private val authService: AuthService +) { + + @PostMapping("/login") + fun login(@RequestBody request: AuthRequest): Mono> { + return authService.login(request.username, request.password) + .map { token -> mapOf("token" to token) } + } + + + @GetMapping("/me") + fun getMe(@RequestHeader("Authorization") token: String): Mono { + return authService.isTokenValid(token.removePrefix("Bearer ")) + .flatMap { username -> + userService.getByUserNameWoPass(username.username) + } +// return mapOf( +// "username" to authentication.name, +// "details" to authentication.details, +// "roles" to authentication.authorities.map { it.authority } +// ) + } +} + +data class AuthRequest(val username: String, val password: String) diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/BudgetController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/BudgetController.kt new file mode 100644 index 0000000..c918db9 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/BudgetController.kt @@ -0,0 +1,112 @@ +package space.luminic.budgerapp.controllers + +import org.slf4j.LoggerFactory +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.DeleteMapping +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.RequestBody + +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController +import reactor.core.publisher.Mono +import space.luminic.budgerapp.controllers.dtos.BudgetCreationDTO +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.BudgetDTO +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.Warn + +import space.luminic.budgerapp.services.BudgetService +import space.luminic.budgerapp.services.CacheInspector +import java.math.BigDecimal +import java.sql.Date +import java.time.LocalDate + + +@RestController +@RequestMapping("/budgets") +class BudgetController( + val budgetService: BudgetService +) { + + private val logger = LoggerFactory.getLogger(BudgetController::class.java) + + @GetMapping + fun getBudgets(): Mono> { + return budgetService.getBudgets() + } + + @GetMapping("/{id}") + fun getBudget(@PathVariable id: String): Mono { +// logger.info(cacheInspector.getCacheContent("budgets").toString()) + return budgetService.getBudget(id) + } + + + @GetMapping("/by-dates") + fun getBudgetByDate(@RequestParam date: LocalDate): ResponseEntity { + return ResponseEntity.ok(budgetService.getBudgetByDate(date)) + } + + + @GetMapping("/{id}/categories") + fun getBudgetCategories(@PathVariable id: String): ResponseEntity { + return ResponseEntity.ok(budgetService.getBudgetCategories(id)) + } + + @GetMapping("/{id}/transactions") + fun getBudgetTransactions(@PathVariable id: String):Mono>> { + return budgetService.getBudgetTransactionsByType(id) + } + + @PostMapping("/") + fun createBudget(@RequestBody budgetCreationDTO: BudgetCreationDTO): Mono { + return budgetService.createBudget( + budgetCreationDTO.budget, + budgetCreationDTO.createRecurrent + ) + } + + @DeleteMapping("/{id}") + fun deleteBudget(@PathVariable id: String): Mono { + return budgetService.deleteBudget(id) + } + + @PostMapping("/{budgetId}/categories/{catId}/limit") + fun setCategoryLimit( + @PathVariable budgetId: String, + @PathVariable catId: String, + @RequestBody limit: LimitValue, + ): ResponseEntity { + return try { + ResponseEntity.ok(budgetService.setCategoryLimit(budgetId, catId, limit.limit)) + } catch (e: Exception) { + ResponseEntity.badRequest().body(e.message) + } + } + + @GetMapping("/recalc-categories") + fun recalcCategories(): Mono { + return budgetService.recalcBudgetCategory() + + } + + @GetMapping("/{id}/warns") + fun budgetWarns(@PathVariable id: String, @RequestParam hidden: Boolean? = null): Mono> { + return budgetService.getWarns(id, hidden) + } + + @PostMapping("/{id}/warns/{warnId}/hide") + fun setWarnHide(@PathVariable id: String, @PathVariable warnId: String): Mono { + return budgetService.hideWarn(id, warnId) + + + } + + data class LimitValue( + var limit: Double + ) +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/CategoriesController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/CategoriesController.kt new file mode 100644 index 0000000..12869ef --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/CategoriesController.kt @@ -0,0 +1,64 @@ +package space.luminic.budgerapp.controllers + +import org.slf4j.LoggerFactory +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.DeleteMapping +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.PutMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import org.springframework.web.client.HttpClientErrorException +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.services.CategoryService + + +@RestController +@RequestMapping("/categories") +class CategoriesController( + private val categoryService: CategoryService +) { + + + private val logger = LoggerFactory.getLogger(javaClass) + + @GetMapping() + fun getCategories(): ResponseEntity { + return try { + ResponseEntity.ok(categoryService.getCategories()) + } catch (e: Exception) { + ResponseEntity(HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR), HttpStatus.INTERNAL_SERVER_ERROR) + } + + } + + @GetMapping("/types") + fun getCategoriesTypes(): ResponseEntity { + return try { + ResponseEntity.ok(categoryService.getCategoryTypes()) + }catch (e: Exception) { + ResponseEntity(HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR), HttpStatus.INTERNAL_SERVER_ERROR) + + } + } + + @PostMapping() + fun createCategory(@RequestBody category: Category): Mono { + return categoryService.createCategory(category) + } + + @PutMapping("/{categoryId}") + fun editCategory(@PathVariable categoryId: String, @RequestBody category: Category): Mono { + return categoryService.editCategory(category) + } + + @DeleteMapping("/{categoryId}") + fun deleteCategory(@PathVariable categoryId: String): Mono { + return categoryService.deleteCategory(categoryId) + } + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/CustomAuthenticationEntryPoint.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/CustomAuthenticationEntryPoint.kt new file mode 100644 index 0000000..d618260 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/CustomAuthenticationEntryPoint.kt @@ -0,0 +1,34 @@ +package space.luminic.budgerapp.controllers + +import com.fasterxml.jackson.databind.ObjectMapper +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.security.core.AuthenticationException +import org.springframework.security.web.server.ServerAuthenticationEntryPoint +import org.springframework.stereotype.Component +import org.springframework.web.server.ServerWebExchange +import reactor.core.publisher.Mono +import java.util.* + +@Component +class CustomAuthenticationEntryPoint : ServerAuthenticationEntryPoint { + override fun commence( + exchange: ServerWebExchange, + ex: AuthenticationException + ): Mono { + val response = exchange.response + response.statusCode = HttpStatus.UNAUTHORIZED + response.headers.contentType = MediaType.APPLICATION_JSON + + val body = mapOf( + "timestamp" to Date(), + "status" to HttpStatus.UNAUTHORIZED.value(), + "error" to "Unauthorized", + "message" to ex.message, + "path" to exchange.request.path.value() + ) + + val buffer = response.bufferFactory().wrap(ObjectMapper().writeValueAsBytes(body)) + return response.writeWith(Mono.just(buffer)) + } +} diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/ExceptionHandler.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/ExceptionHandler.kt new file mode 100644 index 0000000..eb07f81 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/ExceptionHandler.kt @@ -0,0 +1,118 @@ +package space.luminic.budgerapp.controllers + +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.http.server.reactive.ServerHttpRequest +import org.springframework.security.core.AuthenticationException + +import org.springframework.web.bind.annotation.ExceptionHandler +import org.springframework.web.bind.annotation.RestControllerAdvice +import org.springframework.web.reactive.function.server.ServerRequest +import org.springframework.web.server.ServerWebExchange +import reactor.core.publisher.Mono +import space.luminic.budgerapp.configs.AuthException +import space.luminic.budgerapp.models.NotFoundException + +@RestControllerAdvice +class GlobalExceptionHandler { + + fun constructErrorBody( + e: Exception, + message: String, + status: HttpStatus, + request: ServerHttpRequest + ): Map { + val errorResponse = mapOf( + "timestamp" to System.currentTimeMillis(), + "status" to status.value(), + "error" to message, + "message" to e.message, + "path" to request.path.value() + ) + return errorResponse + } + + @ExceptionHandler(AuthException::class) + fun handleAuthenticationException( + ex: AuthException, + exchange: ServerWebExchange + ): Mono>?> { + ex.printStackTrace() + + return Mono.just( + ResponseEntity( + constructErrorBody( + ex, + ex.message.toString(), + HttpStatus.UNAUTHORIZED, + exchange.request + ), HttpStatus.UNAUTHORIZED + ) + ) + } + + + @ExceptionHandler(NotFoundException::class) + fun handleNotFoundException( + e: NotFoundException, + exchange: ServerWebExchange + ): Mono>?> { + e.printStackTrace() + + return Mono.just( + ResponseEntity( + constructErrorBody( + e, + e.message.toString(), + HttpStatus.NOT_FOUND, + exchange.request + ), HttpStatus.NOT_FOUND + ) + ) + } + + @ExceptionHandler(IllegalArgumentException::class) + fun handleIllegalArgumentException( + e: IllegalArgumentException, + exchange: ServerWebExchange + ): Mono>?> { + e.printStackTrace() + val errorBody = mapOf("error" to e.message.orEmpty()) + return Mono.just( + ResponseEntity( + constructErrorBody( + e, + e.message.toString(), + HttpStatus.BAD_REQUEST, + exchange.request + ), HttpStatus.BAD_REQUEST + ) + ) + } + + @ExceptionHandler(Exception::class) + fun handleGenericException( + e: Exception, + exchange: ServerWebExchange + ): Mono>?> { + e.printStackTrace() +// val errorBody = mapOf("error" to "An unexpected error occurred") + val errorResponse = mapOf( + "timestamp" to System.currentTimeMillis(), + "status" to HttpStatus.INTERNAL_SERVER_ERROR.value(), + "error" to "Internal Server Error", + "message" to e.message, + "path" to exchange.request.path.value() + ) + return Mono.just( + ResponseEntity( + constructErrorBody( + e, + e.message.toString(), + HttpStatus.INTERNAL_SERVER_ERROR, + exchange.request + ), HttpStatus.INTERNAL_SERVER_ERROR + ) + ) + } +} diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/GlobalExceptionHandlerV2.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/GlobalExceptionHandlerV2.kt new file mode 100644 index 0000000..d330566 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/GlobalExceptionHandlerV2.kt @@ -0,0 +1,51 @@ +package space.luminic.budgerapp.controllers +import org.springframework.boot.autoconfigure.web.WebProperties +import org.springframework.boot.autoconfigure.web.reactive.error.AbstractErrorWebExceptionHandler +import org.springframework.boot.web.reactive.error.ErrorAttributes +import org.springframework.context.ApplicationContext +import org.springframework.core.annotation.Order +import org.springframework.http.MediaType +import org.springframework.stereotype.Component +import org.springframework.web.reactive.function.BodyInserters +import org.springframework.web.reactive.function.server.* +import org.springframework.web.reactive.result.view.ViewResolver +import org.springframework.http.codec.ServerCodecConfigurer +import reactor.core.publisher.Mono + +@Component +@Order(-2) +class GlobalErrorWebExceptionHandler( + errorAttributes: ErrorAttributes, + applicationContext: ApplicationContext, + serverCodecConfigurer: ServerCodecConfigurer +) : AbstractErrorWebExceptionHandler( + errorAttributes, + WebProperties.Resources(), + applicationContext +) { + + init { + super.setMessageWriters(serverCodecConfigurer.writers) + super.setMessageReaders(serverCodecConfigurer.readers) + } + + override fun getRoutingFunction(errorAttributes: ErrorAttributes): RouterFunction { + return RouterFunctions.route(RequestPredicates.all(), this::renderErrorResponse) + } + + private fun renderErrorResponse(request: ServerRequest): Mono { + val errorAttributesMap = getErrorAttributes( + request, + org.springframework.boot.web.error.ErrorAttributeOptions.of( + org.springframework.boot.web.error.ErrorAttributeOptions.Include.MESSAGE + ) + ) + return ServerResponse.status(401) + .contentType(MediaType.APPLICATION_JSON) + .body(BodyInserters.fromValue(errorAttributesMap)) + } + + private fun getHttpStatus(errorAttributes: Map): Int { + return errorAttributes["status"] as Int + } +} diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/RecurrentController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/RecurrentController.kt new file mode 100644 index 0000000..85fb9ad --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/RecurrentController.kt @@ -0,0 +1,54 @@ +package space.luminic.budgerapp.controllers + +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.DeleteMapping +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.PutMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Recurrent +import space.luminic.budgerapp.services.RecurrentService + +@RestController +@RequestMapping("/recurrents") +class RecurrentController ( + private val recurrentService: RecurrentService +){ + + @GetMapping("/") + fun getRecurrents(): Mono> { + return recurrentService.getRecurrents() + } + + + @GetMapping("/{id}") + fun getRecurrent(@PathVariable id: String): Mono { + return recurrentService.getRecurrentById(id) + } + + @PostMapping("/") + fun createRecurrent(@RequestBody recurrent: Recurrent): Mono { + return recurrentService.createRecurrent(recurrent) + } + + @PutMapping("/{id}") + fun editRecurrent(@PathVariable id: String, @RequestBody recurrent: Recurrent): Mono { + return recurrentService.editRecurrent(recurrent) + } + + + @DeleteMapping("/{id}") + fun deleteRecurrent(@PathVariable id: String): Mono { + return recurrentService.deleteRecurrent(id) + } + + + @GetMapping("/transfer") + fun transferRecurrents() : ResponseEntity { + return ResponseEntity.ok(recurrentService.transferRecurrents()) + } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/SubsController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/SubsController.kt new file mode 100644 index 0000000..6b5075a --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/SubsController.kt @@ -0,0 +1,19 @@ +package space.luminic.budgerapp.controllers + +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + + +@RestController +@RequestMapping("/push") +class SubsController { + + + + @GetMapping("/vapid") + fun getVapid(): ResponseEntity { + return ResponseEntity.ok("BKmMyBUhpkcmzYWcYsjH_spqcy0zf_8eVtZo60f7949TgLztCmv3YD0E_vtV2dTfECQ4sdLdPK3ICDcyOkCqr84") + } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/SubscriptionController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/SubscriptionController.kt new file mode 100644 index 0000000..fcbdb91 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/SubscriptionController.kt @@ -0,0 +1,49 @@ +package space.luminic.budgerapp.controllers + +import org.springframework.http.ResponseEntity +import org.springframework.security.core.Authentication +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.PushMessage +import space.luminic.budgerapp.models.SubscriptionDTO +import space.luminic.budgerapp.services.SubscriptionService +import space.luminic.budgerapp.services.UserService + + +@RestController +@RequestMapping("/subscriptions") +class SubscriptionController( + private val subscriptionService: SubscriptionService, + private val userService: UserService +) { + + + @PostMapping("/subscribe") + fun subscribe( + @RequestBody subscription: SubscriptionDTO, + authentication: Authentication + ): Mono { + return userService.getByUserNameWoPass(authentication.name) + .flatMap { user -> + subscriptionService.subscribe(subscription, user) + .thenReturn("Subscription successful") + } + .switchIfEmpty(Mono.just("User not found")) + + } + + @PostMapping("/notifyAll") + fun notifyAll(@RequestBody payload: PushMessage): ResponseEntity { + return try { + ResponseEntity.ok(subscriptionService.sendToAll(payload)) + } catch (e: Exception) { + e.printStackTrace() + return ResponseEntity.badRequest().body(e.message) + } + } +} + + diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/TransactionController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/TransactionController.kt new file mode 100644 index 0000000..4b3df23 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/TransactionController.kt @@ -0,0 +1,135 @@ +package space.luminic.budgerapp.controllers + +import org.springframework.data.mongodb.core.aggregation.AggregationResults +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.security.core.Authentication +import org.springframework.web.bind.annotation.DeleteMapping +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PatchMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController +import org.springframework.web.client.HttpClientErrorException +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.services.BudgetService +import space.luminic.budgerapp.services.TransactionService + + +@RestController +@RequestMapping("/transactions") +class TransactionController(private val transactionService: TransactionService, val budgetService: BudgetService) { + + + @GetMapping + fun getTransactions( + @RequestParam(value = "transaction_type") transactionType: String? = null, + @RequestParam(value = "category_type") categoryType: String? = null, + @RequestParam(value = "user_id") userId: String? = null, + @RequestParam(value = "is_child") isChild: Boolean? = null, + @RequestParam(value = "limit") limit: Int = 10, + @RequestParam(value = "offset") offset: Int = 0 + ): ResponseEntity { + try { + return ResponseEntity.ok( + transactionService.getTransactions( + transactionType = transactionType, + categoryType = categoryType, + userId = userId, + isChild = isChild, + limit = limit, + offset = offset + ) + ) + } catch (e: Exception) { + e.printStackTrace() + return ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR) + } + } + + @GetMapping("/{id}") + fun getTransaction(@PathVariable id: String): ResponseEntity { + try { + return ResponseEntity.ok(transactionService.getTransactionById(id)) + } catch (e: Exception) { + e.printStackTrace() + return ResponseEntity(e.message, HttpStatus.INTERNAL_SERVER_ERROR) + } + } + + @PostMapping + fun createTransaction(@RequestBody transaction: Transaction): ResponseEntity { + try { + return ResponseEntity.ok(transactionService.createTransaction(transaction)) + } catch (e: Exception) { + e.printStackTrace() + return ResponseEntity(e.message, HttpStatus.INTERNAL_SERVER_ERROR) + + } + } + + @PutMapping("/{id}") + fun editTransaction(@PathVariable id: String, @RequestBody transaction: Transaction): ResponseEntity { + try { + return ResponseEntity.ok(transactionService.editTransaction(transaction)) + } catch (e: Exception) { + e.printStackTrace() + return ResponseEntity(e.message, HttpStatus.INTERNAL_SERVER_ERROR) + } + } + + @DeleteMapping("/{id}") + fun deleteTransaction(@PathVariable id: String): Mono { + + return transactionService.deleteTransaction(id) + + } + + +// @PatchMapping("/{id}/set-done") +// fun setTransactionDoneStatus(@PathVariable id: String, @RequestBody transaction: Transaction): ResponseEntity { +// try { +// transactionService.setTransactionDone(transaction) +// return ResponseEntity.ok(true) +// } catch (e: Exception) { +// e.printStackTrace() +// return ResponseEntity(e.message, HttpStatus.INTERNAL_SERVER_ERROR) +// } +// } + + @GetMapping("/{id}/child") + fun getChildTransactions(@PathVariable id: String): ResponseEntity { + return ResponseEntity.ok(transactionService.getChildTransaction(id)) + } + + @GetMapping("/avg-by-category") + fun getAvgSums(): ResponseEntity { + return ResponseEntity.ok(transactionService.getAverageSpendingByCategory()) + } + +// @GetMapping("/_transfer") +// fun transfer(): ResponseEntity { +// return ResponseEntity.ok(transactionService.transferTransactions()) +// } + + @GetMapping("/types") + fun getTypes(): ResponseEntity { + return try { + ResponseEntity.ok(transactionService.getTransactionTypes()) + } catch (e: Exception) { + ResponseEntity(HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR), HttpStatus.INTERNAL_SERVER_ERROR) + } + } + +// @GetMapping("/test") +// fun getSome(): List?> { +// return transactionService.getPlannedForBudget(budgetService.getBudget("675ae567f232c35272f8a692")!!) +// } + + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/TransferController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/TransferController.kt new file mode 100644 index 0000000..bd894b3 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/TransferController.kt @@ -0,0 +1,31 @@ +package space.luminic.budgerapp.controllers + +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.services.TransferService + +@RestController +@RequestMapping("/transfer") +class TransferController(private val transferService: TransferService) { + + @GetMapping("/transactions") + fun transferTransactions(): Mono> { + return transferService.getTransactions() + } + + @GetMapping("/categories") + fun transferCategories(): Mono> { + return transferService.getCategories() + } + + @GetMapping("/budgets") + fun budgets(): Mono> { + return transferService.transferBudgets() + } + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/UsersController.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/UsersController.kt new file mode 100644 index 0000000..c8643da --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/UsersController.kt @@ -0,0 +1,35 @@ +package space.luminic.budgerapp.controllers + +import org.slf4j.LoggerFactory +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.services.UserService + + +@RestController +@RequestMapping("/users") +class UsersController(val userService: UserService) { + + val logger = LoggerFactory.getLogger(javaClass) + + @GetMapping("/{id}") + fun getUser(@PathVariable id: String): Mono { + return userService.getById(id) + } + + @GetMapping("/") + fun getUsers(): Mono> { +// return ResponseEntity.ok("teset") + return userService.getUsers() + } +// +// @GetMapping("/regen") +// fun regenUsers(): ResponseEntity { +// return ResponseEntity.ok(userService.regenPass()) +// } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/controllers/dtos/BudgetDTOs.kt b/src/main/kotlin/space/luminic/budgerapp/controllers/dtos/BudgetDTOs.kt new file mode 100644 index 0000000..d0460de --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/controllers/dtos/BudgetDTOs.kt @@ -0,0 +1,8 @@ +package space.luminic.budgerapp.controllers.dtos + +import space.luminic.budgerapp.models.Budget + +data class BudgetCreationDTO( + val budget: Budget, + val createRecurrent: Boolean = false +) diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Budget.kt b/src/main/kotlin/space/luminic/budgerapp/models/Budget.kt new file mode 100644 index 0000000..8a4bc51 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Budget.kt @@ -0,0 +1,42 @@ +package space.luminic.budgerapp.models + +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.DBRef +import org.springframework.data.mongodb.core.mapping.Document +import java.math.BigDecimal +import java.time.LocalDate +import java.time.LocalDateTime + + +data class BudgetDTO( + var id: String? = null, + var name: String, + var dateFrom: LocalDate, + var dateTo: LocalDate, + val createdAt: LocalDateTime = LocalDateTime.now(), + var plannedExpenses: MutableList? = null, + var plannedIncomes: MutableList? = null, + var categories: MutableList = mutableListOf(), + var transactions: MutableList? = null, + +) + + +@Document("budgets") +data class Budget( + @Id var id: String? = null, + var name: String, + var dateFrom: LocalDate, + var dateTo: LocalDate, + val createdAt: LocalDateTime = LocalDateTime.now(), + var categories: MutableList = mutableListOf(), +) + +data class BudgetCategory( + @Transient var currentSpent: Double? = null, + var currentLimit: Double, + @Transient var currentPlanned: Double? = null, + @DBRef var category: Category +) + +class BudgetNotFoundException(message: String) : NotFoundException(message) diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Category.kt b/src/main/kotlin/space/luminic/budgerapp/models/Category.kt new file mode 100644 index 0000000..2b3e6fc --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Category.kt @@ -0,0 +1,21 @@ +package space.luminic.budgerapp.models + +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.Document + + +@Document("categories") +data class Category( + @Id + val id: String? = null, + var type: CategoryType, + val name: String, + val description: String? = null, + val icon: String? = null +) + + +data class CategoryType( + val code: String, + val name: String? = null +) diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Exceptions.kt b/src/main/kotlin/space/luminic/budgerapp/models/Exceptions.kt new file mode 100644 index 0000000..0b0c4bf --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Exceptions.kt @@ -0,0 +1,4 @@ +package space.luminic.budgerapp.models + + +open class NotFoundException(message: String) : Exception(message) \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/models/PushMessage.kt b/src/main/kotlin/space/luminic/budgerapp/models/PushMessage.kt new file mode 100644 index 0000000..11af81c --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/PushMessage.kt @@ -0,0 +1,20 @@ +package space.luminic.budgerapp.models + +import kotlinx.serialization.Serializable + + +@Serializable +data class PushMessage( + +// title: str +// body: str +// icon: str +// badge: str +// url: str + val title: String, + val body: String, + val icon: String? = null, + val budge: String? = null, + val url: String? = null + +) \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Recurrent.kt b/src/main/kotlin/space/luminic/budgerapp/models/Recurrent.kt new file mode 100644 index 0000000..441d8b4 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Recurrent.kt @@ -0,0 +1,17 @@ +package space.luminic.budgerapp.models + +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.DBRef +import org.springframework.data.mongodb.core.mapping.Document +import java.util.Date + +@Document(collection = "recurrents") +data class Recurrent( + @Id val id: String? = null, + var atDay: Int, + @DBRef var category: Category, + var name: String, + var description: String, + var amount: Int, + var createdAt: Date = Date() +) diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Sort.kt b/src/main/kotlin/space/luminic/budgerapp/models/Sort.kt new file mode 100644 index 0000000..4c587f5 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Sort.kt @@ -0,0 +1,13 @@ +package space.luminic.budgerapp.models + +import org.springframework.data.domain.Sort.Direction + + +enum class SortTypes { + ASC, DESC +} + +data class SortSetting( + val by: String, + val order: Direction +) diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Subscription.kt b/src/main/kotlin/space/luminic/budgerapp/models/Subscription.kt new file mode 100644 index 0000000..c3d7654 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Subscription.kt @@ -0,0 +1,23 @@ +package space.luminic.budgerapp.models + +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.DBRef +import org.springframework.data.mongodb.core.mapping.Document +import java.util.Date + +@Document(collection = "subscriptions") +data class Subscription( + @Id val id: String? = null, + @DBRef val user: User? = null, + val endpoint: String, + val auth: String, + val p256dh: String, + var isActive: Boolean, + val createdAt: Date = Date() +) + + +data class SubscriptionDTO ( + val endpoint: String, + val keys: Map +) diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Token.kt b/src/main/kotlin/space/luminic/budgerapp/models/Token.kt new file mode 100644 index 0000000..fbde8df --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Token.kt @@ -0,0 +1,20 @@ +package space.luminic.budgerapp.models + +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.Document +import java.time.LocalDateTime + +@Document(collection = "tokens") +data class Token( + @Id + val id: String? = null, + val token: String, + val username: String, + val issuedAt: LocalDateTime, + val expiresAt: LocalDateTime, + val status: TokenStatus = TokenStatus.ACTIVE +) + +enum class TokenStatus { + ACTIVE, REVOKED, EXPIRED +} diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Transaction.kt b/src/main/kotlin/space/luminic/budgerapp/models/Transaction.kt new file mode 100644 index 0000000..083d69c --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Transaction.kt @@ -0,0 +1,29 @@ +package space.luminic.budgerapp.models + +import com.fasterxml.jackson.annotation.JsonFormat +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.DBRef +import org.springframework.data.mongodb.core.mapping.Document +import java.math.BigDecimal +import java.time.LocalDate +import java.time.LocalDateTime +import java.util.Date + +@Document(collection = "transactions") +data class Transaction( + @Id var id: String? = null, + var type: TransactionType, + @DBRef var user: User?=null, + @DBRef var category: Category, + var comment: String, + val date: LocalDate, + var amount: Double, + val isDone: Boolean, + var parentId: String? = null, + var createdAt: LocalDateTime? = LocalDateTime.now(), +) + +data class TransactionType( + val code: String, + val name: String +) \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/models/TransactionEvent.kt b/src/main/kotlin/space/luminic/budgerapp/models/TransactionEvent.kt new file mode 100644 index 0000000..1bfa87a --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/TransactionEvent.kt @@ -0,0 +1,20 @@ +package space.luminic.budgerapp.models + +import org.springframework.context.ApplicationEvent +import java.math.BigDecimal + +enum class TransactionEventType { + CREATE, EDIT, DELETE +} + +class TransactionEvent( + source: Any, + val eventType: TransactionEventType, + val oldTransaction: Transaction, + val newTransaction: Transaction, + var difference: Double? = null, +) : ApplicationEvent(source) { + override fun toString(): String { + return "${eventType}, ${oldTransaction}, ${newTransaction}, $difference" + } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/models/User.kt b/src/main/kotlin/space/luminic/budgerapp/models/User.kt new file mode 100644 index 0000000..1067991 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/User.kt @@ -0,0 +1,26 @@ +package space.luminic.budgerapp.models + +import com.fasterxml.jackson.annotation.JsonIgnore +import jakarta.validation.constraints.NotBlank +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.Document +import java.util.Date + +@Document("users") +data class User ( + @Id + var id: String? = null, + @field:NotBlank val username: String, + var firstName: String, + var tgId: String? = null, + var tgUserName: String? = null, + @JsonIgnore // Скрывает пароль при сериализации + var password: String? = null, + var isActive: Boolean = true, + var regDate: Date? = null, + val createdAt: Date? = null, + var roles: MutableList = mutableListOf(), +) + + + diff --git a/src/main/kotlin/space/luminic/budgerapp/models/Warn.kt b/src/main/kotlin/space/luminic/budgerapp/models/Warn.kt new file mode 100644 index 0000000..00af032 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/models/Warn.kt @@ -0,0 +1,22 @@ +package space.luminic.budgerapp.models + +import org.bson.types.ObjectId +import org.springframework.data.annotation.Id +import org.springframework.data.mongodb.core.mapping.DBRef +import org.springframework.data.mongodb.core.mapping.Document + +enum class WarnSerenity(val level: String, val sort: Int) { + OTHER("Другое", -10), + MAIN("Основное", 0), + IMPORTANT("Важное", 10) +} + +@Document(collection = "warns") +data class Warn( + @Id var id: String? = null, + var serenity: WarnSerenity, + var message: PushMessage, + var budgetId: String, + var context: String, + var isHide: Boolean +) diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/BudgetRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/BudgetRepo.kt new file mode 100644 index 0000000..40328bc --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/BudgetRepo.kt @@ -0,0 +1,25 @@ +package space.luminic.budgerapp.repos + + +import org.springframework.data.domain.Sort +import org.springframework.data.mongodb.core.aggregation.SortOperation +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.Query +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.data.repository.PagingAndSortingRepository +import org.springframework.stereotype.Repository +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Budget +import java.time.LocalDate +import java.util.Date +import java.util.Optional + +@Repository +interface BudgetRepo: ReactiveMongoRepository { + + override fun findAll(sort: Sort): Flux + + fun findByDateFromLessThanEqualAndDateToGreaterThan(dateOne: LocalDate, dateTwo: LocalDate): Mono + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepo.kt new file mode 100644 index 0000000..fa99967 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepo.kt @@ -0,0 +1,15 @@ +package space.luminic.budgerapp.repos + +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Category +import java.util.Optional + +@Repository +interface CategoryRepo : ReactiveMongoRepository { + + + fun findByName(name: String): Mono +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepoOld.kt b/src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepoOld.kt new file mode 100644 index 0000000..b2723ae --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/CategoryRepoOld.kt @@ -0,0 +1,11 @@ +package space.luminic.budgerapp.repos + +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Category + +@Repository +interface CategoryRepoOld: MongoRepository { + + fun findByName(name: String): Category? +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/RecurrentRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/RecurrentRepo.kt new file mode 100644 index 0000000..90ff39f --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/RecurrentRepo.kt @@ -0,0 +1,11 @@ +package space.luminic.budgerapp.repos + +import org.bson.types.ObjectId +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Recurrent + +@Repository +interface RecurrentRepo: ReactiveMongoRepository { +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/SubscriptionRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/SubscriptionRepo.kt new file mode 100644 index 0000000..1c89060 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/SubscriptionRepo.kt @@ -0,0 +1,11 @@ +package space.luminic.budgerapp.repos + + +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Subscription + +@Repository +interface SubscriptionRepo : ReactiveMongoRepository { +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/TokenRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/TokenRepo.kt new file mode 100644 index 0000000..59c185f --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/TokenRepo.kt @@ -0,0 +1,17 @@ +package space.luminic.budgerapp.repos + +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Token +import space.luminic.budgerapp.models.TokenStatus +import java.time.LocalDateTime + +@Repository +interface TokenRepo: ReactiveMongoRepository { + + fun findByToken(token: String): Mono + fun findByUsernameAndStatus(username: String, status: TokenStatus): Mono> + fun deleteByExpiresAtBefore(dateTime: LocalDateTime) +} diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/TransactionReactiveRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/TransactionReactiveRepo.kt new file mode 100644 index 0000000..68492a3 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/TransactionReactiveRepo.kt @@ -0,0 +1,20 @@ +package space.luminic.budgerapp.repos + +import org.bson.types.ObjectId +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Transaction +import java.util.Optional + + +@Repository +interface TransactionReactiveRepo: ReactiveMongoRepository { + + + + +// fun findByOldId(transactionId: Int): Optional + + fun findByParentId(parentId: String): Optional +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/TransactionRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/TransactionRepo.kt new file mode 100644 index 0000000..13ebb14 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/TransactionRepo.kt @@ -0,0 +1,21 @@ +package space.luminic.budgerapp.repos + +import org.bson.types.ObjectId +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Transaction +import java.util.Optional + + +@Repository +interface TransactionRepo: ReactiveMongoRepository { + + + + +// fun findByOldId(transactionId: Int): Optional + + fun findByParentId(parentId: String): Mono +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/UserRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/UserRepo.kt new file mode 100644 index 0000000..0e02ea2 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/UserRepo.kt @@ -0,0 +1,19 @@ +package space.luminic.budgerapp.repos + +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.Query +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.User +import java.util.Optional + +@Repository +interface UserRepo : ReactiveMongoRepository { + + + @Query(value = "{ 'username': ?0 }", fields = "{ 'password': 0 }") + fun findByUsernameWOPassword(username: String): Mono + + fun findByUsername(username: String): Mono +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/UserRepoOld.kt b/src/main/kotlin/space/luminic/budgerapp/repos/UserRepoOld.kt new file mode 100644 index 0000000..3c1e50a --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/UserRepoOld.kt @@ -0,0 +1,9 @@ +package space.luminic.budgerapp.repos + +import org.springframework.data.mongodb.repository.MongoRepository +import space.luminic.budgerapp.models.User + +interface UserRepoOld: MongoRepository { + + fun findByUsername(username: String): User? +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/WarnRepo.kt b/src/main/kotlin/space/luminic/budgerapp/repos/WarnRepo.kt new file mode 100644 index 0000000..ea40f6a --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/WarnRepo.kt @@ -0,0 +1,19 @@ +package space.luminic.budgerapp.repos + +import org.springframework.data.mongodb.repository.MongoRepository +import org.springframework.data.mongodb.repository.ReactiveMongoRepository +import org.springframework.stereotype.Repository +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Warn + +@Repository +interface WarnRepo : ReactiveMongoRepository { + + fun findAllByBudgetIdAndIsHide(budgetId: String, isHide: Boolean): Flux + fun deleteAllByBudgetId(budgetId: String) + + fun findWarnByContext(context: String): Mono + + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/BudgetRepoSQL.kt b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/BudgetRepoSQL.kt new file mode 100644 index 0000000..0cae8bd --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/BudgetRepoSQL.kt @@ -0,0 +1,137 @@ +package space.luminic.budgerapp.repos.sqlrepo + +import org.slf4j.LoggerFactory +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.jdbc.core.RowMapper +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.controllers.dtos.BudgetCreationDTO +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.BudgetCategory +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.CategoryType +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.TransactionType +import space.luminic.budgerapp.services.CategoryService +import space.luminic.budgerapp.services.UserService +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.ZoneId +import java.time.ZoneOffset + + +@Repository +class BudgetRepoSQL( + val jdbcTemplate: JdbcTemplate, + val userService: UserService, + val categoryService: CategoryService, + val transactionsRepoSQl: TransactionsRepoSQl +) { + + private val logger = LoggerFactory.getLogger(BudgetRepoSQL::class.java) + + fun getBudgetsIds(): List { + return jdbcTemplate.queryForList("SELECT id FROM budger.budgets", Int::class.java) + } + + fun getBudgets(): List { + val sql = "SELECT * FROM budger.budgets" + return jdbcTemplate.query(sql, RowMapper { rs, _ -> + BudgetCreationDTO( + Budget( +// id = rs.getString("id"), + name = rs.getString("name"), + dateFrom = rs.getDate("date_from").toLocalDate(), + dateTo = rs.getDate("date_to").toLocalDate(), + createdAt = LocalDateTime.of(rs.getDate("created_at").toLocalDate(), LocalTime.NOON), + ), false + ) + }) + } + +// fun getBudgetCategory(id: Int): List { +// val sql = "SELECT c.*, \n" + +// " COALESCE(SUM(CASE WHEN t.transaction_type_code = 'INSTANT' THEN t.amount END), 0) AS total_instant_expenses,\n" + +// " COALESCE(SUM(CASE WHEN t.transaction_type_code = 'PLANNED' THEN t.amount END), 0) AS total_planned_expenses,\n" + +// " COALESCE(bcs.category_setting_value, 0) AS current_limit,\n" + +// " COALESCE((SELECT AVG(amount) FROM budger.transactions where category_id=c.id AND transaction_type_code='INSTANT'),0) as average\n" + +// "FROM\n" + +// " budger.budget_category_settings bcs\n" + +// "JOIN\n" + +// " budger.budgets b ON bcs.budget_id = b.id\n" + +// "LEFT JOIN\n" + +// " budger.transactions t ON bcs.category_id = t.category_id\n" + +// " AND t.date BETWEEN b.date_from AND b.date_to\n" + +// "JOIN\n" + +// " budger.categories c ON bcs.category_id = c.id\n" + +// "WHERE\n" + +// " b.id = ? -- Укажите ID бюджета, для которого нужно вывести данные\n" + +// "GROUP BY\n" + +// " c.id, bcs.category_setting_value\n" + +// "ORDER BY\n" + +// " c.id;" +// return jdbcTemplate.query(sql, RowMapper { rs, _ -> +// BudgetCategory( +// currentSpent = rs.getBigDecimal("total_instant_expenses"), +// currentLimit = rs.getBigDecimal("current_limit"), +// category = categoryService.getCategoryByName(rs.getString("name")) +// ) +// }, id) +// } + + fun getBudgetTransactions(id: Int, transactionType: String?, categoryType: String?): List { + val whereConditions = mutableListOf() + val parameters = mutableListOf() + + // Базовое условие + whereConditions.add("b.id = ?") + parameters.add(id) + + // Условие для transactionType, если указано + if (transactionType != null) { + whereConditions.add("t.transaction_type_code = ?") + parameters.add(transactionType) + } + + // Условие для categoryType, если указано + if (categoryType != null) { + whereConditions.add("c.type_code = ?") + parameters.add(categoryType) + } + + // Генерация WHERE + val whereClause = if (whereConditions.isNotEmpty()) "WHERE ${whereConditions.joinToString(" AND ")}" else "" + + // SQL запрос + val sql = """ + SELECT + tt.code as tt_code, + tt.name as tt_name, + t.comment, + t.date, + t.amount, + t.is_done, + t.created_at, + u.username, + c.name as c_name, + t.id + FROM budger.transactions t + JOIN budger.transaction_types tt ON tt.code = t.transaction_type_code + JOIN budger.categories c ON c.id = t.category_id + JOIN budger.category_types ct ON ct.code = c.type_code + JOIN budger.budgets b ON t.date BETWEEN b.date_from AND b.date_to + LEFT JOIN budger.users u ON t.user_id = u.id + $whereClause + ORDER BY t.date DESC, c.name, t.id + """.trimIndent() + logger.info(parameters.toTypedArray().toString()) + // Выполнение запроса + + + return jdbcTemplate.query( + sql, parameters.toTypedArray(), + transactionsRepoSQl.transactionRowMapper() + ) + } + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/CategoriesRepoSQL.kt b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/CategoriesRepoSQL.kt new file mode 100644 index 0000000..abac683 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/CategoriesRepoSQL.kt @@ -0,0 +1,40 @@ +package space.luminic.budgerapp.repos.sqlrepo + +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.jdbc.core.RowMapper +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.CategoryType +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.TransactionType +import java.time.LocalDate +import java.time.ZoneId + +@Repository +class CategoriesRepoSQL(private val jdbcTemplate: JdbcTemplate) { + + + fun getCategories(): List { + val sql = "SELECT * FROM budger.categories" + return jdbcTemplate.query(sql, categoriesRowMapper()) + + + } + + fun categoriesRowMapper() = RowMapper { rs, _ -> + val category = Category( + type = if (rs.getString("type_code") == "EXPENSE") CategoryType("EXPENSE", "Траты") else CategoryType( + "INCOME", + "Поступления" + ), + name = rs.getString("name"), + description = rs.getString("description"), + icon = rs.getString("icon") + ) + + return@RowMapper category + + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/RecurrentRepoSQL.kt b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/RecurrentRepoSQL.kt new file mode 100644 index 0000000..f5d3735 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/RecurrentRepoSQL.kt @@ -0,0 +1,38 @@ +package space.luminic.budgerapp.repos.sqlrepo + +import org.slf4j.LoggerFactory +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.jdbc.core.RowMapper +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Recurrent +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.TransactionType +import space.luminic.budgerapp.services.CategoryService + + +@Repository +class RecurrentRepoSQL( + private val jdbcTemplate: JdbcTemplate, + private val categoryService: CategoryService +) { + private val logger = LoggerFactory.getLogger(RecurrentRepoSQL::class.java) + + fun getRecurrents(): List { + return jdbcTemplate.query("SELECT r.*, c.name as c_name FROM budger.recurrent_payments r join budger.categories c on r.category_id = c.id ", recurrentRowMapper()) + } + + + fun recurrentRowMapper() = RowMapper { rs, _ -> + + val recurrent = Recurrent( + atDay = rs.getInt("at_day"), + category = categoryService.getCategoryByName(rs.getString("c_name")).block()!!, + name = rs.getString("name"), + description = rs.getString("description"), + amount = rs.getInt("amount") + ) + logger.info(recurrent.toString()) + return@RowMapper recurrent + + } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/TransactionsRepoSQl.kt b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/TransactionsRepoSQl.kt new file mode 100644 index 0000000..cf146da --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/repos/sqlrepo/TransactionsRepoSQl.kt @@ -0,0 +1,65 @@ +package space.luminic.budgerapp.repos.sqlrepo + +import org.slf4j.LoggerFactory +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.jdbc.core.RowMapper +import org.springframework.stereotype.Repository +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.TransactionType +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.repos.CategoryRepoOld +import space.luminic.budgerapp.repos.UserRepoOld +import space.luminic.budgerapp.services.CategoryService +import space.luminic.budgerapp.services.UserService +import java.sql.SQLException +import java.time.LocalDate +import java.time.ZoneId + + +@Repository +class TransactionsRepoSQl( + private val jdbcTemplate: JdbcTemplate, + private val userRepoOld: UserRepoOld, + private val categoryRepoOld: CategoryRepoOld +) { + + private val logger = LoggerFactory.getLogger(TransactionsRepoSQl::class.java) + + + fun getTransactions(): List { + + + return jdbcTemplate.query( + "SELECT tt.code as tt_code, tt.name as tt_name, u.username, c.name as c_name, t.comment, t.date, t.amount, t.is_done, t.created_at, t.id" + + " FROM budger.transactions t" + + " JOIN budger.transaction_types tt on t.transaction_type_code = tt.code " + + " JOIN budger.categories c on t.category_id = c.id" + + " LEFT JOIN budger.users u on t.user_id = u.id", transactionRowMapper() + ) + } + + + fun transactionRowMapper() = RowMapper { rs, _ -> + + + val transaction = Transaction( + type = TransactionType(rs.getString("tt_code"), rs.getString("tt_name")), + user = rs.getString("username") + ?.let { userRepoOld.findByUsername(it) } + ?: userRepoOld.findByUsername("voroninv"), + category = categoryRepoOld.findByName(rs.getString("c_name"))!!, + comment = rs.getString("comment"), + date = rs.getDate("date").toLocalDate(), + amount = rs.getDouble("amount"), + isDone = rs.getBoolean("is_done"), + createdAt = rs.getTimestamp("created_at").toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDateTime() + ) + logger.info(transaction.toString()) + return@RowMapper transaction + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/services/AuthService.kt b/src/main/kotlin/space/luminic/budgerapp/services/AuthService.kt new file mode 100644 index 0000000..340429c --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/AuthService.kt @@ -0,0 +1,69 @@ +package space.luminic.budgerapp.services + +import org.springframework.cache.annotation.Cacheable + +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.stereotype.Service +import reactor.core.publisher.Mono +import space.luminic.budgerapp.configs.AuthException +import space.luminic.budgerapp.models.Token +import space.luminic.budgerapp.models.TokenStatus +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.repos.TokenRepo +import space.luminic.budgerapp.repos.UserRepo +import space.luminic.budgerapp.utils.JWTUtil +import java.time.LocalDateTime +import java.time.ZoneId +import java.util.Date +import java.util.UUID + + +@Service +class AuthService( + private val userRepository: UserRepo, + private val tokenRepo: TokenRepo, + private val jwtUtil: JWTUtil + +) { + private val passwordEncoder = BCryptPasswordEncoder() + + fun login(username: String, password: String): Mono { + return userRepository.findByUsername(username) + .flatMap { user -> + if (passwordEncoder.matches(password, user.password)) { + val token = jwtUtil.generateToken(user.username) + val expireAt = Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 10) + tokenRepo.save( + Token( + token = token, + username = username, + issuedAt = LocalDateTime.now(), + expiresAt = LocalDateTime.ofInstant( + expireAt.toInstant(), + ZoneId.systemDefault() + ) + ) + ) + .thenReturn(token) + } else { + Mono.error(AuthException("Invalid credentials")) + } + } + } + + @Cacheable("tokens") + fun isTokenValid(token: String): Mono { +// print("checking token: $token") + return tokenRepo.findByToken(token) + .flatMap { + if (it.status == TokenStatus.ACTIVE && + it.expiresAt.isAfter(LocalDateTime.now()) + ) { + userRepository.findByUsername(it.username) + } else { + Mono.error(AuthException("Token expired")) + } + }.switchIfEmpty(Mono.error(AuthException("User not found"))) + } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/services/BudgetService.kt b/src/main/kotlin/space/luminic/budgerapp/services/BudgetService.kt new file mode 100644 index 0000000..6432946 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/BudgetService.kt @@ -0,0 +1,616 @@ +package space.luminic.budgerapp.services + +import org.slf4j.LoggerFactory +import org.springframework.cache.annotation.CacheEvict +import org.springframework.cache.annotation.Cacheable +import org.springframework.context.event.EventListener +import org.springframework.data.domain.Sort +import org.springframework.data.domain.Sort.Direction +import org.springframework.stereotype.Service +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.BudgetCategory +import space.luminic.budgerapp.models.Transaction +import org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation +import org.springframework.data.mongodb.core.MongoTemplate +import org.springframework.data.mongodb.core.ReactiveMongoTemplate +import org.springframework.data.mongodb.core.aggregation.Aggregation.group +import org.springframework.data.mongodb.core.aggregation.Aggregation.lookup +import org.springframework.data.mongodb.core.aggregation.Aggregation.match +import org.springframework.data.mongodb.core.aggregation.Aggregation.project +import org.springframework.data.mongodb.core.aggregation.Aggregation.sort +import org.springframework.data.mongodb.core.aggregation.Aggregation.unwind +import org.springframework.data.mongodb.core.query.Criteria +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.BudgetDTO +import space.luminic.budgerapp.models.BudgetNotFoundException +import space.luminic.budgerapp.models.PushMessage +import space.luminic.budgerapp.models.SortSetting +import space.luminic.budgerapp.models.TransactionEvent +import space.luminic.budgerapp.models.TransactionEventType + +import space.luminic.budgerapp.models.Warn +import space.luminic.budgerapp.models.WarnSerenity +import space.luminic.budgerapp.repos.BudgetRepo +import space.luminic.budgerapp.repos.WarnRepo + +import java.time.LocalDate + + +import java.util.Optional +import kotlin.collections.get + +@Service +class BudgetService( + val budgetRepo: BudgetRepo, + val warnRepo: WarnRepo, + val transactionService: TransactionService, + val recurrentService: RecurrentService, + val categoryService: CategoryService, + val reactiveMongoTemplate: ReactiveMongoTemplate +) { + + private val logger = LoggerFactory.getLogger(BudgetService::class.java) + + + @EventListener + @CacheEvict(cacheNames = ["budgets"], allEntries = true) + fun handleTransactionEvent(event: TransactionEvent) { + logger.info("Got ${event.eventType} event on transaction ${event.newTransaction.id}") + if (event.newTransaction.category.type?.code == "EXPENSE") { + when (event.eventType) { + TransactionEventType.EDIT -> updateBudgetOnEdit(event) + TransactionEventType.CREATE -> updateBudgetOnCreate(event) + TransactionEventType.DELETE -> updateBudgetOnDelete(event) + } + } +// runBlocking(Dispatchers.IO) { +// updateBudgetWarns( +// budget = budgetRepo.findByDateFromLessThanEqualAndDateToGreaterThan( +// event.newTransaction.date.toLocalDate(), event.newTransaction.date.toLocalDate() +// ) +// ) +// } + } + + fun updateBudgetOnCreate(event: TransactionEvent) { + budgetRepo.findByDateFromLessThanEqualAndDateToGreaterThan( + event.newTransaction.date, event.newTransaction.date + ).flatMap { budget -> + categoryService.getBudgetCategories(budget.dateFrom, budget.dateTo).flatMap { categories -> + val updatedCategories = when (event.newTransaction.type.code) { + "PLANNED" -> Flux.fromIterable(budget.categories) + .map { category -> + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + category.currentLimit += event.newTransaction.amount + } + category + }.collectList() + + "INSTANT" -> Flux.fromIterable(budget.categories) + .map { category -> + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + } + category + }.collectList() + + else -> Mono.just(budget.categories) // Добавляем обработку типа по умолчанию + } + + updatedCategories.flatMap { updated -> + budget.categories = updated + budgetRepo.save(budget) // Сохраняем обновленный бюджет + } + } + }.then() // Гарантируем завершение + .subscribe() // Запускаем выполнение + } + + + fun updateBudgetOnEdit(event: TransactionEvent) { + budgetRepo.findByDateFromLessThanEqualAndDateToGreaterThan( + event.oldTransaction.date, event.oldTransaction.date + ).switchIfEmpty( + Mono.error(BudgetNotFoundException("old budget cannot be null")) + ).then().subscribe() + + budgetRepo.findByDateFromLessThanEqualAndDateToGreaterThan( + event.newTransaction.date, event.newTransaction.date + ).flatMap { budget -> + categoryService.getBudgetCategories(budget.dateFrom, budget.dateTo).flatMap { categories -> + val updatedCategories = when (event.newTransaction.type.code) { + "PLANNED" -> Flux.fromIterable(budget.categories) + .map { category -> + if (category.category.id == event.newTransaction.category.id) { + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + category.currentLimit += event.difference!! + } + } + + category + }.collectList() + + "INSTANT" -> Flux.fromIterable(budget.categories) + .map { category -> + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + } + category + }.collectList() + + else -> Mono.just(budget.categories) // Добавляем обработку типа по умолчанию + } + + updatedCategories.flatMap { updated -> + budget.categories = updated + budgetRepo.save(budget) // Сохраняем обновленный бюджет + } + } + }.then() // Гарантируем завершение + .subscribe() // Запускаем выполнение + } + + + fun updateBudgetOnDelete(event: TransactionEvent) { + budgetRepo.findByDateFromLessThanEqualAndDateToGreaterThan( + event.newTransaction.date, event.newTransaction.date + ).flatMap { budget -> + categoryService.getBudgetCategories(budget.dateFrom, budget.dateTo).flatMap { categories -> + val updatedCategories = when (event.newTransaction.type.code) { + "PLANNED" -> Flux.fromIterable(budget.categories) + .map { category -> + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + category.currentLimit += event.newTransaction.amount + } + category + }.collectList() + + "INSTANT" -> Flux.fromIterable(budget.categories) + .map { category -> + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + } + category + }.collectList() + + else -> Mono.just(budget.categories) // Добавляем обработку типа по умолчанию + } + + updatedCategories.flatMap { updated -> + budget.categories = updated + budgetRepo.save(budget) // Сохраняем обновленный бюджет + } + } + }.then() // Гарантируем завершение + .subscribe() // Запускаем выполнение + } + + + fun updateBudgetTransactions(budget: Budget): Budget { +// budget.plannedExpenses = getBudgetTransactions( +// budget = budget, +// transactionType = "PLANNED", +// categoryType = "EXPENSE", +// sortBy = SortSetting("date", Direction.ASC) +// ) +// budget.plannedIncomes = getBudgetTransactions( +// budget = budget, +// transactionType = "PLANNED", +// categoryType = "INCOME", +// sortBy = SortSetting("date", Direction.ASC) +// ) + return budget + } + + + @Cacheable("budgetsList") + fun getBudgets(sortSetting: SortSetting? = null): Mono> { + val sort = if (sortSetting != null) { + Sort.by(sortSetting.order, sortSetting.by) + } else { + Sort.by(Sort.Direction.DESC, "dateFrom") + } + + return budgetRepo.findAll(sort) + .collectList() // Сбор Flux в Mono> + } + + + // @Cacheable("budgets", key = "#id") + fun getBudget(id: String): Mono { + return budgetRepo.findById(id) + .flatMap { budget -> + val budgetDTO = BudgetDTO( + budget.id, + budget.name, + budget.dateFrom, + budget.dateTo, + budget.createdAt, + categories = budget.categories + ) + + logger.info("Fetching categories and transactions") + val categoriesMono = categoryService.getBudgetCategories(budgetDTO.dateFrom, budgetDTO.dateTo) + val transactionsMono = + transactionService.getTransactionsByTypes(budgetDTO.dateFrom, budgetDTO.dateTo) + + + Mono.zip(categoriesMono, transactionsMono) + .flatMap { tuple -> + val categories = tuple.t1 + val transactions = tuple.t2 + + + Flux.fromIterable(budgetDTO.categories) + .map { category -> + categories[category.category.id]?.let { data -> + category.currentSpent = data["instantAmount"] ?: 0.0 + category.currentPlanned = data["plannedAmount"] ?: 0.0 + } + category + } + .collectList() + .map { updatedCategories -> + budgetDTO.categories = updatedCategories + budgetDTO.plannedExpenses = transactions["plannedExpenses"] as MutableList + budgetDTO.plannedIncomes = transactions["plannedIncomes"] as MutableList + budgetDTO.transactions = transactions["instantTransactions"] as MutableList + + budgetDTO + } + } + } + .doOnError { error -> + logger.error("Error fetching budget: ${error.message}", error) + } + .switchIfEmpty(Mono.error(BudgetNotFoundException("Budget not found with id: $id"))) + } + + +// fun transferBudgets() { +// val budgets = getBudgets() +// budgetRepo.saveAll(budgets) +// +// } +// +// fun getBudgets(): List { +// val budgetIds = budgetRepoSql.getBudgetsIds() +// var budgets = mutableListOf() +// budgetIds.forEach { budgetId -> +// budgets.add(getBudgetSQL(budgetId)!!) +// } +// return budgets +// } + + + @CacheEvict(cacheNames = ["budgets", "budgetsList"], allEntries = true) + fun createBudget(budget: Budget, createRecurrent: Boolean): Mono { + return Mono.zip( + getBudgetByDate(budget.dateFrom).map { Optional.ofNullable(it) } + .switchIfEmpty(Mono.just(Optional.empty())), + getBudgetByDate(budget.dateTo).map { Optional.ofNullable(it) } + .switchIfEmpty(Mono.just(Optional.empty())) + ).flatMap { tuple -> + val startBudget = tuple.t1.orElse(null) + val endBudget = tuple.t2.orElse(null) + + // Проверяем, пересекаются ли бюджеты по датам + if (startBudget != null || endBudget != null) { + return@flatMap Mono.error(IllegalArgumentException("Бюджет с теми же датами найден")) + } + + // Если createRecurrent=true, создаем рекуррентные транзакции + val recurrentsCreation = if (createRecurrent) { + recurrentService.createRecurrentsForBudget(budget) + } else { + Mono.empty() + } + + // Создаем бюджет после возможного создания рекуррентных транзакций + recurrentsCreation.then( + categoryService.getCategoryTransactionPipeline(budget.dateFrom, budget.dateTo) + .flatMap { categories -> + budget.categories = categories + budgetRepo.save(budget) + } + .doOnNext { savedBudget -> + // Выполнение updateBudgetWarns в фоне + updateBudgetWarns(budget = savedBudget) + .doOnError { error -> + // Логируем ошибку, если произошла + println("Error during updateBudgetWarns: ${error.message}") + } + .subscribe() + } + ) + } + } + + + fun getBudgetByDate(date: LocalDate): Mono { + return budgetRepo.findByDateFromLessThanEqualAndDateToGreaterThan(date, date).switchIfEmpty(Mono.empty()) + } + +// fun getBudgetCategorySQL(id: Int): List? { +// var categories = budgetRepoSql.getBudgetCategory(id) +// for (category in categories) { +// categoryService.getCategoryByName(category.category.name)?.let { category.category = it } +// } +// return categories +// } + + fun getBudgetCategories(id: String): Mono> { + return budgetRepo.findById(id).flatMap { budget -> + val lookup = lookup("categories", "category.\$id", "_id", "categoryDetailed") + val unwind = unwind("categoryDetailed") + val projectDouble = project("categoryDetailed", "amount", "date") + .andExpression("{ \$toDouble: \"\$amount\" }").`as`("amount") + val match = match(Criteria.where("date").gte(budget.dateFrom).lt(budget.dateTo)) + val group = group("categoryDetailed").sum("amount").`as`("currentSpent") + val project = project("currentSpent").and("_id").`as`("category") + val sort = sort(Sort.by(Sort.Order.asc("_id"))) + + val aggregation = newAggregation(lookup, unwind, projectDouble, match, group, project, sort) + + reactiveMongoTemplate.aggregate(aggregation, "transactions", BudgetCategory::class.java) + .collectList() // Преобразование результата в список + } + } + + + fun getBudgetTransactionsByType(budgetId: String): Mono>> { + return budgetRepo.findById(budgetId).flatMap { it -> + transactionService.getTransactionsByTypes(it.dateFrom, it.dateTo) + } + } + + fun getBudgetTransactions( + budget: Budget, + transactionType: String? = null, + isDone: Boolean? = null, + categoryType: String? = null, + sortBy: SortSetting? = null + ): Mono> { + val defaultSort = SortSetting("date", Sort.Direction.ASC) // Сортировка по умолчанию + + return transactionService.getTransactions( + dateFrom = budget.dateFrom, + dateTo = budget.dateTo, + transactionType = transactionType, + isDone = isDone, + categoryType = categoryType, + sortSetting = sortBy ?: defaultSort + ).onErrorResume { e -> + Mono.error(RuntimeException("Error fetching transactions: ${e.message}", e)) + } + } + + + @CacheEvict(cacheNames = ["budgets", "budgetsList"], allEntries = true) + fun deleteBudget(budgetId: String): Mono { + return budgetRepo.findById(budgetId) + .switchIfEmpty(Mono.error(BudgetNotFoundException("Budget with id: $budgetId not found"))) + .flatMap { budget -> + transactionService.getTransactionsToDelete(budget.dateFrom, budget.dateTo) + .flatMapMany { transactions -> + Flux.fromIterable(transactions) + .flatMap { transaction -> + transactionService.deleteTransaction(transaction.id!!) + } + } + .then( + budgetRepo.delete(budget) + ) + } + } + + + @CacheEvict(cacheNames = ["budgets", "budgetsList"], allEntries = true) + fun setCategoryLimit(budgetId: String, catId: String, limit: Double): Mono { + return budgetRepo.findById(budgetId).flatMap { budget -> + val catEdit = budget.categories.firstOrNull { it.category.id == catId } + ?: return@flatMap Mono.error(Exception("Category not found in the budget")) + + transactionService.calcTransactionsSum(budget, catId, "PLANNED").flatMap { catPlanned -> + if (catPlanned > limit) { + Mono.error(Exception("Limit can't be less than planned expenses on category. Current planned value: $catPlanned")) + } else { + catEdit.currentLimit = limit + budgetRepo.save(budget).flatMap { + updateBudgetWarns(it) + .thenReturn(catEdit) + } + } + } + } + } + + + fun recalcBudgetCategory(): Mono { + return budgetRepo.findAll(Sort.by(Direction.DESC, "dateFrom")) // Получаем все бюджеты +// .flatMapIterable { budgets -> budgets } // Преобразуем Flux в Flux (итерация по бюджетам) +// .flatMap { budget -> +// logger.warn("HERE $budget") +// Flux.fromIterable(budget.categories) // Преобразуем категории в поток +// .flatMap { category -> +// logger.warn("HERE $category") +// Mono.zip( +// transactionService.calcTransactionsSum(budget, category.category.id!!, "PLANNED"), +// transactionService.calcTransactionsSum(budget, category.category.id!!, "INSTANT", isDone = true), +// transactionService.calcTransactionsSum(budget, category.category.id!!, "PLANNED") +// ).map { (plannedSum, spentSum, limitSum) -> +// category.currentPlanned = plannedSum +// category.currentSpent = spentSum +// category.currentLimit = limitSum +// } +// } +// .then() // Завершаем поток категорий +// .flatMap { updateBudgetWarns(budgetId = budget.id!!) } // Обновляем предупреждения +// } +// .collectList() // Собираем все бюджеты +// .flatMap { budgets -> budgetRepo.saveAll(budgets).collectList() } // Сохраняем все бюджеты + .then() // Завершаем метод + } + + + fun getWarns(budgetId: String, isHide: Boolean? = null): Mono> { + return warnRepo.findAllByBudgetIdAndIsHide(budgetId, isHide == true).collectList() + } + + fun hideWarn(budgetId: String, warnId: String): Mono { + return warnRepo.findById(warnId) // Ищем предупреждение + .flatMap { warn -> + warn.isHide = true // Обновляем поле + warnRepo.save(warn) // Сохраняем изменённое предупреждение + } + } + + + fun updateBudgetWarns(budget: Budget? = null): Mono> { + logger.info("STARTED WARNS UPDATE") + + val finalBudgetMono = budget?.let { Mono.just(it) } + ?: return Mono.just(emptyList()) + + return finalBudgetMono.flatMap { finalBudget -> + if (finalBudget.categories.isEmpty()) { + logger.info("No categories found for budget ${finalBudget.id}") + return@flatMap Mono.just(emptyList()) + } + + val averageSumsMono = transactionService.getAverageSpendingByCategory() + val averageIncomeMono = transactionService.getAverageIncome() + val currentBudgetIncomeMono = transactionService.calcTransactionsSum( + finalBudget, transactionType = "PLANNED", categoryType = "INCOME" + ) + val plannedIncomeMono = transactionService.calcTransactionsSum( + finalBudget, categoryType = "INCOME", transactionType = "PLANNED" + ) + val plannedSavingMono = transactionService.calcTransactionsSum( + finalBudget, categoryId = "675850148198643f121e466a", transactionType = "PLANNED" + ) + + Mono.zip( + averageSumsMono, + averageIncomeMono, + currentBudgetIncomeMono, + plannedIncomeMono, + plannedSavingMono + ).flatMap { tuple -> + val averageSums = tuple.t1 + val averageIncome = tuple.t2 + val currentBudgetIncome = tuple.t3 + val plannedIncome = tuple.t4 + val plannedSaving = tuple.t5 + + Flux.fromIterable(finalBudget.categories) + .flatMap { category -> + processCategoryWarnings( + category, + finalBudget, + averageSums, + averageIncome, + currentBudgetIncome, + plannedIncome, + plannedSaving + ) + } + .collectList() + .flatMap { warns -> + warnRepo.saveAll(warns.filterNotNull()).collectList() + } + .doOnSuccess { logger.info("ENDED WARNS UPDATE") } + .map { it.sortedByDescending { warn -> warn.serenity.sort } } + } + }.doOnError { error -> + logger.error("Error updating budget warns: ${error.message}", error) + }.onErrorResume { + Mono.just(emptyList()) // Возвращаем пустой список в случае ошибки + } + } + + + private fun processCategoryWarnings( + category: BudgetCategory, + finalBudget: Budget, + averageSums: Map, + averageIncome: Double, + currentBudgetIncome: Double, + plannedIncome: Double, + plannedSaving: Double + ): Flux { + val warnsForCategory = mutableListOf>() + + val averageSum = averageSums[category.category.id] ?: 0.0 + val categorySpentRatioInAvgIncome = if (averageIncome > 0.0) averageSum / averageIncome else 0.0 + val projectedAvailableSum = currentBudgetIncome * categorySpentRatioInAvgIncome + val contextAtAvg = "category${category.category.id}atbudget${finalBudget.id}lessavg" + val lowSavingContext = "savingValueLess10atBudget${finalBudget.id}" + + if (averageSum > category.currentLimit) { + val warnMono = warnRepo.findWarnByContext(contextAtAvg) + .switchIfEmpty( + Mono.just( + Warn( + serenity = WarnSerenity.MAIN, + message = PushMessage( + title = "Внимание на ${category.category.name}!", + body = "Лимит меньше средних трат (Среднее: ${averageSum.toInt()} ₽ Текущий лимит: ${category.currentLimit.toInt()} ₽)." + + "\nСредняя доля данной категории в доходах: ${(categorySpentRatioInAvgIncome * 100).toInt()}%." + + "\nПроецируется на текущие поступления: ${projectedAvailableSum.toInt()} ₽", + icon = category.category.icon + ), + budgetId = finalBudget.id!!, + context = contextAtAvg, + isHide = false + ) + ) + ) + warnsForCategory.add(warnMono) + } else { + warnRepo.findWarnByContext(contextAtAvg).flatMap { warnRepo.delete(it).then(Mono.empty()) } + } + + if (category.category.id == "675850148198643f121e466a") { + val savingRatio = if (plannedIncome > 0.0) category.currentLimit / plannedIncome else 0.0 + if (savingRatio < 0.1) { + val warnMono = warnRepo.findWarnByContext(lowSavingContext) + .switchIfEmpty( + Mono.just( + Warn( + serenity = WarnSerenity.IMPORTANT, + message = PushMessage( + title = "Доля сбережений очень мала!", + body = "Текущие плановые сбережения равны ${plannedSaving.toInt()} (${ + (savingRatio * 100).toInt() + }%)! Исправьте!", + icon = category.category.icon + ), + budgetId = finalBudget.id!!, + context = lowSavingContext, + isHide = false + ) + ) + ) + warnsForCategory.add(warnMono) + } else { + warnRepo.findWarnByContext(lowSavingContext) + .flatMap { warnRepo.delete(it).then(Mono.empty()) } + } + } + + return Flux.fromIterable(warnsForCategory).flatMap { it } + } + + +} diff --git a/src/main/kotlin/space/luminic/budgerapp/services/CacheInspector.kt b/src/main/kotlin/space/luminic/budgerapp/services/CacheInspector.kt new file mode 100644 index 0000000..1494da2 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/CacheInspector.kt @@ -0,0 +1,16 @@ +package space.luminic.budgerapp.services + +import org.springframework.cache.CacheManager +import org.springframework.stereotype.Service + +@Service +class CacheInspector(private val cacheManager: CacheManager) { + + fun getCacheContent(cacheName: String): Map? { + val cache = cacheManager.getCache(cacheName) + if (cache != null && cache is org.springframework.cache.concurrent.ConcurrentMapCache) { + return cache.nativeCache as Map + } + return null + } +} diff --git a/src/main/kotlin/space/luminic/budgerapp/services/CategoryService.kt b/src/main/kotlin/space/luminic/budgerapp/services/CategoryService.kt new file mode 100644 index 0000000..32af1d1 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/CategoryService.kt @@ -0,0 +1,362 @@ +package space.luminic.budgerapp.services + + +import org.bson.Document +import org.slf4j.LoggerFactory +import org.springframework.cache.annotation.CacheEvict +import org.springframework.cache.annotation.Cacheable + +import org.springframework.data.mongodb.core.ReactiveMongoTemplate + +import org.springframework.stereotype.Service +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.BudgetCategory +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.CategoryType +import space.luminic.budgerapp.repos.CategoryRepo +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.ZoneId +import java.time.ZoneOffset +import java.util.Date + +import kotlin.jvm.optionals.getOrNull + +@Service +class CategoryService( + private val categoryRepo: CategoryRepo, + private val transactionService: TransactionService, + private val mongoTemplate: ReactiveMongoTemplate +) { + + private val logger = LoggerFactory.getLogger(javaClass) + + fun getCategoryByName(name: String): Mono { + return categoryRepo.findByName(name) + + } + + @Cacheable("getAllCategories") + fun getCategories(): Mono> { + return categoryRepo.findAll().collectList() + } + + @Cacheable("categoryTypes") + fun getCategoryTypes(): List { + var types = mutableListOf() + types.add(CategoryType("EXPENSE", "Траты")) + types.add(CategoryType("INCOME", "Поступления")) + return types + } + + @CacheEvict(cacheNames = ["getAllCategories"],allEntries = true) + fun createCategory(category: Category): Mono { + return categoryRepo.save(category) + } + + @CacheEvict(cacheNames = ["getAllCategories"],allEntries = true) + fun editCategory(category: Category): Mono { + return categoryRepo.findById(category.id!!) // Возвращаем Mono + .flatMap { oldCategory -> + if (oldCategory.type.code != category.type.code) { + return@flatMap Mono.error(IllegalArgumentException("You cannot change category type")) + } + categoryRepo.save(category) // Сохраняем категорию, если тип не изменился + } + } + + @CacheEvict(cacheNames = ["getAllCategories"],allEntries = true) + fun deleteCategory(categoryId: String): Mono { + return categoryRepo.findById(categoryId).switchIfEmpty( + Mono.error(IllegalArgumentException("Category with id: $categoryId not found")) + ).flatMap { + transactionService.getTransactions(categoryId = categoryId) + .flatMapMany { transactions -> + categoryRepo.findByName("Другое").switchIfEmpty( + categoryRepo.save( + Category( + type = CategoryType("EXPENSE", "Траты"), + name = "Другое", + description = "Категория для других трат", + icon = "🚮" + ) + ) + ).flatMapMany { newCategory -> + Flux.fromIterable(transactions).flatMap { transaction -> + transaction.category = newCategory // Присваиваем конкретный объект категории + transactionService.editTransaction(transaction) // Сохраняем изменения + } + } + } + .then(categoryRepo.deleteById(categoryId)) // Удаляем старую категорию + .thenReturn(categoryId) // Возвращаем удалённую категорию + } + } + + + fun getBudgetCategories(dateFrom: LocalDate, dateTo: LocalDate): Mono>> { + logger.info("here cat starts") + val pipeline = listOf( + Document( + "\$lookup", + Document("from", "transactions") + .append( + "let", + Document("categoryId", "\$_id") + ) + .append( + "pipeline", listOf( + Document( + "\$match", + Document( + "\$expr", + Document( + "\$and", listOf( + Document("\$eq", listOf("\$category.\$id", "\$\$categoryId")), + Document( + "\$gte", listOf( + "\$date", + Date.from( + LocalDateTime.of(dateFrom, LocalTime.MIN) + .atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneOffset.UTC).toInstant() + ), + ) + ), + Document( + "\$lt", listOf( + "\$date", + Date.from( + LocalDateTime.of(dateTo, LocalTime.MIN) + .atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneOffset.UTC).toInstant() + ) + ) + ) + ) + ) + ) + ), + Document( + "\$group", + Document("_id", "\$type.code") + .append( + "totalAmount", + Document("\$sum", "\$amount") + ) + ) + ) + ) + .append("as", "transactionSums") + ), + Document( + "\$project", + Document("_id", 1L) + .append( + "plannedAmount", + Document( + "\$arrayElemAt", listOf( + Document( + "\$filter", + Document("input", "\$transactionSums") + .append("as", "sum") + .append( + "cond", + Document("\$eq", listOf("\$\$sum._id", "PLANNED")) + ) + ), 0L + ) + ) + ) + .append( + "instantAmount", + Document( + "\$arrayElemAt", listOf( + Document( + "\$filter", + Document("input", "\$transactionSums") + .append("as", "sum") + .append( + "cond", + Document("\$eq", listOf("\$\$sum._id", "INSTANT")) + ) + ), 0L + ) + ) + ) + ), + Document( + "\$addFields", + Document( + "plannedAmount", + Document("\$ifNull", listOf("\$plannedAmount.totalAmount", 0.0)) + ) + .append( + "instantAmount", + Document("\$ifNull", listOf("\$instantAmount.totalAmount", 0.0)) + ) + ) + ) + + + // Анализ плана выполнения (вывод для отладки) +// getCategoriesExplainReactive(pipeline) +// .doOnNext { explainResult -> +// logger.info("Explain Result: ${explainResult.toJson()}") +// } +// .subscribe() // Этот вызов лучше оставить только для отладки +// + + + return mongoTemplate.getCollection("categories") + .flatMapMany { it.aggregate(pipeline) } + .collectList() + .flatMap { result -> + val categories = result.associate { document -> + val id = document["_id"].toString() + val values = mapOf( + "plannedAmount" to (document["plannedAmount"] as Double? ?: 0.0), + "instantAmount" to (document["instantAmount"] as Double? ?: 0.0) + ) + id to values + } + logger.info("here cat ends") + + Mono.just(categories) + } + } + + + fun getCategoryTransactionPipeline(dateFrom: LocalDate, dateTo: LocalDate): Mono> { + val pipeline = listOf( + Document("\$match", Document("type.code", "EXPENSE")), + Document( + "\$lookup", + Document("from", "transactions") + .append( + "let", + Document("categoryId", "\$_id") + ) + .append( + "pipeline", listOf( + Document( + "\$match", + Document( + "\$expr", + Document( + "\$and", listOf( + Document("\$eq", listOf("\$category.\$id", "\$\$categoryId")), + Document( + "\$gte", listOf( + "\$date", + Date.from( + LocalDateTime.of(dateFrom, LocalTime.MIN) + .atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneOffset.UTC).toInstant() + ) + ) + ), + Document( + "\$lt", listOf( + "\$date", + Date.from( + LocalDateTime.of(dateTo, LocalTime.MIN) + .atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneOffset.UTC).toInstant() + ) + ) + ) + ) + ) + ) + ), + Document( + "\$group", + Document("_id", "\$type.code") + .append( + "totalAmount", + Document("\$sum", "\$amount") + ) + ) + ) + ) + .append("as", "transactionSums") + ), + Document( + "\$project", + Document("_id", 1L) + .append("type", 1L) + .append("name", 1L) + .append("description", 1L) + .append("icon", 1L) + .append( + "plannedAmount", + Document( + "\$arrayElemAt", listOf( + Document( + "\$filter", + Document("input", "\$transactionSums") + .append("as", "sum") + .append( + "cond", + Document("\$eq", listOf("\$\$sum._id", "PLANNED")) + ) + ), 0.0 + ) + ) + ) + .append( + "instantAmount", + Document( + "\$arrayElemAt", listOf( + Document( + "\$filter", + Document("input", "\$transactionSums") + .append("as", "sum") + .append( + "cond", + Document("\$eq", listOf("\$\$sum._id", "INSTANT")) + ) + ), 0.0 + ) + ) + ) + ), + Document( + "\$addFields", + Document( + "plannedAmount", + Document("\$ifNull", listOf("\$plannedAmount.totalAmount", 0.0)) + ) + .append( + "instantAmount", + Document("\$ifNull", listOf("\$instantAmount.totalAmount", 0.0)) + ) + ) + ) + + return mongoTemplate.getCollection("categories") + .flatMapMany { it.aggregate(pipeline, Document::class.java) } + .map { document -> + val catType = document["type"] as Document + BudgetCategory( + currentSpent = document["instantAmount"] as Double, + currentLimit = document["plannedAmount"] as Double, + currentPlanned = document["plannedAmount"] as Double, + category = Category( + document["_id"].toString(), + CategoryType(catType["code"] as String, catType["name"] as String), + name = document["name"] as String, + description = document["description"] as String, + icon = document["icon"] as String + ) + ) + } + .collectList() + .map { it.toMutableList() } + } + + +} diff --git a/src/main/kotlin/space/luminic/budgerapp/services/CustomReactiveUserDetailsService.kt b/src/main/kotlin/space/luminic/budgerapp/services/CustomReactiveUserDetailsService.kt new file mode 100644 index 0000000..865747c --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/CustomReactiveUserDetailsService.kt @@ -0,0 +1,16 @@ +package space.luminic.budgerapp.services +import org.springframework.security.core.userdetails.ReactiveUserDetailsService +import org.springframework.security.core.userdetails.UserDetails +import org.springframework.security.core.userdetails.UserDetailsService +import org.springframework.stereotype.Service +import reactor.core.publisher.Mono + +@Service +class CustomReactiveUserDetailsService( + private val userDetailsService: UserDetailsService // Ваш синхронный сервис +) : ReactiveUserDetailsService { + + override fun findByUsername(username: String): Mono { + return Mono.fromCallable { userDetailsService.loadUserByUsername(username) } + } +} diff --git a/src/main/kotlin/space/luminic/budgerapp/services/RecurrentService.kt b/src/main/kotlin/space/luminic/budgerapp/services/RecurrentService.kt new file mode 100644 index 0000000..fa46d27 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/RecurrentService.kt @@ -0,0 +1,128 @@ +package space.luminic.budgerapp.services + + +import org.slf4j.LoggerFactory +import org.springframework.cache.annotation.CacheEvict +import org.springframework.cache.annotation.Cacheable +import org.springframework.security.core.context.ReactiveSecurityContextHolder +import org.springframework.stereotype.Service +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.NotFoundException +import space.luminic.budgerapp.models.Recurrent +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.TransactionType +import space.luminic.budgerapp.repos.RecurrentRepo +import space.luminic.budgerapp.repos.TransactionRepo +import space.luminic.budgerapp.repos.sqlrepo.RecurrentRepoSQL +import java.math.BigDecimal +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.YearMonth +import kotlin.jvm.optionals.getOrNull + + +@Service +class RecurrentService( + private val recurrentRepo: RecurrentRepo, + private val recurrentRepoSQL: RecurrentRepoSQL, + private val transactionRepo: TransactionRepo, + private val userService: UserService, +) { + + private val logger = LoggerFactory.getLogger(javaClass) + + @Cacheable("recurrentsList") + fun getRecurrents(): Mono> { + return recurrentRepo.findAll().collectList() + } + + @Cacheable("recurrents", key = "#id") + fun getRecurrentById(id: String): Mono { + return recurrentRepo.findById(id) + .switchIfEmpty(Mono.error(NotFoundException("Recurrent with id: $id not found"))) + } + + + @CacheEvict(cacheNames = ["recurrentsList", "recurrents"]) + fun createRecurrent(recurrent: Recurrent): Mono { + return if (recurrent.id == null && recurrent.atDay <= 31) recurrentRepo.save(recurrent) else Mono.error( + RuntimeException("Cannot create recurrent with id or date cannot be higher than 31") + ) + } + + @CacheEvict(cacheNames = ["recurrentsList", "recurrents"]) + fun createRecurrentsForBudget(budget: Budget): Mono { + val currentYearMonth = YearMonth.of(budget.dateFrom.year, budget.dateFrom.monthValue) + val daysInCurrentMonth = currentYearMonth.lengthOfMonth() + val context = ReactiveSecurityContextHolder.getContext() + .doOnNext { println("Security context: $it") } + .switchIfEmpty(Mono.error(IllegalStateException("SecurityContext is empty!"))) + return context + .map { + logger.debug(it.authentication.name) + it.authentication + } + .flatMap { authentication -> + val username = authentication.name + userService.getByUsername(username) + .switchIfEmpty(Mono.error(IllegalArgumentException("User not found for username: $username"))) + } + .flatMapMany { user -> + recurrentRepo.findAll() + .map { recurrent -> + // Определяем дату транзакции + val transactionDate = when { + recurrent.atDay <= daysInCurrentMonth && recurrent.atDay >= budget.dateFrom.dayOfMonth -> { + currentYearMonth.atDay(recurrent.atDay) + } + + recurrent.atDay < budget.dateFrom.dayOfMonth -> { + currentYearMonth.atDay(recurrent.atDay).plusMonths(1) + } + + else -> { + val extraDays = recurrent.atDay - daysInCurrentMonth + currentYearMonth.plusMonths(1).atDay(extraDays) + } + } + + // Создаем транзакцию + Transaction( + date = transactionDate, + amount = recurrent.amount.toDouble(), + category = recurrent.category, + isDone = false, + comment = recurrent.name, + user = user, + type = TransactionType("PLANNED", "Запланированные") + ) + } + } + .collectList() // Собираем все транзакции в список + .flatMap { transactions -> + transactionRepo.saveAll(transactions) // Сохраняем все транзакции разом + .then() // Возвращаем Mono + } + } + + + fun editRecurrent(recurrent: Recurrent): Mono { + return if (recurrent.id != null && recurrent.atDay <= 31) recurrentRepo.save(recurrent) else Mono.error( + RuntimeException("Cannot edit recurrent without id or date cannot be higher than 31") + ) + } + + fun deleteRecurrent(id: String): Mono { + return recurrentRepo.deleteById(id) + } + + + fun transferRecurrents() { + recurrentRepo.saveAll(recurrentRepoSQL.getRecurrents()).then().subscribe() + + } + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/services/SubscriptionService.kt b/src/main/kotlin/space/luminic/budgerapp/services/SubscriptionService.kt new file mode 100644 index 0000000..7f60491 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/SubscriptionService.kt @@ -0,0 +1,100 @@ +package space.luminic.budgerapp.services + +import com.interaso.webpush.VapidKeys +import com.interaso.webpush.WebPushService +import kotlinx.serialization.json.Json +import kotlinx.serialization.encodeToString +import org.slf4j.LoggerFactory +import org.springframework.dao.DuplicateKeyException + + +import org.springframework.stereotype.Service +import reactor.core.publisher.Mono + +import space.luminic.budgerapp.models.PushMessage +import space.luminic.budgerapp.models.Subscription +import space.luminic.budgerapp.models.SubscriptionDTO +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.repos.SubscriptionRepo +import space.luminic.budgerapp.services.VapidConstants.VAPID_PRIVATE_KEY +import space.luminic.budgerapp.services.VapidConstants.VAPID_PUBLIC_KEY +import space.luminic.budgerapp.services.VapidConstants.VAPID_SUBJECT +import java.security.GeneralSecurityException + +object VapidConstants { + const val VAPID_PUBLIC_KEY = + "BKmMyBUhpkcmzYWcYsjH_spqcy0zf_8eVtZo60f7949TgLztCmv3YD0E_vtV2dTfECQ4sdLdPK3ICDcyOkCqr84" + const val VAPID_PRIVATE_KEY = "YeJH_0LhnVYN6RdxMidgR6WMYlpGXTJS3HjT9V3NSGI" + const val VAPID_SUBJECT = "mailto:voroninvyu@gmail.com" +} + +@Service +class SubscriptionService(private val subscriptionRepo: SubscriptionRepo) { + + private val logger = LoggerFactory.getLogger(javaClass) + private val pushService = + WebPushService( + subject = VAPID_SUBJECT, + vapidKeys = VapidKeys.fromUncompressedBytes(VAPID_PUBLIC_KEY, VAPID_PRIVATE_KEY) + ) + + fun sendNotification(endpoint: String, p256dh: String, auth: String, payload: PushMessage): Mono { + return Mono.fromRunnable { + pushService.send( + payload = Json.encodeToString(payload), + endpoint = endpoint, + p256dh = p256dh, + auth = auth + ) + } + .doOnSuccess { + logger.info("Уведомление успешно отправлено на endpoint: $endpoint") + } + .doOnError { e -> + logger.error("Ошибка при отправке уведомления на endpoint $endpoint: ${e.message}") + } + .onErrorResume { e -> + Mono.error(e) // Пробрасываем ошибку дальше, если нужна обработка выше + } + } + + + fun sendToAll(payload: PushMessage): Mono> { + return subscriptionRepo.findAll() + .flatMap { sub -> + sendNotification(sub.endpoint, sub.p256dh, sub.auth, payload) + .then(Mono.just("${sub.user?.username} at endpoint ${sub.endpoint}")) + .onErrorResume { e -> + sub.isActive = false + subscriptionRepo.save(sub).then(Mono.empty()) + } + } + .collectList() // Собираем результаты в список + } + + + fun subscribe(subscriptionDTO: SubscriptionDTO, user: User): Mono { + val subscription = Subscription( + id = null, + user = user, + endpoint = subscriptionDTO.endpoint, + auth = subscriptionDTO.keys["auth"].orEmpty(), + p256dh = subscriptionDTO.keys["p256dh"].orEmpty(), + isActive = true + ) + + return subscriptionRepo.save(subscription) + .flatMap { savedSubscription -> + Mono.just("Subscription created with ID: ${savedSubscription.id}") + } + .onErrorResume(DuplicateKeyException::class.java) { + logger.info("Subscription already exists. Skipping.") + Mono.just("Subscription already exists. Skipping.") + } + .onErrorResume { e -> + logger.error("Error while saving subscription: ${e.message}") + Mono.error(RuntimeException("Error while saving subscription")) + } + } + +} diff --git a/src/main/kotlin/space/luminic/budgerapp/services/TokenService.kt b/src/main/kotlin/space/luminic/budgerapp/services/TokenService.kt new file mode 100644 index 0000000..48ae009 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/TokenService.kt @@ -0,0 +1,42 @@ +package space.luminic.budgerapp.services +import org.springframework.cache.annotation.CacheEvict +import org.springframework.cache.annotation.Cacheable +import org.springframework.stereotype.Service +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Token +import space.luminic.budgerapp.models.TokenStatus +import space.luminic.budgerapp.repos.TokenRepo +import java.time.LocalDateTime + +@Service +class TokenService(private val tokenRepository: TokenRepo) { + + @CacheEvict("tokens", allEntries = true) + fun saveToken(token: String, username: String, expiresAt: LocalDateTime) { + val newToken = Token( + token = token, + username = username, + issuedAt = LocalDateTime.now(), + expiresAt = expiresAt + ) + tokenRepository.save(newToken) + } + + @CacheEvict("tokens", allEntries = true) + fun revokeToken(token: String): Mono { + return tokenRepository.findByToken(token) + .flatMap { existingToken -> + val updatedToken = existingToken.copy(status = TokenStatus.REVOKED) + tokenRepository.save(updatedToken).then() + } + .switchIfEmpty(Mono.error(Exception("Token not found"))) + } + + + + + @CacheEvict("tokens", allEntries = true) + fun deleteExpiredTokens() { + tokenRepository.deleteByExpiresAtBefore(LocalDateTime.now()) + } +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/services/TransactionService.kt b/src/main/kotlin/space/luminic/budgerapp/services/TransactionService.kt new file mode 100644 index 0000000..707d3d8 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/TransactionService.kt @@ -0,0 +1,784 @@ +package space.luminic.budgerapp.services + +import com.mongodb.client.model.Aggregates.addFields +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import kotlinx.coroutines.runBlocking +import org.bson.Document +import org.bson.types.ObjectId +import org.slf4j.LoggerFactory +import org.springframework.cache.annotation.CacheEvict +import org.springframework.cache.annotation.Cacheable +import org.springframework.context.ApplicationEventPublisher +import org.springframework.data.domain.Sort +import org.springframework.data.domain.Sort.Direction +import org.springframework.data.mongodb.MongoExpression + +import org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation +import org.springframework.data.mongodb.core.MongoTemplate +import org.springframework.data.mongodb.core.ReactiveMongoTemplate +import org.springframework.data.mongodb.core.aggregation.AddFieldsOperation +import org.springframework.data.mongodb.core.aggregation.Aggregation +import org.springframework.data.mongodb.core.aggregation.Aggregation.ROOT +import org.springframework.data.mongodb.core.aggregation.Aggregation.group +import org.springframework.data.mongodb.core.aggregation.Aggregation.lookup +import org.springframework.data.mongodb.core.aggregation.Aggregation.match +import org.springframework.data.mongodb.core.aggregation.Aggregation.project +import org.springframework.data.mongodb.core.aggregation.Aggregation.sort +import org.springframework.data.mongodb.core.aggregation.Aggregation.unwind +import org.springframework.data.mongodb.core.aggregation.Aggregation.addFields +import org.springframework.data.mongodb.core.aggregation.Aggregation.limit +import org.springframework.data.mongodb.core.aggregation.Aggregation.skip +import org.springframework.data.mongodb.core.aggregation.AggregationExpression +import org.springframework.data.mongodb.core.aggregation.AggregationResults +import org.springframework.data.mongodb.core.aggregation.ArrayOperators +import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.filter +import org.springframework.data.mongodb.core.aggregation.ConditionalOperators +import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ifNull +import org.springframework.data.mongodb.core.aggregation.DateOperators +import org.springframework.data.mongodb.core.aggregation.DateOperators.DateToString +import org.springframework.data.mongodb.core.aggregation.LookupOperation +import org.springframework.data.mongodb.core.aggregation.MatchOperation + + +import org.springframework.data.mongodb.core.query.Criteria +import org.springframework.data.mongodb.core.query.Query +import org.springframework.data.mongodb.core.query.update +import org.springframework.security.core.context.ReactiveSecurityContextHolder + + +import org.springframework.stereotype.Service +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.CategoryType + +import space.luminic.budgerapp.models.SortSetting +import space.luminic.budgerapp.models.SortTypes +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.models.TransactionEvent +import space.luminic.budgerapp.models.TransactionEventType +import space.luminic.budgerapp.models.TransactionType +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.repos.TransactionRepo + +import java.math.BigDecimal +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.ZoneId +import java.time.ZoneOffset +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter +import java.time.temporal.TemporalAdjusters +import java.util.ArrayList +import java.util.Arrays +import java.util.Date +import kotlin.jvm.optionals.getOrNull + +@Service +class TransactionService( + private val mongoTemplate: MongoTemplate, + private val reactiveMongoTemplate: ReactiveMongoTemplate, + val transactionsRepo: TransactionRepo, + val userService: UserService, + private val eventPublisher: ApplicationEventPublisher +) { + + private val logger = LoggerFactory.getLogger(TransactionService::class.java) + + @Cacheable("transactions") + fun getTransactions( + dateFrom: LocalDate? = null, + dateTo: LocalDate? = null, + transactionType: String? = null, + isDone: Boolean? = null, + categoryId: String? = null, + categoryType: String? = null, + userId: String? = null, + parentId: String? = null, + isChild: Boolean? = null, + sortSetting: SortSetting? = null, + limit: Int? = null, + offset: Int? = null, + ): Mono> { + val matchCriteria = mutableListOf() + + // Добавляем фильтры + dateFrom?.let { matchCriteria.add(Criteria.where("date").gte(it)) } + dateTo?.let { matchCriteria.add(Criteria.where("date").lt(it)) } + transactionType?.let { matchCriteria.add(Criteria.where("type.code").`is`(it)) } + isDone?.let { matchCriteria.add(Criteria.where("isDone").`is`(it)) } + categoryId?.let { matchCriteria.add(Criteria.where("categoryDetails._id").`is`(it)) } + categoryType?.let { matchCriteria.add(Criteria.where("categoryDetails.type.code").`is`(it)) } + userId?.let { matchCriteria.add(Criteria.where("userDetails._id").`is`(ObjectId(it))) } + parentId?.let { matchCriteria.add(Criteria.where("parentId").`is`(it)) } + isChild?.let { matchCriteria.add(Criteria.where("parentId").exists(it)) } + + // Сборка агрегации + val lookup = lookup("categories", "category.\$id", "_id", "categoryDetails") + val lookupUsers = lookup("users", "user.\$id", "_id", "userDetails") + val match = match(Criteria().andOperator(*matchCriteria.toTypedArray())) + + var sort = sort(Sort.by(Direction.DESC, "date").and(Sort.by(Direction.DESC, "createdAt"))) + + sortSetting?.let { + sort = sort(Sort.by(it.order, it.by).and(Sort.by(Direction.ASC, "createdAt"))) + } + + val aggregationBuilder = mutableListOf( + lookup, + lookupUsers, + match.takeIf { matchCriteria.isNotEmpty() }, + sort, + offset?.let { skip(it.toLong()) }, + limit?.let { limit(it.toLong()) } + ).filterNotNull() + + val aggregation = newAggregation(aggregationBuilder) + + return reactiveMongoTemplate.aggregate( + aggregation, "transactions", Transaction::class.java + ) + .collectList() // Преобразуем Flux в Mono> + .map { it.toMutableList() } + } + + fun getTransactionsToDelete(dateFrom: LocalDate, dateTo: LocalDate): Mono> { + val criteria = Criteria().andOperator( + Criteria.where("date").gte(dateFrom), + Criteria.where("date").lte(dateTo), + Criteria().orOperator( + Criteria.where("type.code").`is`("PLANNED"), + Criteria.where("parentId").exists(true) + ) + ) + +// Пример использования в MongoTemplate: + val query = Query(criteria) + +// Если вы хотите использовать ReactiveMongoTemplate: + return reactiveMongoTemplate.find(query, Transaction::class.java) + .collectList() + .doOnNext { transactions -> println("Found transactions: $transactions") } + } + + + + @Cacheable("transactions") + fun getTransactionById(id: String): Mono { + return transactionsRepo.findById(id) + .map { + it + } + .switchIfEmpty( + Mono.error(IllegalArgumentException("Transaction with id: $id not found")) + ) + } + + + @CacheEvict(cacheNames = ["transactions"], allEntries = true) + fun createTransaction(transaction: Transaction): Mono { + return ReactiveSecurityContextHolder.getContext() + .map { it.authentication } // Получаем Authentication из SecurityContext + .flatMap { authentication -> + val username = authentication.name // Имя пользователя из токена + // Получаем пользователя и сохраняем транзакцию + userService.getByUsername(username) + .switchIfEmpty(Mono.error(IllegalArgumentException("User not found for username: $username"))) + .flatMap { user -> + transaction.user = user + transactionsRepo.save(transaction) + .doOnNext { savedTransaction -> + // Публикуем событие после сохранения + eventPublisher.publishEvent( + TransactionEvent( + this, + TransactionEventType.CREATE, + newTransaction = savedTransaction, + oldTransaction = savedTransaction + ) + ) + } + .map { it.id!! } // Возвращаем ID сохраненной транзакции + } + } + } + + + @CacheEvict(cacheNames = ["transactions"], allEntries = true) + + fun editTransaction(transaction: Transaction): Mono { + return transactionsRepo.findById(transaction.id!!) + .flatMap { oldStateOfTransaction -> + val changed = compareSumDateDoneIsChanged(oldStateOfTransaction, transaction) + if (!changed) { + return@flatMap transactionsRepo.save(transaction) // Сохраняем, если изменений нет + } + + val amountDifference = transaction.amount - oldStateOfTransaction.amount + + // Обработка дочерней транзакции + handleChildTransaction(oldStateOfTransaction, transaction, amountDifference) + .then(transactionsRepo.save(transaction)) // Сохраняем основную транзакцию + .doOnSuccess { savedTransaction -> + eventPublisher.publishEvent( + TransactionEvent( + this, + TransactionEventType.EDIT, + newTransaction = savedTransaction, + oldTransaction = oldStateOfTransaction, + difference = amountDifference + ) + ) + } + } + .switchIfEmpty( + Mono.error(IllegalArgumentException("Transaction not found with id: ${transaction.id}")) + ) + } + + private fun handleChildTransaction( + oldTransaction: Transaction, + newTransaction: Transaction, + amountDifference: Double + ): Mono { + return transactionsRepo.findByParentId(newTransaction.id!!) + .flatMap { childTransaction -> + logger.info(childTransaction.toString()) + // Если родительская транзакция обновлена, обновляем дочернюю + childTransaction.amount = newTransaction.amount + childTransaction.category = newTransaction.category + childTransaction.comment = newTransaction.comment + childTransaction.user = newTransaction.user + transactionsRepo.save(childTransaction) + } + .switchIfEmpty( + Mono.defer { + // Создание новой дочерней транзакции, если требуется + if (!oldTransaction.isDone && newTransaction.isDone) { + val newChildTransaction = newTransaction.copy( + id = null, + type = TransactionType("INSTANT", "Текущие"), + parentId = newTransaction.id + ) + transactionsRepo.save(newChildTransaction).doOnSuccess { savedChildTransaction -> + eventPublisher.publishEvent( + TransactionEvent( + this, + TransactionEventType.CREATE, + newTransaction = savedChildTransaction, + oldTransaction = oldTransaction, + difference = amountDifference + ) + ) + } + } else Mono.empty() + } + ) + .flatMap { + // Удаление дочерней транзакции, если родительская помечена как не выполненная + if (oldTransaction.isDone && !newTransaction.isDone) { + transactionsRepo.findByParentId(newTransaction.id!!) + .flatMap { child -> + deleteTransaction(child.id!!) + }.then() + } else { + Mono.empty() + } + } + } + + + fun compareSumDateDoneIsChanged(t1: Transaction, t2: Transaction): Boolean { + return if (t1.amount != t2.amount) { + true + } else if (t1.date != t2.date) { + true + } else if (t1.isDone != t2.isDone) { + true + } else if (t1.category.id != t2.category.id) { + return true + } else { + return false + } + } + + @CacheEvict(cacheNames = ["transactions"], allEntries = true) + fun deleteTransaction(transactionId: String): Mono { + return transactionsRepo.findById(transactionId) + .flatMap { transactionToDelete -> + transactionsRepo.deleteById(transactionId) // Удаляем транзакцию + .then( + Mono.fromRunnable { + // Публикуем событие после успешного удаления + eventPublisher.publishEvent( + TransactionEvent( + this, + TransactionEventType.DELETE, + newTransaction = transactionToDelete, + oldTransaction = transactionToDelete + ) + ) + } + ) + } + + } + + +// @CacheEvict(cacheNames = ["transactions", "childTransactions"], allEntries = true) +// fun setTransactionDone(transaction: Transaction): Transaction { +// val oldStateTransaction = transactionsRepo.findById(transaction.id!!) +// .orElseThrow { RuntimeException("Transaction ${transaction.id} not found") } +// +// if (transaction.isDone) { +// if (oldStateTransaction.isDone) { +// throw RuntimeException("Transaction ${transaction.id} is already done") +// } +// +// // Создание дочерней транзакции +// val childTransaction = transaction.copy( +// id = null, +// type = TransactionType("INSTANT", "Текущие"), +// parentId = transaction.id +// ) +// createTransaction(childTransaction) +// } else { +// // Удаление дочерней транзакции, если она существует +// transactionsRepo.findByParentId(transaction.id!!).getOrNull()?.let { +// deleteTransaction(it.id!!) +// } ?: logger.warn("Child transaction of parent ${transaction.id} not found") +// } +// +// return editTransaction(transaction) +// } + + + @Cacheable("childTransactions", key = "#parentId") + fun getChildTransaction(parentId: String): Mono { + return transactionsRepo.findByParentId(parentId) + } + +// fun getTransactionByOldId(id: Int): Transaction? { +// return transactionsRepo.findByOldId(id).getOrNull() +// } + +// fun transferTransactions(): Mono { +// var transactions = transactionsRepoSQl.getTransactions() +// return transactionsRepo.saveAll(transactions).then() +// } +// + + fun calcTransactionsSum( + budget: Budget, + categoryId: String? = null, + categoryType: String? = null, + transactionType: String? = null, + isDone: Boolean? = null + ): Mono { + val matchCriteria = mutableListOf() + + // Добавляем фильтры + matchCriteria.add(Criteria.where("date").gte(budget.dateFrom)) + matchCriteria.add(Criteria.where("date").lt(budget.dateTo)) + categoryId?.let { matchCriteria.add(Criteria.where("category.\$id").`is`(ObjectId(it))) } + categoryType?.let { matchCriteria.add(Criteria.where("categoryDetails.type.code").`is`(it)) } + transactionType?.let { matchCriteria.add(Criteria.where("type.code").`is`(it)) } + isDone?.let { matchCriteria.add(Criteria.where("isDone").`is`(it)) } + + // Сборка агрегации + val lookup = lookup("categories", "category.\$id", "_id", "categoryDetails") + val unwind = unwind("categoryDetails") + val match = match(Criteria().andOperator(*matchCriteria.toTypedArray())) + val project = project("category").andExpression("{ \$toDouble: \"\$amount\" }").`as`("amount") + val group = group(categoryId ?: "all").sum("amount").`as`("totalSum") + val projectSum = project("totalSum") + val aggregation = newAggregation(lookup, unwind, match, project, group, projectSum) + + return reactiveMongoTemplate.aggregate(aggregation, "transactions", Map::class.java) + .map { result -> + val totalSum = result["totalSum"] + if (totalSum is Double) { + totalSum + } else { + 0.0 + } + } + .reduce(0.0) { acc, sum -> acc + sum } // Суммируем значения, если несколько результатов + } + + + // @Cacheable("transactions") + fun getAverageSpendingByCategory(): Mono> { + val firstDateOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()) + + val lookup = lookup("categories", "category.\$id", "_id", "categoryDetails") + val unwind = unwind("categoryDetails") + val match = match( + Criteria.where("categoryDetails.type.code").`is`("EXPENSE") + .and("type.code").`is`("INSTANT") + .and("date").lt(firstDateOfMonth) + ) + val projectDate = project("_id", "category", "amount", "categoryDetails") + .and(DateToString.dateOf("date").toString("%Y-%m")).`as`("month") + .andExpression("{ \$toDouble: \"\$amount\" }").`as`("amount") + val groupByMonthAndCategory = group("month", "category.\$id").sum("amount").`as`("sum") + val groupByCategory = group("_id.id").avg("sum").`as`("averageAmount") + val project = project() + .and("_id").`as`("category") + .and("averageAmount").`as`("avgAmount") + val sort = sort(Sort.by(Sort.Order.asc("_id"))) + + val aggregation = newAggregation( + lookup, unwind, match, projectDate, groupByMonthAndCategory, groupByCategory, project, sort + ) + + return reactiveMongoTemplate.aggregate(aggregation, "transactions", Map::class.java) + .collectList() + .map { results -> + results.associate { result -> + val category = result["category"]?.toString() ?: "Unknown" + val avgAmount = (result["avgAmount"] as? Double) ?: 0.0 + category to avgAmount + } + } + .defaultIfEmpty(emptyMap()) // Возвращаем пустую карту, если результатов нет + } + + + @Cacheable("transactionTypes") + fun getTransactionTypes(): List { + var types = mutableListOf() + types.add(TransactionType("PLANNED", "Плановые")) + types.add(TransactionType("INSTANT", "Текущие")) + return types + } + + fun getAverageIncome(): Mono { + val lookup = lookup("categories", "category.\$id", "_id", "detailedCategory") + + val unwind = unwind("detailedCategory") + + val match = match( + Criteria.where("detailedCategory.type.code").`is`("INCOME") + .and("type.code").`is`("INSTANT") + .and("isDone").`is`(true) + ) + + val project = project("_id", "category", "detailedCategory") + .and(DateToString.dateOf("date").toString("%Y-%m")).`as`("month") + .andExpression("{ \$toDouble: \"\$amount\" }").`as`("amount") + + val groupByMonth = group("month").sum("amount").`as`("sum") + + val groupForAverage = group("avgIncomeByMonth").avg("sum").`as`("averageAmount") + + val aggregation = newAggregation(lookup, unwind, match, project, groupByMonth, groupForAverage) + + return reactiveMongoTemplate.aggregate(aggregation, "transactions", Map::class.java) + .singleOrEmpty() // Ожидаем только один результат + .map { result -> + result["averageAmount"] as? Double ?: 0.0 + } + .defaultIfEmpty(0.0) // Если результат пустой, возвращаем 0.0 + } + + + fun getTransactionsByTypes(dateFrom: LocalDate, dateTo: LocalDate): Mono>> { + logger.info("here tran starts") + val pipeline = listOf( + Document( + "\$lookup", + Document("from", "categories") + .append("localField", "category.\$id") + .append("foreignField", "_id") + .append("as", "categoryDetailed") + ), + Document( + "\$lookup", + Document("from", "users") + .append("localField", "user.\$id") + .append("foreignField", "_id") + .append("as", "userDetailed") + ), + Document( + "\$unwind", + Document("path", "\$categoryDetailed").append("preserveNullAndEmptyArrays", true) + ), + Document( + "\$unwind", + Document("path", "\$userDetailed").append("preserveNullAndEmptyArrays", true) + ), + Document( + "\$match", + Document( + "\$and", listOf( + Document( + "date", + Document( + "\$gte", + Date.from( + LocalDateTime.of(dateFrom, LocalTime.MIN) + .atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneOffset.UTC) + .toInstant() + ) + ) + ), + Document( + "date", + Document( + "\$lt", + Date.from( + LocalDateTime.of(dateTo, LocalTime.MAX) + .atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneOffset.UTC) + .toInstant() + ) + ) + ) + ) + ) + ), + Document( + "\$facet", + Document( + "plannedExpenses", + listOf( + Document( + "\$match", + Document("type.code", "PLANNED") + .append("categoryDetailed.type.code", "EXPENSE") + ), + Document("\$sort", Document("date", 1).append("_id", 1)) + ) + ) + .append( + "plannedIncomes", + listOf( + Document( + "\$match", + Document("type.code", "PLANNED") + .append("categoryDetailed.type.code", "INCOME") + ), + Document("\$sort", Document("date", 1).append("_id", 1)) + ) + ) + .append( + "instantTransactions", + listOf( + Document("\$match", Document("type.code", "INSTANT")), + Document("\$sort", Document("date", 1).append("_id", 1)) + ) + ) + ) + ) + +// getCategoriesExplainReactive(pipeline) +// .doOnNext { explainResult -> +// logger.info("Explain Result: ${explainResult.toJson()}") +// } +// .subscribe() // Этот вызов лучше оставить только для отладки + return reactiveMongoTemplate.getCollection("transactions") + .flatMapMany { it.aggregate(pipeline, Document::class.java) } + .single() // Получаем только первый результат агрегации + .flatMap { aggregationResult -> + Mono.zip( + extractTransactions(aggregationResult, "plannedExpenses"), + extractTransactions(aggregationResult, "plannedIncomes"), + extractTransactions(aggregationResult, "instantTransactions") + ).map { tuple -> + val plannedExpenses = tuple.t1 + val plannedIncomes = tuple.t2 + val instantTransactions = tuple.t3 + logger.info("here tran ends") + mapOf( + "plannedExpenses" to plannedExpenses, + "plannedIncomes" to plannedIncomes, + "instantTransactions" to instantTransactions + ) + + + } + + } + + + } + + fun getCategoriesExplainReactive(pipeline: List): Mono { + val command = Document("aggregate", "transactions") + .append("pipeline", pipeline) + .append("explain", true) + + return reactiveMongoTemplate.executeCommand(command) + } + + private fun extractTransactions(aggregationResult: Document, key: String): Mono> { + val resultTransactions = aggregationResult[key] as? List ?: emptyList() + return Flux.fromIterable(resultTransactions) + .map { documentToTransactionMapper(it) } + .collectList() + } + + + private fun documentToTransactionMapper(document: Document): Transaction { + val transactionType = document["type"] as Document + var user: User? = null + + val userDocument = document["userDetailed"] as Document + user = User( + id = (userDocument["_id"] as ObjectId).toString(), + username = userDocument["username"] as String, + firstName = userDocument["firstName"] as String, + tgId = userDocument["tgId"] as String, + tgUserName = userDocument["tgUserName"]?.let { it as String }, + password = null, + isActive = userDocument["isActive"] as Boolean, + regDate = userDocument["regDate"] as Date, + createdAt = userDocument["createdAt"] as Date, + roles = userDocument["roles"] as ArrayList, + ) + + + val categoryDocument = document["categoryDetailed"] as Document + val categoryTypeDocument = categoryDocument["type"] as Document + val category = Category( + id = (categoryDocument["_id"] as ObjectId).toString(), + type = CategoryType(categoryTypeDocument["code"] as String, categoryTypeDocument["name"] as String), + name = categoryDocument["name"] as String, + description = categoryDocument["description"] as String, + icon = categoryDocument["icon"] as String + ) + return Transaction( + (document["_id"] as ObjectId).toString(), + TransactionType( + transactionType["code"] as String, + transactionType["name"] as String + ), + user = user!!, + category = category, + comment = document["comment"] as String, + date = (document["date"] as Date).toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), + amount = document["amount"] as Double, + isDone = document["isDone"] as Boolean, + parentId = if (document["parentId"] != null) document["parentId"] as String else null, + createdAt = LocalDateTime.ofInstant((document["createdAt"] as Date).toInstant(), ZoneOffset.UTC), + ) + + } +// fun getPlannedForBudget(budget: Budget, transactionType: String? = null): List> { +// // 1) $lookup: "categories" +// val lookupCategories = Aggregation.lookup( +// "categories", +// "category.\$id", +// "_id", +// "categoryDetailed" +// ) +// +// // 2) $lookup: "budgets" (pipeline + let) +// val matchBudgetsDoc = Document( +// "\$expr", Document( +// "\$and", listOf( +// Document("\$gte", listOf("\$\$transactionDate", "\$dateFrom")), +// Document("\$lt", listOf("\$\$transactionDate", "\$dateTo")) +// ) +// ) +// ) +// val matchBudgetsOp = MatchOperation(matchBudgetsDoc) +// +// val lookupBudgets = LookupOperation.newLookup() +// .from("budgets") +// .letValueOf("transactionDate").bindTo("date") +// .pipeline(matchBudgetsOp) +// .`as`("budgetDetails") +// +// // 3) $unwind +// val unwindCategory = Aggregation.unwind("categoryDetailed") +// val unwindBudget = Aggregation.unwind("budgetDetails") +// +// // 4) $match: диапазон дат +// val matchDates = Aggregation.match( +// Criteria("date") +// .gte(budget.dateFrom) +// .lt(budget.dateTo) +// ) +// +// // 5) $facet (разные ветки: plannedExpenses, plannedExpensesSum, ...) +// // plannedExpenses +// val plannedExpensesMatch = Aggregation.match( +// Criteria().andOperator( +// Criteria("type.code").`is`("PLANNED"), +// Criteria("categoryDetailed.type.code").`is`("EXPENSE") +// ) +// ) +// val plannedExpensesPipeline = listOf(plannedExpensesMatch) +// +// // plannedExpensesSum +// val plannedExpensesSumPipeline = listOf( +// plannedExpensesMatch, +// group(null).`as`("_id").sum("amount").`as`("sum"), +// project("sum").andExclude("_id") +// ) +// +// // plannedIncome +// val plannedIncomeMatch = Aggregation.match( +// Criteria().andOperator( +// Criteria("type.code").`is`("PLANNED"), +// Criteria("categoryDetailed.type.code").`is`("INCOME") +// ) +// ) +// val plannedIncomePipeline = listOf(plannedIncomeMatch) +// +// // plannedIncomeSum +// val plannedIncomeSumPipeline = listOf( +// plannedIncomeMatch, +// group().`as`("_id").sum("amount").`as`("sum"), +// project("sum").andExclude("_id") +// ) +// +// // instantTransactions +// val instantTransactionsMatch = Aggregation.match( +// Criteria("type.code").`is`("INSTANT") +// ) +// val instantTransactionsProject = Aggregation.project( +// "_id", "type", "comment", "user", "amount", "date", +// "category", "isDone", "createdAt", "parentId" +// ) +// val instantTransactionsPipeline = listOf(instantTransactionsMatch, instantTransactionsProject) +// +// val facetStage = Aggregation.facet(*plannedExpensesPipeline.toTypedArray()).`as`("plannedExpenses") +// .and(*plannedExpensesSumPipeline.toTypedArray()).`as`("plannedExpensesSum") +// .and(*plannedIncomePipeline.toTypedArray()).`as`("plannedIncome") +// .and(*plannedIncomeSumPipeline.toTypedArray()).`as`("plannedIncomeSum") +// .and(*instantTransactionsPipeline.toTypedArray()).`as`("instantTransactions") +// +// // 6) $set: вытаскиваем суммы из массивов +// val setStage = AddFieldsOperation.builder() +// .addField("plannedExpensesSum").withValue( +// ArrayOperators.ArrayElemAt.arrayOf("\$plannedExpensesSum.sum").elementAt(0) +// ) +// .addField("plannedIncomeSum").withValue( +// ArrayOperators.ArrayElemAt.arrayOf("\$plannedIncomeSum.sum").elementAt(0) +// ) +// .build() +// +// // Собираем все стадии +// val aggregation = Aggregation.newAggregation( +// lookupCategories, +// lookupBudgets, +// unwindCategory, +// unwindBudget, +// matchDates, +// facetStage, +// setStage +// ) +// +// val results = mongoTemplate.aggregate(aggregation, "transactions", Map::class.java) +// return results.mappedResults +// } + + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/services/TransferService.kt b/src/main/kotlin/space/luminic/budgerapp/services/TransferService.kt new file mode 100644 index 0000000..dbe6558 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/TransferService.kt @@ -0,0 +1,50 @@ +package space.luminic.budgerapp.services + +import org.springframework.stereotype.Service +import reactor.core.publisher.Flux +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.Budget +import space.luminic.budgerapp.models.Category +import space.luminic.budgerapp.models.Transaction +import space.luminic.budgerapp.repos.BudgetRepo +import space.luminic.budgerapp.repos.CategoryRepo +import space.luminic.budgerapp.repos.TransactionRepo +import space.luminic.budgerapp.repos.sqlrepo.BudgetRepoSQL +import space.luminic.budgerapp.repos.sqlrepo.CategoriesRepoSQL +import space.luminic.budgerapp.repos.sqlrepo.TransactionsRepoSQl + +@Service +class TransferService( + private val transactionsRepoSQl: TransactionsRepoSQl, + private val categoriesRepoSQL: CategoriesRepoSQL, + private val budgetRepoSQL: BudgetRepoSQL, + private val categoryRepo: CategoryRepo, + private val transactionRepo: TransactionRepo, + private val budgetService: BudgetService +) { + + fun getTransactions(): Mono> { + val transactions = transactionsRepoSQl.getTransactions() + return transactionRepo.saveAll(transactions).collectList() + } + + + fun getCategories(): Mono> { + val categories = categoriesRepoSQL.getCategories() + + return Flux.fromIterable(categories) + .flatMap { category -> categoryRepo.save(category) } + .collectList() // Преобразуем Flux в Mono> + } + + + fun transferBudgets(): Mono> { + val budgets = budgetRepoSQL.getBudgets() + return Flux.fromIterable(budgets) + .flatMap { budget -> + budgetService.createBudget(budget.budget, budget.createRecurrent) + }.collectList() + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/services/UserService.kt b/src/main/kotlin/space/luminic/budgerapp/services/UserService.kt new file mode 100644 index 0000000..119fc12 --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/services/UserService.kt @@ -0,0 +1,57 @@ +package space.luminic.budgerapp.services + + +import org.slf4j.LoggerFactory +import org.springframework.cache.annotation.Cacheable +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.stereotype.Service +import reactor.core.publisher.Mono +import space.luminic.budgerapp.models.NotFoundException +import space.luminic.budgerapp.models.User +import space.luminic.budgerapp.repos.UserRepo +import kotlin.jvm.optionals.getOrNull + +@Service +class UserService(val userRepo: UserRepo, val passwordEncoder: PasswordEncoder) { + val logger = LoggerFactory.getLogger(javaClass) + + +// fun regenPass(): List? { +// var users = getUsers()!!.toMutableList() +// for (user in users) { +// user.password = passwordEncoder.encode(user.password) +// } +// userRepo.saveAll(users) +// return users +// } + + @Cacheable("users", key = "#username") + fun getByUsername(username: String): Mono { + return userRepo.findByUsernameWOPassword(username).switchIfEmpty( + Mono.error(NotFoundException("User with username: $username not found")) + ) + + } + + fun getById(id: String): Mono { + return userRepo.findById(id) + .map { user -> + user.apply { password = null } // Убираем пароль + } + .switchIfEmpty(Mono.error(Exception("User not found"))) // Обрабатываем случай, когда пользователь не найден + } + + + @Cacheable("users", key = "#username") + fun getByUserNameWoPass(username: String): Mono { + return userRepo.findByUsernameWOPassword(username) + } + + fun getUsers(): Mono> { + return userRepo.findAll() + .map { user -> user.apply { password = null } } // Убираем пароль + .collectList() // Преобразуем Flux в Mono> + .doOnNext { logger.debug("Users fetched successfully: ${it.size} users found") } + } + +} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/utils/DateSerializer.kt b/src/main/kotlin/space/luminic/budgerapp/utils/DateSerializer.kt new file mode 100644 index 0000000..83deebd --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/utils/DateSerializer.kt @@ -0,0 +1,19 @@ +package space.luminic.budgerapp.utils + +import com.fasterxml.jackson.core.JsonParser +import com.fasterxml.jackson.databind.DeserializationContext +import com.fasterxml.jackson.databind.JsonDeserializer +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter +import java.util.Date + +//class DateSerializer : JsonDeserializer() { +// +// private val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") // Пример формата +// +// override fun deserialize(p: JsonParser, ctxt: DeserializationContext): LocalDateTime { +// val dateAsString = p.text +// var date = formatter.parse(dateAsString) +// return LocalDateTime.from(date, LocalDateTime.MIN ) // Преобразуем строку в LocalDateTime +// } +//} \ No newline at end of file diff --git a/src/main/kotlin/space/luminic/budgerapp/utils/JWTUtil.kt b/src/main/kotlin/space/luminic/budgerapp/utils/JWTUtil.kt new file mode 100644 index 0000000..4c672cc --- /dev/null +++ b/src/main/kotlin/space/luminic/budgerapp/utils/JWTUtil.kt @@ -0,0 +1,54 @@ +package space.luminic.budgerapp.utils + +import io.jsonwebtoken.Jwts + +import io.jsonwebtoken.security.Keys +import org.springframework.stereotype.Component + +import space.luminic.budgerapp.services.TokenService +import java.time.LocalDateTime +import java.time.ZoneId +import java.util.* + +@Component +class JWTUtil(private val tokenService: TokenService) { + + private val key = Keys.hmacShaKeyFor("MyTusimMyFleximMyEstSilaNasNeVzlomayutEtoNevozmozhno".toByteArray()) + + + fun generateToken(username: String): String { + val expireAt = Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 10) + val token = Jwts.builder() + .setSubject(username) + .setIssuedAt(Date()) + .setExpiration(expireAt) // 10 дней + .signWith(key) + .compact() + tokenService.saveToken( + token, + username, + LocalDateTime.from( + expireAt.toInstant().atZone(ZoneId.systemDefault()) + .toLocalDateTime() + ) + ) + return token + + } + + fun validateToken(token: String): String? { + return try { + val claims = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token) + claims.body.subject + } catch (e: io.jsonwebtoken.ExpiredJwtException) { + println("Token expired: ${e.message}") + null + } catch (e: io.jsonwebtoken.SignatureException) { + println("Invalid token signature: ${e.message}") + null + } catch (e: Exception) { + println("Token validation error: ${e.message}") + null + } + } +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..8a78cc8 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,24 @@ +spring.application.name=budger-app + +spring.data.mongodb.host=127.0.0.1 +spring.data.mongodb.port=27017 +spring.data.mongodb.database=budger-app + + +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always + + + +spring.datasource.url=jdbc:postgresql://213.183.51.243/familybudget_app +spring.datasource.username=familybudget_app +spring.datasource.password=FB1q2w3e4r! + + +# ??????? JDBC +spring.datasource.driver-class-name=org.postgresql.Driver + +# ????????? Hibernate +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.hibernate.ddl-auto=none + diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..853bb20 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,25 @@ +spring.application.name=budger-app + + +spring.data.mongodb.host=213.226.71.138 +spring.data.mongodb.port=27017 +spring.data.mongodb.database=budger-app +spring.data.mongodb.username=budger-app +spring.data.mongodb.password=BA1q2w3e4r! +spring.data.mongodb.authentication-database=admin + + +spring.datasource.url=jdbc:postgresql://213.183.51.243/familybudget_app +spring.datasource.username=familybudget_app +spring.datasource.password=FB1q2w3e4r! + + +logging.level.org.springframework.web=INFO +logging.level.org.springframework.data = INFO +logging.level.org.springframework.data.mongodb.core.ReactiveMongoTemplate=INFO +logging.level.org.springframework.security = INFO +logging.level.org.springframework.data.mongodb.code = INFO +logging.level.org.springframework.web.reactive=INFO + + + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..ae76798 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,29 @@ +spring.application.name=budger-app + +server.port=8082 +#server.servlet.context-path=/api +spring.webflux.base-path=/api + +spring.profiles.active=prod +spring.main.web-application-type=reactive + + + +logging.level.org.springframework.web=DEBUG +logging.level.org.springframework.data = DEBUG +logging.level.org.springframework.data.mongodb.core.ReactiveMongoTemplate=DEBUG +logging.level.org.springframework.security = DEBUG +logging.level.org.springframework.data.mongodb.code = DEBUG +logging.level.org.springframework.web.reactive=DEBUG + +server.compression.enabled=true +server.compression.mime-types=application/json + + +# ??????? JDBC +spring.datasource.driver-class-name=org.postgresql.Driver + +# ????????? Hibernate +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.hibernate.ddl-auto=none + diff --git a/src/test/kotlin/space/luminic/budgerapp/BudgerAppApplicationTests.kt b/src/test/kotlin/space/luminic/budgerapp/BudgerAppApplicationTests.kt new file mode 100644 index 0000000..7376192 --- /dev/null +++ b/src/test/kotlin/space/luminic/budgerapp/BudgerAppApplicationTests.kt @@ -0,0 +1,13 @@ +package space.luminic.budgerapp + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +class BudgerAppApplicationTests { + + @Test + fun contextLoads() { + } + +}