Merge pull request #60 from sayoungestguy/develop

Changes to prod
sayoungestguy · Nov 3, 2024 · 9e4bca3 · 9e4bca3
2 parents 06fd3ce + 262e416
commit 9e4bca3
Show file tree

Hide file tree

Showing 57 changed files with 114 additions and 3,598 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

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
@@ -43,7 +43,7 @@ SELECT * FROM tbl_skill;
 -- View the inserted data
 SELECT * FROM tbl_code_tables;
 -- View the inserted data
-SELECT * FROM tbl_user_profiles;
+SELECT * FROM tbl_user_profile;
 
 
 

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
diff --git a/src/main/java/com/teamsixnus/scaleup/domain/User.java b/src/main/java/com/teamsixnus/scaleup/domain/User.java
@@ -43,14 +43,6 @@ public class User extends AbstractAuditingEntity<Long> implements Serializable {
     @Column(name = "password_hash", length = 60, nullable = false)
     private String password;
 
-    @Size(max = 50)
-    @Column(name = "first_name", length = 50)
-    private String firstName;
-
-    @Size(max = 50)
-    @Column(name = "last_name", length = 50)
-    private String lastName;
-
     @Email
     @Size(min = 5, max = 254)
     @Column(length = 254, unique = true)
@@ -64,10 +56,6 @@ public class User extends AbstractAuditingEntity<Long> implements Serializable {
     @Column(name = "lang_key", length = 10)
     private String langKey;
 
-    @Size(max = 256)
-    @Column(name = "image_url", length = 256)
-    private String imageUrl;
-
     @Size(max = 20)
     @Column(name = "activation_key", length = 20)
     @JsonIgnore
@@ -117,22 +105,6 @@ public void setPassword(String password) {
         this.password = password;
     }
 
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
     public String getEmail() {
         return email;
     }
@@ -141,14 +113,6 @@ public void setEmail(String email) {
         this.email = email;
     }
 
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-
     public boolean isActivated() {
         return activated;
     }
@@ -219,10 +183,7 @@ public int hashCode() {
     public String toString() {
         return "User{" +
             "login='" + login + '\'' +
-            ", firstName='" + firstName + '\'' +
-            ", lastName='" + lastName + '\'' +
             ", email='" + email + '\'' +
-            ", imageUrl='" + imageUrl + '\'' +
             ", activated='" + activated + '\'' +
             ", langKey='" + langKey + '\'' +
             ", activationKey='" + activationKey + '\'' +

diff --git a/src/main/java/com/teamsixnus/scaleup/repository/NotificationRepository.java b/src/main/java/com/teamsixnus/scaleup/repository/NotificationRepository.java
diff --git a/src/main/java/com/teamsixnus/scaleup/service/ActivityInviteQueryService.java b/src/main/java/com/teamsixnus/scaleup/service/ActivityInviteQueryService.java
@@ -99,9 +99,6 @@ protected Specification<ActivityInvite> createSpecification(ActivityInviteCriter
             if (criteria.getId() != null) {
                 specification = specification.and(buildRangeSpecification(criteria.getId(), ActivityInvite_.id));
             }
-            if (criteria.getWillParticipate() != null) {
-                specification = specification.and(buildSpecification(criteria.getWillParticipate(), ActivityInvite_.willParticipate));
-            }
             if (criteria.getCreatedBy() != null) {
                 specification = specification.and(buildStringSpecification(criteria.getCreatedBy(), ActivityInvite_.createdBy));
             }