MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fix notification

This commit is contained in:
Efstratios Giannopoulos 2024-05-14 14:36:45 +03:00
parent ee611ed7e0
commit bd06df58c5
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -56,3 +56,5 @@ backend/target/classes/
backend/core/target/maven-archiver/
backend/node_modules/.yarn-integrity
dmp-frontend/.nx/
notification-service/notification-web/src/main/resources/config/app.env
backend/web/src/main/resources/config/app.env

4
annotation-service/annotation-web/src/main/resources/logging/logback-dev.xml
View File

@ -46,10 +46,6 @@
<appender-ref ref="TROUBLESHOOTING"/>
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
<appender-ref ref="TROUBLESHOOTING"/>
<appender-ref ref="STDOUT"/>
</logger>
<logger name="audit" level="INFO" additivity="false">
<appender-ref ref="AUDITING"/>
<appender-ref ref="STDOUT"/>

2
notification-service/notification-web/src/main/resources/config/notification-devel.yml
View File

@ -486,5 +486,5 @@ notification:
priority-key: null
cipher-fields: [ ]
template-cache:
prefix: ${CACHE_DISAMBIGUATION:}
prefix: ${CACHE_DISAMBIGUATION}
key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0"

4
notification-service/notification-web/src/main/resources/logging/logback-dev.xml
View File

@ -46,10 +46,6 @@
<appender-ref ref="TROUBLESHOOTING"/>
<appender-ref ref="STDOUT"/>
</logger>
<logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
<appender-ref ref="TROUBLESHOOTING"/>
<appender-ref ref="STDOUT"/>
</logger>
<logger name="audit" level="INFO" additivity="false">
<appender-ref ref="AUDITING"/>
<appender-ref ref="STDOUT"/>

27
notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageBuilderServiceImpl.java
View File

@ -108,20 +108,25 @@ public class MessageBuilderServiceImpl implements MessageInfoBuilderService {
if (messageInfo.getTimeZone() == null || messageInfo.getTimeZone().isBlank()) messageInfo.setTimeZone(this.localeService.timezoneName());
if (this.scope.isMultitenant()) {
TenantEntity tenantInfo = this.queryFactory.query(TenantQuery.class)
.isActive(IsActive.Active).firstAs(new BaseFieldSet(TenantEntity._id, TenantEntity._code));
if (this.scope.isDefaultTenant()) {
TenantEntity tenantInfo = this.queryFactory.query(TenantQuery.class)
.isActive(IsActive.Active).firstAs(new BaseFieldSet(TenantEntity._id, TenantEntity._code));
if (tenantInfo == null) {
try {
logger.error("Could not retrieve tenant info for notification {} in tenant {}", notification.getId(), scope.getTenant());
} catch (InvalidApplicationException e) {
throw new RuntimeException(e);
if (tenantInfo == null) {
try {
logger.error("Could not retrieve tenant info for notification {} in tenant {}", notification.getId(), scope.getTenant());
} catch (InvalidApplicationException e) {
throw new RuntimeException(e);
}
throw new MyForbiddenException(this.errors.getMissingTenant().getCode(), this.errors.getMissingTenant().getMessage());
}
throw new MyForbiddenException(this.errors.getMissingTenant().getCode(), this.errors.getMissingTenant().getMessage());
}
messageInfo.setTenantId(tenantInfo.getId());
messageInfo.setTenantCode(tenantInfo.getCode());
messageInfo.setTenantId(tenantInfo.getId());
messageInfo.setTenantCode(tenantInfo.getCode());
} else {
messageInfo.setTenantId(null);
messageInfo.setTenantCode(this.scope.getDefaultTenantCode());
}
}
return messageInfo;