Push new regeneration (Test)

sayoungestguy · Sep 6, 2024 · 0b95799 · 0b95799
1 parent 4fac193
commit 0b95799
Show file tree

Hide file tree

Showing 40 changed files with 206 additions and 281 deletions.
diff --git a/.jhipster/Activity.json b/.jhipster/Activity.json
@@ -6,6 +6,12 @@
   "dto": "mapstruct",
   "enableAudit": true,
   "fields": [
+    {
+      "fieldName": "activityName",
+      "fieldType": "String",
+      "fieldValidateRules": ["maxlength"],
+      "fieldValidateRulesMaxlength": "255"
+    },
     {
       "fieldName": "activityTime",
       "fieldType": "Instant",
@@ -59,12 +65,6 @@
       "fieldType": "Instant",
       "nullable": false,
       "readonly": true
-    },
-    {
-      "fieldName": "activityName",
-      "fieldType": "String",
-      "fieldValidateRules": ["required", "maxlength"],
-      "fieldValidateRulesMaxlength": "255"
     }
   ],
   "name": "Activity",

diff --git a/.jhipster/UserSkill.json b/.jhipster/UserSkill.json
@@ -2,40 +2,33 @@
   "annotations": {
     "changelogDate": "20240905014534"
   },
+  "applications": ["scaleup"],
   "dto": "mapstruct",
   "fields": [
     {
-      "fieldName": "experience",
+      "fieldName": "yearsOfExperience",
       "fieldType": "Integer",
-      "fieldValidateRules": ["required", "min", "max"],
-      "fieldValidateRulesMax": "100",
-      "fieldValidateRulesMin": "0"
+      "fieldValidateRules": ["required"]
     }
   ],
-  "jpaMetamodelFiltering": false,
   "name": "UserSkill",
   "pagination": "infinite-scroll",
-  "readOnly": false,
   "relationships": [
     {
-      "otherEntityField": "id",
       "otherEntityName": "userProfile",
       "relationshipName": "userProfile",
       "relationshipSide": "left",
-      "relationshipType": "many-to-one",
-      "relationshipValidateRules": []
+      "relationshipType": "many-to-one"
     },
     {
-      "otherEntityField": "id",
       "otherEntityName": "skill",
       "relationshipName": "skill",
       "relationshipSide": "left",
       "relationshipType": "many-to-one"
     },
     {
-      "otherEntityField": "id",
       "otherEntityName": "codeTables",
-      "relationshipName": "codeTables",
+      "relationshipName": "skillType",
       "relationshipSide": "left",
       "relationshipType": "many-to-one"
     }

diff --git a/pom.xml b/pom.xml
@@ -76,8 +76,6 @@
         <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
         <springdoc-openapi-starter-webmvc-api.version>2.5.0</springdoc-openapi-starter-webmvc-api.version>
-        <sonar.organization>sayoungestguy</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/com/teamsixnus/scaleup/domain/Activity.java b/src/main/java/com/teamsixnus/scaleup/domain/Activity.java
@@ -26,6 +26,10 @@ public class Activity extends AbstractAuditingEntity<Long> implements Serializab
     @Column(name = "id")
     private Long id;
 
+    @Size(max = 255)
+    @Column(name = "activity_name", length = 255)
+    private String activityName;
+
     @NotNull
     @Column(name = "activity_time", nullable = false)
     private Instant activityTime;
@@ -45,11 +49,6 @@ public class Activity extends AbstractAuditingEntity<Long> implements Serializab
     // Inherited createdDate definition
     // Inherited lastModifiedBy definition
     // Inherited lastModifiedDate definition
-    @NotNull
-    @Size(max = 255)
-    @Column(name = "activity_name", length = 255, nullable = false)
-    private String activityName;
-
     @Transient
     private boolean isPersisted;
 
@@ -75,6 +74,19 @@ public void setId(Long id) {
         this.id = id;
     }
 
+    public String getActivityName() {
+        return this.activityName;
+    }
+
+    public Activity activityName(String activityName) {
+        this.setActivityName(activityName);
+        return this;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+
     public Instant getActivityTime() {
         return this.activityTime;
     }
@@ -151,19 +163,6 @@ public Activity lastModifiedDate(Instant lastModifiedDate) {
         return this;
     }
 
-    public String getActivityName() {
-        return this.activityName;
-    }
-
-    public Activity activityName(String activityName) {
-        this.setActivityName(activityName);
-        return this;
-    }
-
-    public void setActivityName(String activityName) {
-        this.activityName = activityName;
-    }
-
     @PostLoad
     @PostPersist
     public void updateEntityState() {
@@ -231,6 +230,7 @@ public int hashCode() {
     public String toString() {
         return "Activity{" +
             "id=" + getId() +
+            ", activityName='" + getActivityName() + "'" +
             ", activityTime='" + getActivityTime() + "'" +
             ", duration=" + getDuration() +
             ", venue='" + getVenue() + "'" +
@@ -239,7 +239,6 @@ public String toString() {
             ", createdDate='" + getCreatedDate() + "'" +
             ", lastModifiedBy='" + getLastModifiedBy() + "'" +
             ", lastModifiedDate='" + getLastModifiedDate() + "'" +
-            ", activityName='" + getActivityName() + "'" +
             "}";
     }
 }
diff --git a/src/main/java/com/teamsixnus/scaleup/domain/UserSkill.java b/src/main/java/com/teamsixnus/scaleup/domain/UserSkill.java
@@ -24,10 +24,8 @@ public class UserSkill implements Serializable {
     private Long id;
 
     @NotNull
-    @Min(value = 0)
-    @Max(value = 100)
-    @Column(name = "experience", nullable = false)
-    private Integer experience;
+    @Column(name = "years_of_experience", nullable = false)
+    private Integer yearsOfExperience;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JsonIgnoreProperties(value = { "user" }, allowSetters = true)
@@ -37,7 +35,7 @@ public class UserSkill implements Serializable {
     private Skill skill;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    private CodeTables codeTables;
+    private CodeTables skillType;
 
     // jhipster-needle-entity-add-field - JHipster will add fields here
 
@@ -54,17 +52,17 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getExperience() {
-        return this.experience;
+    public Integer getYearsOfExperience() {
+        return this.yearsOfExperience;
     }
 
-    public UserSkill experience(Integer experience) {
-        this.setExperience(experience);
+    public UserSkill yearsOfExperience(Integer yearsOfExperience) {
+        this.setYearsOfExperience(yearsOfExperience);
         return this;
     }
 
-    public void setExperience(Integer experience) {
-        this.experience = experience;
+    public void setYearsOfExperience(Integer yearsOfExperience) {
+        this.yearsOfExperience = yearsOfExperience;
     }
 
     public UserProfile getUserProfile() {
@@ -93,16 +91,16 @@ public UserSkill skill(Skill skill) {
         return this;
     }
 
-    public CodeTables getCodeTables() {
-        return this.codeTables;
+    public CodeTables getSkillType() {
+        return this.skillType;
     }
 
-    public void setCodeTables(CodeTables codeTables) {
-        this.codeTables = codeTables;
+    public void setSkillType(CodeTables codeTables) {
+        this.skillType = codeTables;
     }
 
-    public UserSkill codeTables(CodeTables codeTables) {
-        this.setCodeTables(codeTables);
+    public UserSkill skillType(CodeTables codeTables) {
+        this.setSkillType(codeTables);
         return this;
     }
 
@@ -130,7 +128,7 @@ public int hashCode() {
     public String toString() {
         return "UserSkill{" +
             "id=" + getId() +
-            ", experience=" + getExperience() +
+            ", yearsOfExperience=" + getYearsOfExperience() +
             "}";
     }
 }
diff --git a/src/main/java/com/teamsixnus/scaleup/service/MailService.java b/src/main/java/com/teamsixnus/scaleup/service/MailService.java
@@ -71,9 +71,7 @@ private void sendEmailSync(String to, String subject, String content, boolean is
         try {
             MimeMessageHelper message = new MimeMessageHelper(mimeMessage, isMultipart, StandardCharsets.UTF_8.name());
             message.setTo(to);
-            //            message.setFrom(jHipsterProperties.getMail().getFrom());
-            String SenderMail = "MS_hwQpFm@trial-k68zxl2o29egj905.mlsender.net";
-            message.setFrom(SenderMail);
+            message.setFrom(jHipsterProperties.getMail().getFrom());
             message.setSubject(subject);
             message.setText(content, isHtml);
             javaMailSender.send(mimeMessage);

diff --git a/src/main/java/com/teamsixnus/scaleup/service/dto/ActivityDTO.java b/src/main/java/com/teamsixnus/scaleup/service/dto/ActivityDTO.java
@@ -14,6 +14,9 @@ public class ActivityDTO implements Serializable {
 
     private Long id;
 
+    @Size(max = 255)
+    private String activityName;
+
     @NotNull
     private Instant activityTime;
 
@@ -33,10 +36,6 @@ public class ActivityDTO implements Serializable {
 
     private Instant lastModifiedDate;
 
-    @NotNull
-    @Size(max = 255)
-    private String activityName;
-
     private UserProfileDTO creatorProfile;
 
     private SkillDTO skill;
@@ -49,6 +48,14 @@ public void setId(Long id) {
         this.id = id;
     }
 
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+
     public Instant getActivityTime() {
         return activityTime;
     }
@@ -113,14 +120,6 @@ public void setLastModifiedDate(Instant lastModifiedDate) {
         this.lastModifiedDate = lastModifiedDate;
     }
 
-    public String getActivityName() {
-        return activityName;
-    }
-
-    public void setActivityName(String activityName) {
-        this.activityName = activityName;
-    }
-
     public UserProfileDTO getCreatorProfile() {
         return creatorProfile;
     }
@@ -163,6 +162,7 @@ public int hashCode() {
     public String toString() {
         return "ActivityDTO{" +
             "id=" + getId() +
+            ", activityName='" + getActivityName() + "'" +
             ", activityTime='" + getActivityTime() + "'" +
             ", duration=" + getDuration() +
             ", venue='" + getVenue() + "'" +
@@ -171,7 +171,6 @@ public String toString() {
             ", createdDate='" + getCreatedDate() + "'" +
             ", lastModifiedBy='" + getLastModifiedBy() + "'" +
             ", lastModifiedDate='" + getLastModifiedDate() + "'" +
-            ", activityName='" + getActivityName() + "'" +
             ", creatorProfile=" + getCreatorProfile() +
             ", skill=" + getSkill() +
             "}";

diff --git a/src/main/java/com/teamsixnus/scaleup/service/dto/UserSkillDTO.java b/src/main/java/com/teamsixnus/scaleup/service/dto/UserSkillDTO.java
@@ -13,15 +13,13 @@ public class UserSkillDTO implements Serializable {
     private Long id;
 
     @NotNull
-    @Min(value = 0)
-    @Max(value = 100)
-    private Integer experience;
+    private Integer yearsOfExperience;
 
     private UserProfileDTO userProfile;
 
     private SkillDTO skill;
 
-    private CodeTablesDTO codeTables;
+    private CodeTablesDTO skillType;
 
     public Long getId() {
         return id;
@@ -31,12 +29,12 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getExperience() {
-        return experience;
+    public Integer getYearsOfExperience() {
+        return yearsOfExperience;
     }
 
-    public void setExperience(Integer experience) {
-        this.experience = experience;
+    public void setYearsOfExperience(Integer yearsOfExperience) {
+        this.yearsOfExperience = yearsOfExperience;
     }
 
     public UserProfileDTO getUserProfile() {
@@ -55,12 +53,12 @@ public void setSkill(SkillDTO skill) {
         this.skill = skill;
     }
 
-    public CodeTablesDTO getCodeTables() {
-        return codeTables;
+    public CodeTablesDTO getSkillType() {
+        return skillType;
     }
 
-    public void setCodeTables(CodeTablesDTO codeTables) {
-        this.codeTables = codeTables;
+    public void setSkillType(CodeTablesDTO skillType) {
+        this.skillType = skillType;
     }
 
     @Override
@@ -89,10 +87,10 @@ public int hashCode() {
     public String toString() {
         return "UserSkillDTO{" +
             "id=" + getId() +
-            ", experience=" + getExperience() +
+            ", yearsOfExperience=" + getYearsOfExperience() +
             ", userProfile=" + getUserProfile() +
             ", skill=" + getSkill() +
-            ", codeTables=" + getCodeTables() +
+            ", skillType=" + getSkillType() +
             "}";
     }
 }
diff --git a/src/main/java/com/teamsixnus/scaleup/service/mapper/UserSkillMapper.java b/src/main/java/com/teamsixnus/scaleup/service/mapper/UserSkillMapper.java
@@ -17,7 +17,7 @@
 public interface UserSkillMapper extends EntityMapper<UserSkillDTO, UserSkill> {
     @Mapping(target = "userProfile", source = "userProfile", qualifiedByName = "userProfileId")
     @Mapping(target = "skill", source = "skill", qualifiedByName = "skillId")
-    @Mapping(target = "codeTables", source = "codeTables", qualifiedByName = "codeTablesId")
+    @Mapping(target = "skillType", source = "skillType", qualifiedByName = "codeTablesId")
     UserSkillDTO toDto(UserSkill s);
 
     @Named("userProfileId")

diff --git a/src/main/resources/.h2.server.properties b/src/main/resources/.h2.server.properties
@@ -1,6 +1,5 @@
 #H2 Server Properties
-#Thu Aug 29 00:36:11 SGT 2024
 0=JHipster H2 (Disk)|org.h2.Driver|jdbc\:h2\:file\:./target/h2db/db/scaleup|scaleup
-webSSL=false
 webAllowOthers=true
 webPort=8092
+webSSL=false