Revert ":wrench: chore(activityTitle): Validate set values in activit…

…yTitle class" This reverts commit 83df0f6.
CCAFS · Aug 9, 2023 · 6b30939 · 6b30939
1 parent 83df0f6
commit 6b30939
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/model/ActivityTitle.java b/marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/model/ActivityTitle.java
@@ -31,13 +31,11 @@ public class ActivityTitle extends MarloBaseEntity implements java.io.Serializab
   private String title;
 
   private Set<Activity> activities = new HashSet<Activity>(0);
+  @Expose
+  private int startYear;
+  @Expose
+  private int endYear;
 
-  /*
-   * @Expose
-   * private int startYear;
-   * @Expose
-   * private int endYear;
-   */
   @Override
   public boolean equals(Object obj) {
     if (this == obj) {
@@ -63,6 +61,11 @@ public Set<Activity> getActivities() {
     return activities;
   }
 
+  public int getEndYear() {
+    return endYear;
+  }
+
+
   @Override
   public String getLogDeatil() {
     StringBuilder sb = new StringBuilder();
@@ -84,6 +87,10 @@ public User getModifiedBy() {
     return null;
   }
 
+  public int getStartYear() {
+    return startYear;
+  }
+
   public String getTitle() {
     return title;
   }
@@ -106,12 +113,19 @@ public void setActivities(Set<Activity> activities) {
     this.activities = activities;
   }
 
+  public void setEndYear(int endYear) {
+    this.endYear = endYear;
+  }
 
   @Override
   public void setModifiedBy(User modifiedBy) {
     // TODO Auto-generated method stub
   }
 
+  public void setStartYear(int startYear) {
+    this.startYear = startYear;
+  }
+
   public void setTitle(String title) {
     this.title = title;
   }

diff --git a/marlo-data/src/main/resources/xmls/ActivitiesTitles.hbm.xml b/marlo-data/src/main/resources/xmls/ActivitiesTitles.hbm.xml
@@ -11,14 +11,12 @@
     <property name="title" type="string">
       <column name="title" not-null="true" />
     </property>
-    <!--  
     <property name="startYear" type="int">
             <column name="start_year" length="5" />
     </property>
     <property name="endYear" type="int">
             <column name="end_year" length="5" />
     </property>
-    -->
     <set name="activities" order-by="id" table="activities"
       inverse="true" lazy="true" fetch="select">
       <key>