gCubeSystem
/
social-networking-library
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix

This commit is contained in:
Ahmed Salah Tawfik Ibrahim 2024-04-12 17:01:16 +02:00
parent 8b6f4ccf2f
commit 29471627da
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,7 +4,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v2.0.0] - 2023-12-04 ## [v2.0.0-SNAPSHOT] - 2023-12-04
- Support for Cassandra 4.1.3 using DataStax java driver - Support for Cassandra 4.1.3 using DataStax java driver

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId> <artifactId>social-networking-library</artifactId>
<version>2.0.0</version> <version>2.0.0-SNAPSHOT</version>
<name>gCube Social Networking Library</name> <name>gCube Social Networking Library</name>
<description> <description>
The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities. The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities.

36
src/main/java/org/gcube/portal/databook/server/DBCassandraAstyanaxImpl.java
View File

@ -2190,24 +2190,28 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
public List<NotificationChannelType> getUserNotificationChannels(String userid, NotificationType notificationType) throws NotificationChannelTypeNotFoundException, NotificationTypeNotFoundException { public List<NotificationChannelType> getUserNotificationChannels(String userid, NotificationType notificationType) throws NotificationChannelTypeNotFoundException, NotificationTypeNotFoundException {
_log.info("Asking for Single Notification preference of " + userid + " Type: " + notificationType); _log.info("Asking for Single Notification preference of " + userid + " Type: " + notificationType);
List<NotificationChannelType> toReturn = new ArrayList<NotificationChannelType>(); List<NotificationChannelType> toReturn = new ArrayList<NotificationChannelType>();
NotificationChannelType[] toProcess = getUserNotificationPreferences(userid).get(notificationType); Map<NotificationType, NotificationChannelType[]> userNotPref = getUserNotificationPreferences(userid);
//_log.info("size of user notification preferences" + toProcess.length); if(userNotPref!=null){
if (toProcess == null) { NotificationChannelType[] toProcess = userNotPref.get(notificationType);
_log.info("Single Notification preference of " + userid + " Type: " + notificationType + " not existing ... creating default"); //_log.info("size of user notification preferences" + toProcess.length);
return createNewNotificationType(userid, notificationType); if (toProcess == null) {
} _log.info("Single Notification preference of " + userid + " Type: " + notificationType + " not existing ... creating default");
else if (toProcess.length == 0){ return createNewNotificationType(userid, notificationType);
_log.info("size of user notification preferences " + 0); }
return toReturn; else if (toProcess.length == 0){
} _log.info("size of user notification preferences " + 0);
else return toReturn;
{ }
_log.info("size of user notification preferences " + toProcess.length); else
for (int i = 0; i < toProcess.length; i++) { {
toReturn.add(toProcess[i]); _log.info("size of user notification preferences " + toProcess.length);
for (int i = 0; i < toProcess.length; i++) {
toReturn.add(toProcess[i]);
}
return toReturn;
} }
return toReturn;
} }
return toReturn;
} }
/** /**