Revision 57923
Added by Konstantina Galouni over 4 years ago
| SubCategory.java | ||
|---|---|---|
| 3 | 3 |
import com.fasterxml.jackson.annotation.JsonProperty; |
| 4 | 4 |
import org.springframework.data.annotation.Id; |
| 5 | 5 |
|
| 6 |
import java.util.ArrayList; |
|
| 6 | 7 |
import java.util.List; |
| 7 | 8 |
|
| 8 | 9 |
public class SubCategory<StringOrIndicator> {
|
| ... | ... | |
| 12 | 13 |
|
| 13 | 14 |
private String name; |
| 14 | 15 |
private String alias; |
| 16 |
private String description; |
|
| 15 | 17 |
private boolean isActive; |
| 16 | 18 |
private boolean isPublic; |
| 17 |
private boolean isDefault; |
|
| 19 |
private String defaultId; |
|
| 20 |
private String stakeholderId; |
|
| 18 | 21 |
private List<StringOrIndicator> charts; |
| 19 | 22 |
private List<StringOrIndicator> numbers; |
| 20 | 23 |
|
| ... | ... | |
| 23 | 26 |
id = subCategory.getId(); |
| 24 | 27 |
name = subCategory.getName(); |
| 25 | 28 |
alias = subCategory.getAlias(); |
| 29 |
description = subCategory.getDescription(); |
|
| 26 | 30 |
isActive = subCategory.getIsActive(); |
| 27 | 31 |
isPublic = subCategory.getIsPublic(); |
| 28 |
isDefault = subCategory.getIsDefault();
|
|
| 32 |
defaultId = subCategory.getDefaultId();
|
|
| 29 | 33 |
} |
| 30 | 34 |
|
| 35 |
public void createOverviewSubCategory(Category category) {
|
|
| 36 |
setName("Overview");
|
|
| 37 |
setAlias("overview");
|
|
| 38 |
setIsActive(category.getIsActive()); |
|
| 39 |
setIsPublic(category.getIsPublic()); |
|
| 40 |
setCharts(new ArrayList<>()); |
|
| 41 |
setNumbers(new ArrayList<>()); |
|
| 42 |
} |
|
| 43 |
|
|
| 44 |
public void copyFromDefault(SubCategory defaultSubCategory) {
|
|
| 45 |
setName(defaultSubCategory.getName()); |
|
| 46 |
setAlias(defaultSubCategory.getAlias()); |
|
| 47 |
setDescription(defaultSubCategory.getDescription()); |
|
| 48 |
setIsActive(false); |
|
| 49 |
setIsPublic(false); |
|
| 50 |
setDefaultId(defaultSubCategory.getId()); |
|
| 51 |
setCharts(new ArrayList()); |
|
| 52 |
setNumbers(new ArrayList()); |
|
| 53 |
} |
|
| 54 |
|
|
| 31 | 55 |
public String getId() {
|
| 32 | 56 |
return id; |
| 33 | 57 |
} |
| ... | ... | |
| 52 | 76 |
this.alias = alias; |
| 53 | 77 |
} |
| 54 | 78 |
|
| 79 |
public String getDescription() {
|
|
| 80 |
return description; |
|
| 81 |
} |
|
| 82 |
|
|
| 83 |
public void setDescription(String description) {
|
|
| 84 |
this.description = description; |
|
| 85 |
} |
|
| 86 |
|
|
| 55 | 87 |
public boolean getIsActive() {
|
| 56 | 88 |
return isActive; |
| 57 | 89 |
} |
| ... | ... | |
| 68 | 100 |
this.isPublic = isPublic; |
| 69 | 101 |
} |
| 70 | 102 |
|
| 71 |
public boolean getIsDefault() {
|
|
| 72 |
return isDefault;
|
|
| 103 |
public String getDefaultId() {
|
|
| 104 |
return defaultId;
|
|
| 73 | 105 |
} |
| 74 | 106 |
|
| 75 |
public void setIsDefault(boolean isDefault) {
|
|
| 76 |
this.isDefault = isDefault;
|
|
| 107 |
public void setDefaultId(String defaultId) {
|
|
| 108 |
this.defaultId = defaultId;
|
|
| 77 | 109 |
} |
| 78 | 110 |
|
| 111 |
public String getStakeholderId() {
|
|
| 112 |
return stakeholderId; |
|
| 113 |
} |
|
| 114 |
|
|
| 115 |
public void setStakeholderId(String stakeholderId) {
|
|
| 116 |
this.stakeholderId = stakeholderId; |
|
| 117 |
} |
|
| 118 |
|
|
| 79 | 119 |
public List<StringOrIndicator> getCharts() {
|
| 80 | 120 |
return charts; |
| 81 | 121 |
} |
Also available in: Unified diff
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.