Skip to content
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

Jump to bottom

[WIP] #147 Database Rework #148

Draft
wants to merge 44 commits into
base: main
Choose a base branch
from
Draft

[WIP] #147 Database Rework #148

wants to merge 44 commits into from

Conversation

Cinnazeyy
Copy link
Member

@Cinnazeyy Cinnazeyy commented Feb 10, 2025 •
edited
Loading

This is a draft PR for issue #147 and is not ready to be merged yet!

Biggest things missing:

  • Review rework
  • Implementation of SQL querries in most Providers
  • Test everything
  • Update Tutorial Schematics
  • Write Migration Scripts/Tools

Cinnazeyy and others added 30 commits December 13, 2024 18:50
@Cinnazeyy
add builderprovider and sql implementation
5bcee49
@Cinnazeyy
Add BuildTeamProvider and SQL implementation
17e3df1
@Cinnazeyy
remove interface abstraction
a641300
@LordTuxn
update Builder and BuilderProvider
e518344
@Cinnazeyy
Fix CMD_Plots.java, CMD_Tpll.java and PlotSystem.java
614a75d
@LordTuxn
update BuilderProvider
eaafbf2
@LordTuxn
Merge remote-tracking branch 'origin/main' into update/1.21-data-abst…
455ab72 
…raction

# Conflicts:
#	src/main/java/com/alpsbte/plotsystem/commands/CMD_Plots.java
#	src/main/java/com/alpsbte/plotsystem/core/menus/ReviewPlotMenu.java
#	src/main/java/com/alpsbte/plotsystem/core/system/Builder.java
#	src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java
@Cinnazeyy
Fix all plot commands
28c8d2f
@Cinnazeyy
cleanup commands
4809b64
@Cinnazeyy
fix CMD_Review.java and CMD_UndoReview.java
da81b45
@Cinnazeyy
update all review commands to work with database rework
315c7ba
@Cinnazeyy
add CityProject, Country and Difficulty Providers
3748d11
@Cinnazeyy
open review menu if no args are provided in review command
6ca11f7
@Cinnazeyy
fix errors
9ae7b01
@Cinnazeyy
add Utils.getConfiguredItem
bfa6b90
@Cinnazeyy
extract notices into separate method and fix compiler error
95356f8
@Cinnazeyy
turn CityProject.java into a proper model and extract various methods…
fb60152 
… into providers
@Cinnazeyy
Finish city project model and fix CMD_Setup_City.java
3e51a8b
@Cinnazeyy
Finish BuildTeam model and fix CMD_Setup_BuildTeam.java
d2cbb14
@Cinnazeyy
remove getReviewers method from build team dataprovider
65f83c6
@Cinnazeyy
delete redundant Server.java model and implement ServerProvider.java
2a16654
@Cinnazeyy
start reworking plot generation with database rework
fd90219
@Cinnazeyy
Merge branch 'main' into update/1.21-data-abstraction
6f4c9bc 
# Conflicts:
#	src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_Abandon.java
#	src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_Submit.java
#	src/main/java/com/alpsbte/plotsystem/commands/plot/CMD_Plot_UndoSubmit.java
#	src/main/java/com/alpsbte/plotsystem/core/menus/companion/CityProjectMenu.java
#	src/main/java/com/alpsbte/plotsystem/core/menus/companion/CompanionMenu.java
#	src/main/java/com/alpsbte/plotsystem/core/menus/companion/CountryMenu.java
#	src/main/java/com/alpsbte/plotsystem/core/system/CityProject.java
#	src/main/java/com/alpsbte/plotsystem/core/system/plot/Plot.java
#	src/main/java/com/alpsbte/plotsystem/core/system/plot/generator/DefaultPlotGenerator.java
#	src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java
@Cinnazeyy
fix issues from merging
9a00208
@Cinnazeyy
finish country model and CMD_Setup_Country.java
f21e8c6
@Cinnazeyy
finish difficulty model and CMD_Setup_Difficulty.java
f7092a5
@Cinnazeyy
delete Reviewer class
0e85e98
@Cinnazeyy
Cleanup EventListener and change plottype to be of PlotType type inst…
de48a19 
…ead of int
@Cinnazeyy
delete FTPConfiguration.java!! 🎉🎉🎉
35314a0
@Cinnazeyy
delete Payout.java
f812d25
@Cinnazeyy Cinnazeyy added rework Improvements and changes of an already existing feature high priority labels Feb 10, 2025
This was linked to issues Feb 10, 2025
[Feature] - Updated wiki on database strucutre #89
Open
[Task] - Database Rework #147
Open
@Zoriot Zoriot linked an issue Feb 10, 2025 that may be closed by this pull request
[Bug] - Do not abandon rejected plots due to inactivity #66
Open
@Zoriot
Make the owner head in /p members clickable
e407f87 
There is a new translation, so the people know its clickable. Also, I fixed a bug with disabled tutorial config, where it would never be possible to add someone to a plot. I added a correct message for that.

Improves #66.
Resolves #133.
@Zoriot Zoriot linked an issue Feb 14, 2025 that may be closed by this pull request
[Feature] - Enhance /p members GUI #133
Open
@Zoriot Zoriot linked an issue Feb 18, 2025 that may be closed by this pull request
[Bug] - Add Unit support for tutorial building-height #137
Open
Cinnazeyy and others added 3 commits February 20, 2025 17:39
@Cinnazeyy
implement remaining methods of builder provider
8b09ff3
@Cinnazeyy
Merge remote-tracking branch 'origin/update/1.21-data-abstraction' in…
6f6a993 
…to update/1.21-data-abstraction
@Zoriot
Send a repeated message for unfinished plots
8ceb4ea 
Resolves #118.
Also remove unnecessary config options and use cache to get the plots. The interval is configurable.
@Zoriot Zoriot linked an issue Feb 20, 2025 that may be closed by this pull request
[Feature] - repeated message to remember submitting/abandoning plots #118
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
high priority rework Improvements and changes of an already existing feature
Projects
None yet
Milestone
No milestone
3 participants
@Cinnazeyy @LordTuxn @Zoriot