Commit Graph

36 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou 8918826766 Remove comments. Add getAliases method in stakeholderService. Remove parametersMapping 2024-03-05 18:51:14 +02:00
Konstantinos Triantafyllou f85a2202ab Import Notification and Authorization Configuration only in application. 2023-12-14 15:48:33 +02:00
Konstantina Galouni c55d2836d7 [irish-monitor-service | WIP | CHANGED]: Monitor Service to work as standalone and as library (classifier library) at the same time.
1. pom.xml: Added plugin "maven-jar-plugin" and an <execution> with <classifier> library which creates a jar and excluded files from library setup.
2. UoaMonitorServiceApplication.java: Moved to package application and removed @EnableConfigurationProperties and @Import of other configurations (moved to UoaMonitorServiceConfiguration.java).
3. UoaMonitorServiceConfiguration.java: Added @EnableConfigurationProperties and @Import of configurations and @ComponentScan.
4. ServletInitializer.java: Moved to package application.
5. MonitorLibraryCheckDeployController.java: Added this copy of MonitorServiceCheckDeployController.java to be used only in library setup with @RequestMapping("/monitor-library").
2023-12-01 10:19:20 +02:00
Konstantinos Triantafyllou 9d585f12e0 Update admin-tools-library 2023-11-14 13:21:15 +02:00
Konstantinos Triantafyllou 7b4f0a9eec Fix role utils methods 2023-07-04 16:02:34 +03:00
Konstantinos Triantafyllou e363a04f84 Pom: Add spring-boot-version in maven-plugin 2023-05-19 16:47:19 +03:00
Konstantina Galouni 806e1e16d8 [Monitor Service | master]: MonitorController.java: In method "updatePortal()" call also pageService.updatePid if pid was changed | pom.xml: Updated version of uoa-admin-tools-library to 1.0.7 (previous was 1.0.6). 2023-05-03 12:58:13 +03:00
Konstantina Galouni 637554d3e8 [Monitor Service | log4j2] pom.xml: Removed groupid 2022-10-10 15:29:34 +03:00
Konstantina Galouni adf8cb5e70 pom.xml: Updated parent and versions of libraries | Moved to log4j2 & set spring log file as default | Added swagger 2022-10-10 15:27:17 +03:00
Konstantinos Triantafyllou 902a666c8e [maven-release-plugin] rollback the release of uoa-monitor-service-1.0.4 2022-09-14 11:19:09 +03:00
Konstantinos Triantafyllou d274c2e95a [maven-release-plugin] prepare for next development iteration 2022-09-14 11:18:43 +03:00
Konstantinos Triantafyllou edba8457d1 [maven-release-plugin] prepare release uoa-monitor-service-1.0.4 2022-09-14 11:18:38 +03:00
Konstantinos Triantafyllou c6d613eb64 Increase snapshot version for next release 2022-09-13 12:20:08 +03:00
Konstantina Galouni dd7537f5d0 [Trunk | Monitor Service]: IndicatorController.java: Updated methods "saveBulkIndicators()" and "createSectionsAndSaveBulk()" to import List<Section<Indicator>> instead of List<Indicator> | pom.xml: Inreased version. 2022-09-08 23:37:03 +03:00
Konstantinos Triantafyllou d4381c3a46 Remove HEAD from scm info 2022-09-02 16:15:31 +03:00
Konstantinos Triantafyllou 64e61e8a0e Revert "Revert "Change scm info to ssh url""
This reverts commit 3e2922581b.
2022-09-01 22:19:39 +03:00
Konstantinos Triantafyllou 3e2922581b Revert "Change scm info to ssh url"
This reverts commit 43c8e471c7.
2022-09-01 14:10:33 +03:00
Konstantinos Triantafyllou 43c8e471c7 Change scm info to ssh url 2022-09-01 13:49:25 +03:00
Konstantinos Triantafyllou 75716a0f10 Add scm information in pom.xml 2022-09-01 13:42:56 +03:00
Konstantina Galouni a03001c90e [Trunk | Monitor Service]: 1.. pom.xml: Updated version of admin-tools-library to 1.0.5 (used to be 1.0.4) | 2. StakeholderController.java: In method "buildFullStakeholder()", when creating Stakeholder, create Portal if not exists (pid = alias) and in method "deleteStakeholder()", when deleting a Stakeholder, delete Portal as well. 2022-07-27 11:51:56 +00:00
Konstantinos Triantafyllou 99161920d5 Update version in pom 2022-01-12 15:08:43 +00:00
Konstantinos Triantafyllou 3b6dac86ed Update notification service with fix 2022-01-12 15:07:59 +00:00
Konstantinos Triantafyllou 3db8d35d42 Update version 2021-12-07 09:31:20 +00:00
Konstantinos Triantafyllou 827fd60a87 Add idea files to ignore svn list. Update notification and admin tools library 2021-12-07 09:30:43 +00:00
Konstantina Galouni feb43d186c [Trunk | Monitor Service]: pom.xml: Updated to 1.0.3 uoa-notification-service & uoa-admin-tools-library | uoa-authorization-library dependency removed (it is included in admin tools library). 2021-11-30 11:58:59 +00:00
Konstantina Galouni a11cf9c642 [Trunk | Monitor Service]:
1. pom.xml: Updated version of "uoa-admin-tools-library" from 1.0.1 to 1.0.2, "uoa-authorization-library" from 1.0.0 to 2.0.1, "uoa-notification-service" from 1.0.0 to 1.0.2.
2. GlobalVars.java: Added field "version" (version of project in pom).
3. MonitorServiceCheckDeployController.java: Expose globalBars.version in /health_check/advanced.
4. monitorservice.properties: Added monitorservice.globalVars.version=@version@ (initialized by pom version).
2021-11-17 23:00:52 +00:00
Konstantina Galouni 61a6d5d89d [Trunk | Monitor Service]: pom.xml: Update version of uoa-admin-tools-library to 1.0.1. 2021-10-25 09:57:50 +00:00
Konstantina Galouni 2e0e215e69 [Trunk | Monitor Service]: pom.xml: In dependency "uoa-admin-tools-library" remove snapshot from version (the library is released on http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases/eu/dnetlib/uoa-admin-tools-library/) 2021-10-12 12:43:10 +00:00
Konstantina Galouni 1ec72b25b2 [Trunk | Monitor Service]: pom.xml: Revert from r61631 changes for parent and plugins: now from "dnet45-parent" to "spring-boot-starter-parent". 2021-10-12 09:54:08 +00:00
Konstantina Galouni 3f0bbbd81c [Trunk | Monitor Service]:
1. StakeholderController.java: In method "getAllRealStakeholders()" (/stakeholder), return also stakeholders with "restricted" visibility, without checking user's roles.
2. pom.xml: 
	a. Update parent from "spring-boot-starter-parent" to "dnet45-parent" ==> add <dependencyManagement> and "maven-war-plugin" and comment "spring-boot-maven-plugin".
	b. For dependencies "uoa-authorization-library" and "uoa-notification-service", use version 1.0.0 (released version), not 1.0.0-SNAPSHOT.
2021-10-05 21:01:19 +00:00
Konstantina Galouni 9b18159e2f [Trunk | Monitor Service]:
1. pom.xml: 
        a. Added timestamp in properties.
        b. In <build> added <resources> with filtering set to true.
2. GlobalVars.java: Added GlobalVars class for date of deploy & date of build.
3. UoaMonitorServiceApplication.java: 
        a. Added @PropertySource("classpath:admintoolslibrary.properties") and @PropertySource("classpath:notification.properties")
        b. In @EnableConfigurationProperties added GlobalVars.class.
4. MonitorServiceCheckDeployController.java: Added exposing date of deploy and date of build.
5. monitorservice.properties: Added property monitorservice.globalVars.buildDate=@timestamp@
2021-09-15 22:17:52 +00:00
Konstantina Galouni ac869dd75b [Trunk | Monitor Service]:
1. pom.xml: Add dependency for notification service: uoa-notification-service.
2. UoaMonitorServiceApplication.java: In @SpringBootApplication, add in scanBasePackages "eu.dnetlib.uoanotificationservice".
2021-03-31 15:28:05 +00:00
Konstantina Galouni 3540b9ec6b [Trunk | Monitor Service]: uoa-authorization-library dependency added:
1. pom.xml: Added dependencies for spring security and for uoa-authorization-library | [Bug fix] spring boot version set to 1.5.8 (it was accidentally set to 1.5.18 and library was not compatible).
2. UoaMonitorServiceApplication.java: Added authorization.properties | Remove SecurityConfig from configuration (done by authorization library) | import AuthorizationConfiguration.
3. ExceptionsHandler.java: Add handler for AccessDeniedException.
4. monitorservice.properties: Remove security properties (and add missing properties for mongodb).
5. UoaMonitorServiceConfiguration.java: Remove interceptor for AuthorizationHandler.
6. SecurityConfig.java & AuthorizationHandler.java & AuthorizationUtils.java: Removed unnecessary files (authorization is done via authorization library).
2020-11-11 10:52:38 +00:00
Konstantina Galouni 8a3f97db13 [Trunk | Monitor Service]:
1. pom.xml: Comment dependency of "uoa-help-texts-library" and add dependency of "uoa-admin-tools-library" | Add dependency of "spring-boot-starter-test".
2. MongoConnection.java: Replace basePackage "eu.dnetlib.uoahelptexts.dao" with "eu.dnetlib.uoaadmintoolslibrary.dao".
3. EmailController.java: Import from " eu.dnetlib.uoaadmintoolslibrary" instead of "eu.dnetlib.uoahelptexts".
4. UoaMonitorServiceApplication.java: Replace scanBasePackage "eu.dnetlib.uoahelptexts" with "eu.dnetlib.uoaadmintoolslibrary" | Add @PropertySource("classpath:dnet-override.properties".
2020-06-17 10:56:52 +00:00
Konstantina Galouni 0ee5ff1e0e 1. pom.xml: Add dependency for "uoa-help-texts-library" (will be renamed).
2. UoaMonitorServiceApplication.java: Add @PropertySource path used in dl170.
3. MongoConnection.java: @EnableMongoRepositories not only from: eu.dnetlib.uoamonitorservice.dao, but also: eu.dnetlib.uoahelptexts.dao.
4. GoogleConfig.java & MailConfig.java: [Deleted]: Functionality available on library project.
5. EmailController.java: [New]: Used for contact-us page in portal.
6. ExceptionsHandler.java & /controllers/: Add more and detailed logs.
7. Stakeholder.java:
        a. Field 'logoUrl' added.
        b. Method 'getType()' returns type.name() and 'setType()' gets String and converts it into StakeholderType.
8. Topic.java & Category.java & SubCategory.java & Indicator.java: 
	a. Field 'boolean isDefault' changed to 'String defaultId'.
	b. Method copyFromDefault() added to create a clone from default entity (topic, category, subcategory, indicator).
9. Category.java & SubCategory.java: Field 'String description' added.
10. SubCategory.java: Field 'String stakeholderId' added | method createOverviewSubCategory(Category) added.
11. Indicator.java & IndicatorPath.java: Method 'getType()' returns type.name() and 'setType()' gets String and converts it into IndicatorType / IndicatorPathType.
12. IndicatorPath.java: Constructor and copy constructor added.
13. StakeholderDAO.java & MongoDBStakeholderDAO.java: 
	a. Method findByIsDefaultProfile() changed to: findByDefaultId() & findByDefaultIdNot().
	b. Method findByIsDefaultProfileAndType() changed to: findByDefaultIdAndType() & findByDefaultIdNotAndType().
14. SubCategoryDAO.java & MongoDBSubCategoryDAO.java & IndicatorDAO.java & MongoDBSubCategoryDAO.java: Method 'findByDefaultId()' added.
15. StakeholderController.java: Handle creationDate and updateDate | Add more exceptional cases.
16. TopicController.java:
        a. Helper method 'onSaveDefaultTopic()' added (save cloned topic on stakeholders based on this default Stakeholder).
        b. Helper method 'onUpdateDefaultTopic()' added (update cloned topics based on this default topic).
17. CategoryController.java:
        a. Remove 'subCategory.setIsDefault(true);' when a category is created.
        b. Helper method 'onSaveDefaultCategory()' added (save cloned category on topics based on this default Topic).
        c. Helper method 'onUpdateDefaultCategory()' added (update cloned categories based on this default category).
18. SubCategoryController.java:
        a. Helper method 'onSaveDefaultSubCategory()' added (save cloned subCategory on topics based on this default Category).
        b. Helper method 'onUpdateDefaultSubCategory()' added (update cloned subCategories based on this default subCategory).
19. IndicatorController.java:
        a. Helper method 'onSaveDefaultIndicator()' added (save cloned indicator on subCategories based on this default SubCategory).
        b. Helper method 'onUpdateDefaultIndicator()' added (update cloned indicators based on this default indicator).
        c. Helper method 'parameterMapping()' added to map correct parameter values on parameters depending on stakeholder info.
        d. Method 'toggleIndicatorStatus()' added to toggle 'isActive' field.
        e. Method 'toggleIndicatorAccess()' added to toggle 'isPublic' field.
        f. Helper method 'toggleIndicator()' added to update indicator when a field is toggled.
2019-12-19 15:04:25 +00:00
Konstantina Galouni 1ff5f13223 Initial commit for monitor-service. 2019-11-04 09:03:49 +00:00