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

Revert "chore: code refactoring to enhance readability." #2

Merged
merged 1 commit into from
Nov 20, 2023
+44 −54
Merged

Revert "chore: code refactoring to enhance readability." #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,6 @@
<groupId>com.github.buckelieg</groupId>
<artifactId>minify-maven-plugin</artifactId>
<version>2.0.1</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.1</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>default-minify</id>
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/nonononoki/alovoa/lib/OxCaptcha.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
public class OxCaptcha {
private static final Random RAND = new SecureRandom();
// private static final Random RAND = new Random();
private static final double TWO_PI = 6.2831853071795862D;

private BufferedImage _img;
private Graphics2D _img_g;
Expand Down Expand Up @@ -1046,8 +1045,7 @@ private void shearX(Graphics2D g, int period, int phase, int width, int height)
int frames = 15;

for (int i = 0; i < height; i++) {
double angle = (double) i / (double) period + (TWO_PI * phase) / frames;
double d = (period >> 1) * Math.sin(angle);
double d = (period >> 1) * Math.sin((double) i / (double) period + (6.2831853071795862D * phase) / frames);
g.copyArea(0, i, width, 1, (int) d, 0);
g.setColor(_bg_color);
if (d >= 0) {
Expand All @@ -1064,7 +1062,7 @@ private void shearY(Graphics2D g, int period, int phase, int width, int height)
int frames = 15;

for (int i = 0; i < width; i++) {
double d = (period >> 1) * Math.sin((float) i / period + (TWO_PI * phase) / frames);
double d = (period >> 1) * Math.sin((float) i / period + (6.2831853071795862D * phase) / frames);
g.copyArea(i, 0, 1, height, 0, (int) d);
g.setColor(_bg_color);
if (d >= 0) {
Expand Down
13 changes: 9 additions & 4 deletions src/main/java/com/nonononoki/alovoa/repo/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,17 @@ default List<User> adminSearch() {
// used for sending mails to all
List<User> findByDisabledFalseAndAdminFalseAndConfirmedTrue();

List<User> findTop100ActiveUsersOrderedByCreationDate();
List<User> findTop100ByDisabledFalseAndAdminFalseAndConfirmedTrueAndIntentionNotNullAndLocationLatitudeNotNullAndProfilePictureNotNullOrderByDatesCreationDateDesc();

List<User> findTop200FilteredUsers(Date min, Date max, Collection<Long> likeIds, Collection<Long> hideIds, Collection<Long> blockIds, Collection<Long> genderIds, Sort sort);
List<User> findTop200ByDisabledFalseAndAdminFalseAndConfirmedTrueAndIntentionNotNullAndLocationLatitudeNotNullAndProfilePictureNotNullAndDatesDateOfBirthGreaterThanEqualAndDatesDateOfBirthLessThanEqualAndIdNotInAndIdNotInAndIdNotInAndGenderIdIn(
Date min, Date max, Collection<Long> likeIds, Collection<Long> hideIds, Collection<Long> blockIds,
Collection<Long> genderIds, Sort sort);

List<User> findTop50ActiveUsersWithProfileIntentionInRangeAndExcludedIds(Date min, Date max, Collection<Long> likeIds, Collection<Long> hideIds, Collection<Long> blockIds, Sort sort);
List<User> findTop50ByDisabledFalseAndAdminFalseAndConfirmedTrueAndIntentionNotNullAndLocationLatitudeNotNullAndProfilePictureNotNullAndDatesDateOfBirthGreaterThanEqualAndDatesDateOfBirthLessThanEqualAndIdNotInAndIdNotInAndIdNotIn(
Date min, Date max, Collection<Long> likeIds, Collection<Long> hideIds, Collection<Long> blockIds,
Sort sort);

// users donate
List<User> findTop20ActiveDonors(Date minDate, Date maxDate);
List<User> findTop20ByDisabledFalseAndAdminFalseAndConfirmedTrueAndIntentionNotNullAndLocationLatitudeNotNullAndProfilePictureNotNullAndDatesDateOfBirthGreaterThanEqualAndDatesDateOfBirthLessThanEqualOrderByTotalDonationsDesc(
Date minDate, Date maxDate);
}
42 changes: 18 additions & 24 deletions src/main/java/com/nonononoki/alovoa/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@ public class UserService {

public static void removeUserDataCascading(User user, UserDeleteParams userDeleteParam) {

removeUserLikes(user, userDeleteParam.getUserLikeRepo(), userDeleteParam.getUserRepo());
removeUserNotifications(user, userDeleteParam.getUserNotificationRepo(), userDeleteParam.getUserRepo());
removeUserHides(user, userDeleteParam.getUserHideRepo(), userDeleteParam.getUserRepo());
removeUserBlocks(user, userDeleteParam.getUserBlockRepo(), userDeleteParam.getUserRepo());
removeUserReports(user, userDeleteParam.getUserReportRepo(), userDeleteParam.getUserRepo());
removeUserConversations(user, userDeleteParam.getConversationRepo(), userDeleteParam.getUserRepo());
removeUserVerifications(user, userDeleteParam.getUserVerificationPictureRepo());
}

private static void removeUserLikes(User user, UserLikeRepository userLikeRepo, UserRepository userRepo) {
UserRepository userRepo = userDeleteParam.getUserRepo();
UserLikeRepository userLikeRepo = userDeleteParam.getUserLikeRepo();
ConversationRepository conversationRepo = userDeleteParam.getConversationRepo();
UserNotificationRepository userNotificationRepo = userDeleteParam.getUserNotificationRepo();
UserHideRepository userHideRepo = userDeleteParam.getUserHideRepo();
UserBlockRepository userBlockRepo = userDeleteParam.getUserBlockRepo();
UserReportRepository userReportRepo = userDeleteParam.getUserReportRepo();
UserVerificationPictureRepository userVerificationPictureRepo = userDeleteParam.getUserVerificationPictureRepo();

// DELETE USER LIKE
for (UserLike like : userLikeRepo.findByUserFrom(user)) {
User u = like.getUserTo();
if (u != null && u.getLikedBy() != null) {
Expand All @@ -153,9 +153,8 @@ private static void removeUserLikes(User user, UserLikeRepository userLikeRepo,
}
userRepo.flush();
userLikeRepo.flush();
}

private static void removeUserNotifications(User user, UserNotificationRepository userNotificationRepo, UserRepository userRepo) {
// DELETE USER NOTIFICATION
for (UserNotification notification : userNotificationRepo.findByUserFrom(user)) {
User u = notification.getUserTo();
if (u != null && u.getNotificationsFrom() != null) {
Expand All @@ -176,9 +175,8 @@ private static void removeUserNotifications(User user, UserNotificationRepositor
}
userRepo.flush();
userNotificationRepo.flush();
}

private static void removeUserHides(User user, UserHideRepository userHideRepo, UserRepository userRepo) {
// DELETE USER HIDE
for (UserHide hide : userHideRepo.findByUserFrom(user)) {
User u = hide.getUserTo();
if (u != null && u.getHiddenByUsers() != null) {
Expand All @@ -200,9 +198,8 @@ private static void removeUserHides(User user, UserHideRepository userHideRepo,
}
userRepo.flush();
userHideRepo.flush();
}

private static void removeUserBlocks(User user, UserBlockRepository userBlockRepo, UserRepository userRepo) {
// DELETE USER BLOCK
for (UserBlock block : userBlockRepo.findByUserFrom(user)) {
User u = block.getUserTo();
if (u != null && u.getBlockedByUsers() != null) {
Expand All @@ -223,9 +220,8 @@ private static void removeUserBlocks(User user, UserBlockRepository userBlockRep
}
userRepo.flush();
userBlockRepo.flush();
}

private static void removeUserReports(User user, UserReportRepository userReportRepo, UserRepository userRepo) {
// DELETE USER REPORT
for (UserReport report : userReportRepo.findByUserFrom(user)) {
User u = report.getUserTo();
if (u != null && u.getReportedByUsers() != null) {
Expand All @@ -246,9 +242,8 @@ private static void removeUserReports(User user, UserReportRepository userReport
}
userRepo.flush();
userReportRepo.flush();
}

private static void removeUserConversations(User user, ConversationRepository conversationRepo, UserRepository userRepo) {
// DELETE USER CONVERSATION
for (Conversation c : conversationRepo.findByUsers_Id(user.getId())) {
for (User u : c.getUsers()) {
if (u != null && u.getConversations() != null) {
Expand All @@ -258,11 +253,8 @@ private static void removeUserConversations(User user, ConversationRepository co
}
conversationRepo.delete(c);
}
conversationRepo.flush();
userRepo.flush();
}

private static void removeUserVerifications(User user, UserVerificationPictureRepository userVerificationPictureRepo) {
// DELETE USER VERIFICATION
for (UserVerificationPicture v : userVerificationPictureRepo.findByUserNo(user)) {
v.getUserNo().remove(user);
userVerificationPictureRepo.save(v);
Expand All @@ -273,6 +265,8 @@ private static void removeUserVerifications(User user, UserVerificationPictureRe
}

userVerificationPictureRepo.flush();
conversationRepo.flush();
userRepo.flush();
}

public static String stripB64Type(String s) {
Expand Down
26 changes: 13 additions & 13 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ spring.datasource.url=jdbc:mariadb://localhost:3306/alovoa?createDatabaseIfNotEx
#spring.datasource.hikari.maxLifetime=1800000

#Insert your oauth2 ids and secrets here
spring.security.oauth2.client.registration.google.client-id=test
spring.security.oauth2.client.registration.google.client-secret=test
spring.security.oauth2.client.registration.facebook.client-id=test
spring.security.oauth2.client.registration.facebook.client-secret=test
#spring.security.oauth2.client.registration.google.client-id=<your client id>
#spring.security.oauth2.client.registration.google.client-secret=<your client secret>
#spring.security.oauth2.client.registration.facebook.client-id=<your client id>
#spring.security.oauth2.client.registration.facebook.client-secret=<your client secret>

#we keep the default /login/oauth2/code/{registrationId} scheme

Expand Down Expand Up @@ -55,17 +55,17 @@ spring.jpa.properties.hibernate.plan_parameter_metadata_max_size=16
spring.jpa.properties.hibernate.query.in_clause_parameter_padding=true

### KEYS AND CREDENTIALS ###
spring.datasource.password=
spring.datasource.username=root
#spring.datasource.password=
#spring.datasource.username=
#keys for transparent database encryption
app.text.key=bqupWgmhCj3fedLxYdNAy2QFA2bS9XJX
app.text.salt=sFRKQAhwdrZq44FQ
app.admin.email=admin@alovoa.com
app.admin.key=password
spring.mail.password=ahiuoplndlkqyarc
spring.mail.host=smtp.gmail.com
#app.text.key= #key must be 16, 24 or 32 bytes long
#app.text.salt= #salt must be 16 bytes long
#app.admin.email=
#app.admin.key=
#spring.mail.password=<login password to smtp server>
spring.mail.host=mail.gmx.net
spring.mail.port=587
spring.mail.username=sruthidalho@gmail.com
spring.mail.username=nonononoki@gmx.de
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.test-connection=true
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/application-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
spring.datasource.url=jdbc:mariadb://localhost:3306/alovoa_test?createDatabaseIfNotExist=true&serverTimezone=UTC&useLegacyDatetimeCode=false
spring.datasource.username=root
spring.datasource.password=
spring.datasource.username=alovoa_test
spring.datasource.password=alovoa_test
spring.jpa.properties.hibernate.id.db_structure_naming_strategy=standard

# keys for transparent database encryption
Expand Down