Skip to content

Fix/remove env #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
monkey-keeper wants to merge 82 commits into
base: main
Choose a base branch
from
Open

Fix/remove env #31

Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
cb8abf5
Create README.md
AliKamil Nov 19, 2024
22ce182
Update README.md
AliKamil Nov 19, 2024
ec2a4e0
Update README.md
AliKamil Nov 19, 2024
011e163
Merge pull request #1 from AliKamil/AliKamil-patch-1
AliKamil Nov 19, 2024
578a032
Add entity User
KirillVsMonkey Nov 22, 2024
a48528c
Add entity Subscription
KirillVsMonkey Nov 24, 2024
8a2f220
Fixed gitignore
KirillVsMonkey Nov 26, 2024
fbe339d
Merge pull request #2 from AliKamil/tnews-7/entityUser
monkey-keeper Nov 26, 2024
c43a352
Add connection to DB, create UserService and UserRepository
KirillVsMonkey Nov 27, 2024
d00713c
Add validation for UserCreateDTO
KirillVsMonkey Nov 29, 2024
5c4e519
Merge pull request #3 from AliKamil/tnews-8/connectDB
SHVERR Dec 1, 2024
f91749b
Add .gitignore to exclude IDEA files
SHVERR Nov 24, 2024
e34d8d8
Create gradle.yml
monkey-keeper Dec 1, 2024
9005358
регистрация в боте и привет
SHVERR Dec 2, 2024
8603c68
Update Application.java
SHVERR Dec 2, 2024
f7ed14d
Update Application.java
SHVERR Dec 2, 2024
85ffaea
Merge pull request #4 from AliKamil/monkey-keeper-patch-1
SHVERR Dec 2, 2024
c981b6e
Fix User entity
KirillVsMonkey Dec 2, 2024
6a29e76
Merge pull request #5 from AliKamil/tnews-9/connectTbot
monkey-keeper Dec 2, 2024
64d5355
Some fix
KirillVsMonkey Dec 2, 2024
17ab621
Merge branch 'main' into tnews-8/DbBranch
monkey-keeper Dec 2, 2024
06a1bbd
Add subscription repository
KirillVsMonkey Dec 4, 2024
8115155
Merge branch 'tnews-8/DbBranch' of https://github.com/AliKamil/tnews-…
KirillVsMonkey Dec 4, 2024
b383b07
The connection of the bot with the database
KirillVsMonkey Dec 6, 2024
d79203c
Merge pull request #7 from AliKamil/tnews-11/botConDb
monkey-keeper Dec 7, 2024
50359be
Add category
KirillVsMonkey Dec 7, 2024
49d8cdb
Merge pull request #8 from AliKamil/tnews-11/botConDb2
monkey-keeper Dec 9, 2024
4c09b00
Fix github action ./gradlew permissions
AliKamil Dec 11, 2024
ba0cee7
Merge pull request #9 from AliKamil/fix/gradlew-permissions
AliKamil Dec 11, 2024
2b0ffd7
Add keyWord
KirillVsMonkey Dec 11, 2024
3403c13
Gradlew build rewritten
AliKamil Dec 11, 2024
7e4d5a0
Add h2
AliKamil Dec 11, 2024
2c10373
Test coverage
KirillVsMonkey Dec 12, 2024
b005035
Custom repository for Subscription
AliKamil Dec 17, 2024
59bca61
Merge pull request #10 from AliKamil/tnews-11/addKW
monkey-keeper Dec 17, 2024
0e04661
Fix test and DB connections
KirillVsMonkey Dec 22, 2024
5e99b73
Merge pull request #12 from AliKamil/tnews-11/fixBD
monkey-keeper Dec 22, 2024
24b9129
Add management subscription
KirillVsMonkey Dec 24, 2024
39fd5d0
Added a full user creation cycle
KirillVsMonkey Dec 25, 2024
dd44982
Merge pull request #13 from AliKamil/tnews-12/MS
monkey-keeper Dec 25, 2024
7f3c633
Fix methods
KirillVsMonkey Dec 28, 2024
c7e0cc5
Add DELETE subscription
KirillVsMonkey Dec 29, 2024
81d9a1c
Subscription update not fully added
KirillVsMonkey Dec 29, 2024
65495e4
Merge pull request #14 from AliKamil/tnews-12/FixBranch
monkey-keeper Dec 30, 2024
ce9b5b0
добавлены модули скелета агрегатора
SHVERR Jan 23, 2025
a3359ef
Merge pull request #15 from AliKamil/tnews-17/aggregatorSkeleton
SHVERR Jan 23, 2025
bfac03e
Подключена MongoDB. Доработана структура модулей.
SHVERR Jan 25, 2025
0e19382
Подключена MongoDB. Доработана структура модулей. Fix
SHVERR Jan 25, 2025
24a2c76
Update README.md
SHVERR Jan 25, 2025
1ef703c
Merge pull request #16 from AliKamil/tnews-18/init-mongo
SHVERR Jan 28, 2025
1034a1f
Сhanging the format to xml and adding a subscription to the container
KirillVsMonkey Jan 31, 2025
9860d43
Merge pull request #17 from AliKamil/tnews-20/parseNews
monkey-keeper Feb 1, 2025
e671997
no JSON
KirillVsMonkey Feb 1, 2025
fa98aec
Added fetch and save news
KirillVsMonkey Feb 1, 2025
66608d8
added news scheduler
KirillVsMonkey Feb 2, 2025
1adf5ec
Сleaned up the service
KirillVsMonkey Feb 2, 2025
824d3f0
Merge pull request #19 from AliKamil/tnews-20/fetch
monkey-keeper Feb 2, 2025
8dec40d
Extracting categories from the aggregator
KirillVsMonkey Feb 6, 2025
c5fd1a6
Merge pull request #20 from AliKamil/tnews-23/extracting
monkey-keeper Feb 7, 2025
c34476b
Now you can receive news by category
KirillVsMonkey Feb 7, 2025
cf27a66
Merge pull request #21 from AliKamil/tnews-22/category
monkey-keeper Feb 8, 2025
f6f0e29
Client created
AliKamil Feb 11, 2025
7872072
Dependency fix
AliKamil Feb 17, 2025
be96b1c
Merge pull request #22 from AliKamil/feat/submodule-split-with-client
SHVERR Feb 18, 2025
643a433
Create newsletter
KirillVsMonkey Mar 3, 2025
cd81e4d
Added some logs
KirillVsMonkey Mar 5, 2025
4f6ecea
REmoval of categories works
AliKamil Mar 5, 2025
bf9b1fe
Merge pull request #23 from AliKamil/tnews-25/mailing-news
monkey-keeper Mar 6, 2025
e28c21d
Full processing of category updates
KirillVsMonkey Mar 9, 2025
f98e8d8
Merge pull request #24 from AliKamil/tnews-12/update-categories
monkey-keeper Mar 12, 2025
c17a239
Added build and publish step
AliKamil Mar 12, 2025
455bb4a
Merge pull request #25 from AliKamil/github-actions/build-and-publish
SHVERR Mar 12, 2025
398c2f5
Fix github-action
AliKamil Mar 12, 2025
7dd42a0
Merge pull request #26 from AliKamil/github-actions/build-and-publish
SHVERR Mar 12, 2025
ba629eb
Added test for aggregator
KirillVsMonkey Mar 14, 2025
a4f612d
Added test
KirillVsMonkey Mar 14, 2025
7ae09a5
off test
KirillVsMonkey Mar 14, 2025
552996f
News filtering has been moved to the database
KirillVsMonkey Mar 17, 2025
eb57470
Merge pull request #27 from AliKamil/tnews-24/agrTest
monkey-keeper Mar 17, 2025
e515309
The logic of searching for valid users has been moved to the database
KirillVsMonkey Mar 18, 2025
af92651
Merge pull request #28 from AliKamil/tnews-25/fixDB
monkey-keeper Mar 19, 2025
491fca4
Resolved merge conflicts in README.md and docker-compose.yml
KirillVsMonkey Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.