Push new regeneration and Scan

sayoungestguy · Sep 5, 2024 · 4fac193 · 4fac193
1 parent 1ae8b7b
commit 4fac193
Show file tree

Hide file tree

Showing 61 changed files with 2,475 additions and 350 deletions.
diff --git a/.jhipster/Activity.json b/.jhipster/Activity.json
@@ -59,6 +59,12 @@
       "fieldType": "Instant",
       "nullable": false,
       "readonly": true
+    },
+    {
+      "fieldName": "activityName",
+      "fieldType": "String",
+      "fieldValidateRules": ["required", "maxlength"],
+      "fieldValidateRulesMaxlength": "255"
     }
   ],
   "name": "Activity",

diff --git a/.jhipster/Skill.json b/.jhipster/Skill.json
@@ -12,17 +12,6 @@
       "fieldValidateRules": ["maxlength", "required"],
       "fieldValidateRulesMaxlength": "255"
     },
-    {
-      "fieldName": "individualSkillDesc",
-      "fieldType": "String",
-      "fieldValidateRules": ["maxlength"],
-      "fieldValidateRulesMaxlength": "255"
-    },
-    {
-      "fieldName": "yearsOfExp",
-      "fieldType": "Integer",
-      "fieldValidateRules": ["required"]
-    },
     {
       "auditField": true,
       "autoGenerate": true,
@@ -60,14 +49,7 @@
   ],
   "name": "Skill",
   "pagination": "infinite-scroll",
-  "relationships": [
-    {
-      "otherEntityName": "userProfile",
-      "relationshipName": "userProfile",
-      "relationshipSide": "left",
-      "relationshipType": "many-to-one"
-    }
-  ],
+  "relationships": [],
   "searchEngine": "no",
   "service": "serviceClass"
 }
diff --git a/.jhipster/UserSkill.json b/.jhipster/UserSkill.json
@@ -0,0 +1,45 @@
+{
+  "annotations": {
+    "changelogDate": "20240905014534"
+  },
+  "dto": "mapstruct",
+  "fields": [
+    {
+      "fieldName": "experience",
+      "fieldType": "Integer",
+      "fieldValidateRules": ["required", "min", "max"],
+      "fieldValidateRulesMax": "100",
+      "fieldValidateRulesMin": "0"
+    }
+  ],
+  "jpaMetamodelFiltering": false,
+  "name": "UserSkill",
+  "pagination": "infinite-scroll",
+  "readOnly": false,
+  "relationships": [
+    {
+      "otherEntityField": "id",
+      "otherEntityName": "userProfile",
+      "relationshipName": "userProfile",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one",
+      "relationshipValidateRules": []
+    },
+    {
+      "otherEntityField": "id",
+      "otherEntityName": "skill",
+      "relationshipName": "skill",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
+    },
+    {
+      "otherEntityField": "id",
+      "otherEntityName": "codeTables",
+      "relationshipName": "codeTables",
+      "relationshipSide": "left",
+      "relationshipType": "many-to-one"
+    }
+  ],
+  "searchEngine": "no",
+  "service": "serviceClass"
+}
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -21,11 +21,11 @@
     "enableHibernateCache": true,
     "enableSwaggerCodegen": false,
     "enableTranslation": false,
-    "entities": ["CodeTables", "UserProfile", "Skill", "Message", "Activity", "ActivityInvite", "Notification"],
+    "entities": ["CodeTables", "UserProfile", "Skill", "Message", "Activity", "ActivityInvite", "Notification", "UserSkill"],
     "feignClient": null,
     "jhipsterVersion": "8.6.0",
     "jwtSecretKey": "OGJlMjFkYjA2N2MwNWVhZjZjZDdmZmQ0YTFjODc1ZjM2Njc3OTI4NDgwMGRmOGU5ZDJjZjgxMDcwMTQ0M2Q1MjA2NDJkOWE4OTY5MzIyMzIxNTM2NjZiMzFmNDYyNjA2YmJjODRkMTNmOGE2Y2ZmMjhkODZlMzkyZGZmNDQ5NzA=",
-    "lastLiquibaseTimestamp": 1724575616000,
+    "lastLiquibaseTimestamp": 1725500734000,
     "messageBroker": false,
     "microfrontend": null,
     "microfrontends": [],

diff --git a/jhipster/scaleup.jdl b/jhipster/scaleup.jdl
@@ -29,8 +29,10 @@ entity UserProfile {
 
 entity Skill {
   skillName String maxlength(255) required
-    individualSkillDesc String maxlength(255),
-    yearsOfExp Integer required
+}
+
+entity UserSkill {
+    yearsOfExperience Integer required
 }
 
 entity Message {
@@ -40,6 +42,7 @@ entity Message {
 }
 
 entity Activity {
+    activityName String maxlength(255)
   activityTime Instant required,
   duration Integer,
   venue String maxlength(255),
@@ -61,7 +64,9 @@ relationship OneToOne {
 }
 
 relationship ManyToOne {
-  Skill{userProfile} to UserProfile,
+    UserSkill{userProfile} to UserProfile,
+    UserSkill{skill} to Skill,
+    UserSkill{skillType} to CodeTables,
   Message{senderProfile} to UserProfile,
   Message{receiverProfile} to UserProfile,
   Activity{creatorProfile} to UserProfile,
@@ -75,5 +80,5 @@ relationship ManyToOne {
 
 dto * with mapstruct
 service * with serviceClass
-paginate UserProfile, Skill, Message, Activity, ActivityInvite, Notification, CodeTables with infinite-scroll
+paginate UserProfile, Skill, UserSkill, Message, Activity, ActivityInvite, Notification, CodeTables with infinite-scroll
 
diff --git a/src/main/java/com/teamsixnus/scaleup/config/CacheConfiguration.java b/src/main/java/com/teamsixnus/scaleup/config/CacheConfiguration.java
@@ -58,6 +58,7 @@ public JCacheManagerCustomizer cacheManagerCustomizer() {
             createCache(cm, com.teamsixnus.scaleup.domain.Activity.class.getName());
             createCache(cm, com.teamsixnus.scaleup.domain.ActivityInvite.class.getName());
             createCache(cm, com.teamsixnus.scaleup.domain.Notification.class.getName());
+            createCache(cm, com.teamsixnus.scaleup.domain.UserSkill.class.getName());
             // jhipster-needle-ehcache-add-entry
         };
     }

diff --git a/src/main/java/com/teamsixnus/scaleup/domain/Activity.java b/src/main/java/com/teamsixnus/scaleup/domain/Activity.java
@@ -45,6 +45,11 @@ 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;
 
@@ -53,7 +58,6 @@ public class Activity extends AbstractAuditingEntity<Long> implements Serializab
     private UserProfile creatorProfile;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JsonIgnoreProperties(value = { "userProfile" }, allowSetters = true)
     private Skill skill;
 
     // jhipster-needle-entity-add-field - JHipster will add fields here
@@ -147,6 +151,19 @@ 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() {
@@ -222,6 +239,7 @@ public String toString() {
             ", createdDate='" + getCreatedDate() + "'" +
             ", lastModifiedBy='" + getLastModifiedBy() + "'" +
             ", lastModifiedDate='" + getLastModifiedDate() + "'" +
+            ", activityName='" + getActivityName() + "'" +
             "}";
     }
 }
diff --git a/src/main/java/com/teamsixnus/scaleup/domain/Skill.java b/src/main/java/com/teamsixnus/scaleup/domain/Skill.java
@@ -31,25 +31,13 @@ public class Skill extends AbstractAuditingEntity<Long> implements Serializable,
     @Column(name = "skill_name", length = 255, nullable = false)
     private String skillName;
 
-    @Size(max = 255)
-    @Column(name = "individual_skill_desc", length = 255)
-    private String individualSkillDesc;
-
-    @NotNull
-    @Column(name = "years_of_exp", nullable = false)
-    private Integer yearsOfExp;
-
     // Inherited createdBy definition
     // Inherited createdDate definition
     // Inherited lastModifiedBy definition
     // Inherited lastModifiedDate definition
     @Transient
     private boolean isPersisted;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JsonIgnoreProperties(value = { "user" }, allowSetters = true)
-    private UserProfile userProfile;
-
     // jhipster-needle-entity-add-field - JHipster will add fields here
 
     public Long getId() {
@@ -78,32 +66,6 @@ public void setSkillName(String skillName) {
         this.skillName = skillName;
     }
 
-    public String getIndividualSkillDesc() {
-        return this.individualSkillDesc;
-    }
-
-    public Skill individualSkillDesc(String individualSkillDesc) {
-        this.setIndividualSkillDesc(individualSkillDesc);
-        return this;
-    }
-
-    public void setIndividualSkillDesc(String individualSkillDesc) {
-        this.individualSkillDesc = individualSkillDesc;
-    }
-
-    public Integer getYearsOfExp() {
-        return this.yearsOfExp;
-    }
-
-    public Skill yearsOfExp(Integer yearsOfExp) {
-        this.setYearsOfExp(yearsOfExp);
-        return this;
-    }
-
-    public void setYearsOfExp(Integer yearsOfExp) {
-        this.yearsOfExp = yearsOfExp;
-    }
-
     // Inherited createdBy methods
     public Skill createdBy(String createdBy) {
         this.setCreatedBy(createdBy);
@@ -145,19 +107,6 @@ public Skill setIsPersisted() {
         return this;
     }
 
-    public UserProfile getUserProfile() {
-        return this.userProfile;
-    }
-
-    public void setUserProfile(UserProfile userProfile) {
-        this.userProfile = userProfile;
-    }
-
-    public Skill userProfile(UserProfile userProfile) {
-        this.setUserProfile(userProfile);
-        return this;
-    }
-
     // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here
 
     @Override
@@ -183,8 +132,6 @@ public String toString() {
         return "Skill{" +
             "id=" + getId() +
             ", skillName='" + getSkillName() + "'" +
-            ", individualSkillDesc='" + getIndividualSkillDesc() + "'" +
-            ", yearsOfExp=" + getYearsOfExp() +
             ", createdBy='" + getCreatedBy() + "'" +
             ", createdDate='" + getCreatedDate() + "'" +
             ", lastModifiedBy='" + getLastModifiedBy() + "'" +