Merge remote-tracking branch 'origin/develop-cleanup-branch' into tes…

…ting-sit
sayoungestguy · Nov 3, 2024 · 5ef8db7 · 5ef8db7
2 parents d60e883 + 7b9ca34
commit 5ef8db7
Show file tree

Hide file tree

Showing 61 changed files with 203 additions and 3,692 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -216,7 +216,7 @@ jobs:
             elif [ "$(sudo docker ps -a -q -f name=scaleUp)" ]; then
                 sudo docker rm scaleUp
             fi
-            sudo docker run -d -p 8080:8080 --name scaleUp  ${{ secrets.DOCKER_USERNAME }}/scaleup:latest
+            sudo docker run -d -p 80:80 --name scaleUp  ${{ secrets.DOCKER_USERNAME }}/scaleup:latest
 
   deploy-to-main:
     name: Deploy to Production
@@ -241,4 +241,4 @@ jobs:
             elif [ "$(sudo docker ps -a -q -f name=scaleUp)" ]; then
                 sudo docker rm scaleUp
             fi
-            sudo docker run -d -p 8080:8080 --name scaleUp  ${{ secrets.DOCKER_USERNAME }}/scaleup:latest
+            sudo docker run -d -p 80:80 --name scaleUp  ${{ secrets.DOCKER_USERNAME }}/scaleup:latest
diff --git a/.jhipster/ActivityInvite.json b/.jhipster/ActivityInvite.json
@@ -6,10 +6,6 @@
   "dto": "mapstruct",
   "enableAudit": true,
   "fields": [
-    {
-      "fieldName": "willParticipate",
-      "fieldType": "Boolean"
-    },
     {
       "auditField": true,
       "autoGenerate": true,

diff --git a/dbscripts/insert_data.sql b/dbscripts/insert_data.sql
@@ -1,5 +1,5 @@
 -- Insert provided sample data
-INSERT INTO code_tables (id, category, code_key, code_value, created_by, created_date, last_modified_by, last_modified_date)
+INSERT INTO tbl_code_tables (id, category, code_key, code_value, created_by, created_date, last_modified_by, last_modified_date)
 VALUES
 (1, 'skill_type', 'teach', 'Teach', 'admin', NOW(), 'admin', NOW()),
 (2, 'skill_type', 'learn', 'Learn', 'admin', NOW(), 'admin', NOW()),
@@ -9,13 +9,13 @@ VALUES
 
 
 -- Insert sample data with the first entry as admin
-INSERT INTO user_profile (id, nickname, job_role, about_me, profile_picture, social_links, created_by, created_date, last_modified_by, last_modified_date, user_id)
+INSERT INTO tbl_user_profile (id, nickname, job_role, about_me, profile_picture, social_links, created_by, created_date, last_modified_by, last_modified_date, user_id)
 VALUES
 (1, 'admin', 'Administrator', 'System administrator account.', 'Male Profile Picture', 'https://linkedin.com/admin', 'admin', NOW(), 'admin', NOW(), 1),
 (2, 'John Doe', 'Software Engineer', 'Passionate about coding and open-source.', 'Male Profile Picture', 'https://linkedin.com/john_doe', 'user', NOW(), 'user', NOW(), 2);
 
 -- Insert sample data for 20 technology and IT-related skills
-INSERT INTO skill (id, skill_name, created_by, created_date, last_modified_by, last_modified_date)
+INSERT INTO tbl_skill (id, skill_name, created_by, created_date, last_modified_by, last_modified_date)
 VALUES
 (1, 'Python Programming', 'admin', NOW(), 'admin', NOW()),
 (2, 'Data Analysis', 'admin', NOW(), 'admin', NOW()),
@@ -39,11 +39,11 @@ VALUES
 (20, 'UI/UX Design', 'admin', NOW(), 'admin', NOW());
 
 -- View the inserted data
-SELECT * FROM skills;
+SELECT * FROM tbl_skill;
 -- View the inserted data
-SELECT * FROM code_tables;
+SELECT * FROM tbl_code_tables;
 -- View the inserted data
-SELECT * FROM user_profiles;
+SELECT * FROM tbl_user_profiles;
 
 
 

diff --git a/src/main/java/com/teamsixnus/scaleup/config/CacheConfiguration.java b/src/main/java/com/teamsixnus/scaleup/config/CacheConfiguration.java
@@ -57,7 +57,6 @@ public JCacheManagerCustomizer cacheManagerCustomizer() {
             createCache(cm, com.teamsixnus.scaleup.domain.Message.class.getName());
             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/ActivityInvite.java b/src/main/java/com/teamsixnus/scaleup/domain/ActivityInvite.java
@@ -26,9 +26,6 @@ public class ActivityInvite extends AbstractAuditingEntity<Long> implements Seri
     @Column(name = "id")
     private Long id;
 
-    @Column(name = "will_participate")
-    private Boolean willParticipate;
-
     // Inherited createdBy definition
     // Inherited createdDate definition
     // Inherited lastModifiedBy definition
@@ -62,19 +59,6 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public Boolean getWillParticipate() {
-        return this.willParticipate;
-    }
-
-    public ActivityInvite willParticipate(Boolean willParticipate) {
-        this.setWillParticipate(willParticipate);
-        return this;
-    }
-
-    public void setWillParticipate(Boolean willParticipate) {
-        this.willParticipate = willParticipate;
-    }
-
     // Inherited createdBy methods
     public ActivityInvite createdBy(String createdBy) {
         this.setCreatedBy(createdBy);
@@ -179,7 +163,6 @@ public int hashCode() {
     public String toString() {
         return "ActivityInvite{" +
             "id=" + getId() +
-            ", willParticipate='" + getWillParticipate() + "'" +
             ", createdBy='" + getCreatedBy() + "'" +
             ", createdDate='" + getCreatedDate() + "'" +
             ", lastModifiedBy='" + getLastModifiedBy() + "'" +

diff --git a/src/main/java/com/teamsixnus/scaleup/domain/Notification.java b/src/main/java/com/teamsixnus/scaleup/domain/Notification.java