Merge branch 'working' of natehalldev/JhipsterGroupProject-Server into master

.jhipster/Cohort.json

@@ -2,10 +2,6 @@
     "name": "Cohort",
     "fields": [
         {
-            "fieldName": "cohortId",
-            "fieldType": "Double"
-        },
-        {
             "fieldName": "gradDate",
             "fieldType": "String"
         }

.jhipster/Employer.json

@@ -2,10 +2,6 @@
     "name": "Employer",
     "fields": [
         {
-            "fieldName": "employerId",
-            "fieldType": "Long"
-        },
-        {
             "fieldName": "companyName",
             "fieldType": "String"
         },

.jhipster/Post.json

@@ -2,10 +2,6 @@
     "name": "Post",
     "fields": [
         {
-            "fieldName": "postId",
-            "fieldType": "Long"
-        },
-        {
             "fieldName": "timestamp",
             "fieldType": "LocalDate"
         },
@@ -20,25 +16,15 @@
     ],
     "relationships": [
         {
-            "relationshipType": "one-to-one",
+            "relationshipType": "many-to-one",
             "relationshipName": "poster",
-            "otherEntityName": "user",
-            "otherEntityField": "id",
-            "ownerSide": true,
-            "otherEntityRelationshipName": "post"
+            "otherEntityName": "userProfile",
+            "otherEntityField": "id"
         },
         {
-            "relationshipType": "one-to-one",
+            "relationshipType": "many-to-one",
             "relationshipName": "privacySetting",
             "otherEntityName": "privacy",
-            "otherEntityField": "id",
-            "ownerSide": true,
-            "otherEntityRelationshipName": "post"
-        },
-        {
-            "relationshipType": "many-to-one",
-            "relationshipName": "poster",
-            "otherEntityName": "user",
             "otherEntityField": "id"
         }
     ],

.jhipster/Privacy.json

@@ -2,10 +2,6 @@
     "name": "Privacy",
     "fields": [
         {
-            "fieldName": "privacyId",
-            "fieldType": "Long"
-        },
-        {
             "fieldName": "publicView",
             "fieldType": "Boolean"
         },

.jhipster/UserProfile.json

@@ -2,10 +2,6 @@
     "name": "UserProfile",
     "fields": [
         {
-            "fieldName": "profileId",
-            "fieldType": "Long"
-        },
-        {
             "fieldName": "firstName",
             "fieldType": "String"
         },
@@ -28,22 +24,6 @@
             "otherEntityRelationshipName": "userProfile"
         },
         {
-            "relationshipType": "one-to-one",
-            "relationshipName": "cohort",
-            "otherEntityName": "cohort",
-            "otherEntityField": "id",
-            "ownerSide": true,
-            "otherEntityRelationshipName": "userProfile"
-        },
-        {
-            "relationshipType": "one-to-one",
-            "relationshipName": "employer",
-            "otherEntityName": "employer",
-            "otherEntityField": "id",
-            "ownerSide": true,
-            "otherEntityRelationshipName": "userProfile"
-        },
-        {
             "relationshipType": "many-to-one",
             "relationshipName": "employer",
             "otherEntityName": "employer",

jhipster-jdl.jh

@@ -1,35 +1,26 @@
-entity User {
-	userId Long,
-}
-
 entity UserProfile {
-	profileId Long,
     firstName String,
     lastName String,
     userStack String,
 }
 
 entity Cohort {
-	cohortId Double,
     gradDate String
 }
 
 entity Employer {
-	employerId Long,
     companyName String,
     city String,
     state String
 }
 
 entity Post {
-	postId Long,
     timestamp LocalDate,
     content String,
     likes String,
 }
 
 entity Privacy {
-	privacyId Long,
 	publicView Boolean,
     cohortView Boolean,
     employerView Boolean
@@ -41,7 +32,7 @@ relationship ManyToOne {
 }
 
 relationship ManyToOne {
-    Post{poster} to User
+    Post{poster} to UserProfile
 }
 
 relationship ManyToOne {
@@ -52,19 +43,7 @@ relationship OneToOne {
 	UserProfile{user} to User
 }
 
-relationship OneToOne {
-    Post{poster} to User
-}
-
-relationship OneToOne {
-	UserProfile{cohort} to Cohort
-}
-
-relationship OneToOne {
-	UserProfile{employer} to Employer
-}
-
-relationship OneToOne {
+relationship ManyToOne {
 	Post{privacySetting} to Privacy
 }
 

src/main/java/rocks/zipcode/io/domain/Post.java

@@ -33,12 +33,13 @@ public class Post implements Serializable {
     @Column(name = "likes")
     private String likes;
 
-    @OneToOne    @JoinColumn(unique = true)
-    private Privacy privacySetting;
+    @ManyToOne
+    @JsonIgnoreProperties("")
+    private UserProfile poster;
 
     @ManyToOne
     @JsonIgnoreProperties("")
-    private User poster;
+    private Privacy privacySetting;
 
     // jhipster-needle-entity-add-field - JHipster will add fields here, do not remove
     public Long getId() {
@@ -88,17 +89,17 @@ public class Post implements Serializable {
         this.likes = likes;
     }
 
-    public User getPoster() {
+    public UserProfile getPoster() {
         return poster;
     }
 
-    public Post poster(User user) {
-        this.poster = user;
+    public Post poster(UserProfile userProfile) {
+        this.poster = userProfile;
         return this;
     }
 
-    public void setPoster(User user) {
-        this.poster = user;
+    public void setPoster(UserProfile userProfile) {
+        this.poster = userProfile;
     }
 
     public Privacy getPrivacySetting() {
@@ -113,7 +114,7 @@ public class Post implements Serializable {
     public void setPrivacySetting(Privacy privacy) {
         this.privacySetting = privacy;
     }
-
+    // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here, do not remove
 
     @Override
     public boolean equals(Object o) {

src/main/java/rocks/zipcode/io/domain/UserProfile.java

@@ -104,32 +104,33 @@ public class UserProfile implements Serializable {
         this.user = user;
     }
 
-    public Cohort getCohort() {
-        return cohort;
+    public Employer getEmployer() {
+        return employer;
     }
 
-    public UserProfile cohort(Cohort cohort) {
-        this.cohort = cohort;
+    public UserProfile employer(Employer employer) {
+        this.employer = employer;
         return this;
     }
 
-    public void setCohort(Cohort cohort) {
-        this.cohort = cohort;
-    }
-
     public void setEmployer(Employer employer) {
         this.employer = employer;
     }
 
-    public Employer getEmployer() {
-        return employer;
+    public Cohort getCohort() {
+        return cohort;
     }
 
-    public UserProfile employer(Employer employer) {
-        this.employer = employer;
+    public UserProfile cohort(Cohort cohort) {
+        this.cohort = cohort;
         return this;
     }
 
+    public void setCohort(Cohort cohort) {
+        this.cohort = cohort;
+    }
+    // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here, do not remove
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/main/java/rocks/zipcode/io/repository/PostRepository.java

@@ -4,7 +4,6 @@ import rocks.zipcode.io.domain.Post;
 import org.springframework.data.jpa.repository.*;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 
 /**
  * Spring Data  repository for the Post entity.
@@ -13,7 +12,4 @@ import java.util.List;
 @Repository
 public interface PostRepository extends JpaRepository<Post, Long> {
 
-    @Query("select post from Post post where post.poster.login = ?#{principal.username}")
-    List<Post> findByPosterIsCurrentUser();
-
 }

src/main/resources/config/liquibase/changelog/20181217184612_added_entity_UserProfile.xml

@@ -22,10 +22,6 @@
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="profile_id" type="bigint">
-                <constraints nullable="true" />
-            </column>
-
             <column name="first_name" type="varchar(255)">
                 <constraints nullable="true" />
             </column>
@@ -39,10 +35,6 @@
             </column>
             <column name="user_id" type="bigint">
                 <constraints unique="true" nullable="true" uniqueConstraintName="ux_user_profile_user_id" />
-            </column>            <column name="cohort_id" type="bigint">
-                <constraints unique="true" nullable="true" uniqueConstraintName="ux_user_profile_cohort_id" />
-            </column>            <column name="employer_id" type="bigint">
-                <constraints unique="true" nullable="true" uniqueConstraintName="ux_user_profile_employer_id" />
             </column>
             <column name="employer_id" type="bigint">
                 <constraints nullable="true" />

src/main/resources/config/liquibase/changelog/20181217184612_added_entity_constraints_UserProfile.xml

@@ -14,18 +14,6 @@
                                  referencedColumnNames="id"
                                  referencedTableName="jhi_user"/>
 
-        <addForeignKeyConstraint baseColumnNames="cohort_id"
-                                 baseTableName="user_profile"
-                                 constraintName="fk_user_profile_cohort_id"
-                                 referencedColumnNames="id"
-                                 referencedTableName="cohort"/>
-
-        <addForeignKeyConstraint baseColumnNames="employer_id"
-                                 baseTableName="user_profile"
-                                 constraintName="fk_user_profile_employer_id"
-                                 referencedColumnNames="id"
-                                 referencedTableName="employer"/>
-
         <addForeignKeyConstraint baseColumnNames="employer_id"
                                  baseTableName="user_profile"
                                  constraintName="fk_user_profile_employer_id"

src/main/resources/config/liquibase/changelog/20181217184613_added_entity_Cohort.xml

@@ -22,10 +22,6 @@
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="cohort_id" type="double">
-                <constraints nullable="true" />
-            </column>
-
             <column name="grad_date" type="varchar(255)">
                 <constraints nullable="true" />
             </column>

src/main/resources/config/liquibase/changelog/20181217184614_added_entity_Employer.xml

@@ -22,10 +22,6 @@
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="employer_id" type="bigint">
-                <constraints nullable="true" />
-            </column>
-
             <column name="company_name" type="varchar(255)">
                 <constraints nullable="true" />
             </column>

src/main/resources/config/liquibase/changelog/20181217184615_added_entity_Post.xml

@@ -22,10 +22,6 @@
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="post_id" type="bigint">
-                <constraints nullable="true" />
-            </column>
-
             <column name="jhi_timestamp" type="date">
                 <constraints nullable="true" />
             </column>
@@ -37,12 +33,12 @@
             <column name="likes" type="varchar(255)">
                 <constraints nullable="true" />
             </column>
+
             <column name="poster_id" type="bigint">
-                <constraints unique="true" nullable="true" uniqueConstraintName="ux_post_poster_id" />
-            </column>            <column name="privacy_setting_id" type="bigint">
-                <constraints unique="true" nullable="true" uniqueConstraintName="ux_post_privacy_setting_id" />
+                <constraints nullable="true" />
             </column>
-            <column name="poster_id" type="bigint">
+
+            <column name="privacy_setting_id" type="bigint">
                 <constraints nullable="true" />
             </column>
 

src/main/resources/config/liquibase/changelog/20181217184615_added_entity_constraints_Post.xml

@@ -12,7 +12,7 @@
                                  baseTableName="post"
                                  constraintName="fk_post_poster_id"
                                  referencedColumnNames="id"
-                                 referencedTableName="jhi_user"/>
+                                 referencedTableName="user_profile"/>
 
         <addForeignKeyConstraint baseColumnNames="privacy_setting_id"
                                  baseTableName="post"
@@ -20,11 +20,5 @@
                                  referencedColumnNames="id"
                                  referencedTableName="privacy"/>
 
-        <addForeignKeyConstraint baseColumnNames="poster_id"
-                                 baseTableName="post"
-                                 constraintName="fk_post_poster_id"
-                                 referencedColumnNames="id"
-                                 referencedTableName="jhi_user"/>
-
     </changeSet>
 </databaseChangeLog>

src/main/resources/config/liquibase/changelog/20181217184616_added_entity_Privacy.xml

@@ -22,10 +22,6 @@
             <column name="id" type="bigint" autoIncrement="${autoIncrement}">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="privacy_id" type="bigint">
-                <constraints nullable="true" />
-            </column>
-
             <column name="public_view" type="bit">
                 <constraints nullable="true" />
             </column>

src/main/webapp/app/entities/cohort/cohort-detail.component.html

@@ -5,10 +5,6 @@
             <hr>
             <jhi-alert-error></jhi-alert-error>
             <dl class="row-md jh-entity-details">
-                <dt><span jhiTranslate="zipConnectApp.cohort.cohortId">Cohort Id</span></dt>
-                <dd>
-                    <span>{{cohort.cohortId}}</span>
-                </dd>
                 <dt><span jhiTranslate="zipConnectApp.cohort.gradDate">Grad Date</span></dt>
                 <dd>
                     <span>{{cohort.gradDate}}</span>

src/main/webapp/app/entities/cohort/cohort-update.component.html

@@ -10,11 +10,6 @@
                         [(ngModel)]="cohort.id" readonly />
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.cohort.cohortId" for="field_cohortId">Cohort Id</label>
-                    <input type="number" class="form-control" name="cohortId" id="field_cohortId"
-                        [(ngModel)]="cohort.cohortId" />
-                </div>
-                <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.cohort.gradDate" for="field_gradDate">Grad Date</label>
                     <input type="text" class="form-control" name="gradDate" id="field_gradDate"
                         [(ngModel)]="cohort.gradDate" />

src/main/webapp/app/entities/cohort/cohort.component.html

@@ -15,7 +15,6 @@
             <thead>
             <tr>
             <th><span jhiTranslate="global.field.id">ID</span></th>
-            <th><span jhiTranslate="zipConnectApp.cohort.cohortId">Cohort Id</span></th>
             <th><span jhiTranslate="zipConnectApp.cohort.gradDate">Grad Date</span></th>
             <th></th>
             </tr>
@@ -23,7 +22,6 @@
             <tbody>
             <tr *ngFor="let cohort of cohorts ;trackBy: trackId">
                 <td><a [routerLink]="['/cohort', cohort.id, 'view' ]">{{cohort.id}}</a></td>
-                <td>{{cohort.cohortId}}</td>
                 <td>{{cohort.gradDate}}</td>
                 <td class="text-right">
                     <div class="btn-group flex-btn-group-container">

src/main/webapp/app/entities/employer/employer-detail.component.html

@@ -5,10 +5,6 @@
             <hr>
             <jhi-alert-error></jhi-alert-error>
             <dl class="row-md jh-entity-details">
-                <dt><span jhiTranslate="zipConnectApp.employer.employerId">Employer Id</span></dt>
-                <dd>
-                    <span>{{employer.employerId}}</span>
-                </dd>
                 <dt><span jhiTranslate="zipConnectApp.employer.companyName">Company Name</span></dt>
                 <dd>
                     <span>{{employer.companyName}}</span>

src/main/webapp/app/entities/employer/employer-update.component.html

@@ -10,11 +10,6 @@
                         [(ngModel)]="employer.id" readonly />
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.employer.employerId" for="field_employerId">Employer Id</label>
-                    <input type="number" class="form-control" name="employerId" id="field_employerId"
-                        [(ngModel)]="employer.employerId" />
-                </div>
-                <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.employer.companyName" for="field_companyName">Company Name</label>
                     <input type="text" class="form-control" name="companyName" id="field_companyName"
                         [(ngModel)]="employer.companyName" />

src/main/webapp/app/entities/employer/employer.component.html

@@ -15,7 +15,6 @@
             <thead>
             <tr>
             <th><span jhiTranslate="global.field.id">ID</span></th>
-            <th><span jhiTranslate="zipConnectApp.employer.employerId">Employer Id</span></th>
             <th><span jhiTranslate="zipConnectApp.employer.companyName">Company Name</span></th>
             <th><span jhiTranslate="zipConnectApp.employer.city">City</span></th>
             <th><span jhiTranslate="zipConnectApp.employer.state">State</span></th>
@@ -25,7 +24,6 @@
             <tbody>
             <tr *ngFor="let employer of employers ;trackBy: trackId">
                 <td><a [routerLink]="['/employer', employer.id, 'view' ]">{{employer.id}}</a></td>
-                <td>{{employer.employerId}}</td>
                 <td>{{employer.companyName}}</td>
                 <td>{{employer.city}}</td>
                 <td>{{employer.state}}</td>

src/main/webapp/app/entities/post/post-detail.component.html

@@ -5,10 +5,6 @@
             <hr>
             <jhi-alert-error></jhi-alert-error>
             <dl class="row-md jh-entity-details">
-                <dt><span jhiTranslate="zipConnectApp.post.postId">Post Id</span></dt>
-                <dd>
-                    <span>{{post.postId}}</span>
-                </dd>
                 <dt><span jhiTranslate="zipConnectApp.post.timestamp">Timestamp</span></dt>
                 <dd>
                     <span>{{post.timestamp}}</span>
@@ -23,7 +19,9 @@
                 </dd>
                 <dt><span jhiTranslate="zipConnectApp.post.poster">Poster</span></dt>
                 <dd>
-                    {{post.poster?.id}}
+                    <div *ngIf="post.poster">
+                        <a [routerLink]="['/user-profile', post.poster?.id, 'view']">{{post.poster?.id}}</a>
+                    </div>
                 </dd>
                 <dt><span jhiTranslate="zipConnectApp.post.privacySetting">Privacy Setting</span></dt>
                 <dd>
@@ -31,10 +29,6 @@
                         <a [routerLink]="['/privacy', post.privacySetting?.id, 'view']">{{post.privacySetting?.id}}</a>
                     </div>
                 </dd>
-                <dt><span jhiTranslate="zipConnectApp.post.poster">Poster</span></dt>
-                <dd>
-                    {{post.poster?.id}}
-                </dd>
             </dl>
 
             <button type="submit"

src/main/webapp/app/entities/post/post-update.component.html

@@ -10,11 +10,6 @@
                         [(ngModel)]="post.id" readonly />
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.post.postId" for="field_postId">Post Id</label>
-                    <input type="number" class="form-control" name="postId" id="field_postId"
-                        [(ngModel)]="post.postId" />
-                </div>
-                <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.post.timestamp" for="field_timestamp">Timestamp</label>
                     <div class="input-group">
                         <input id="field_timestamp" type="text" class="form-control" name="timestamp" ngbDatepicker  #timestampDp="ngbDatepicker" [(ngModel)]="post.timestamp"
@@ -39,21 +34,14 @@
                     <label class="form-control-label" jhiTranslate="zipConnectApp.post.poster" for="field_poster">Poster</label>
                     <select class="form-control" id="field_poster" name="poster" [(ngModel)]="post.poster" >
                         <option [ngValue]="null"></option>
-                        <option [ngValue]="userOption.id === post.poster?.id ? post.poster : userOption" *ngFor="let userOption of users; trackBy: trackUserById">{{userOption.id}}</option>
+                        <option [ngValue]="userProfileOption.id === post.poster?.id ? post.poster : userProfileOption" *ngFor="let userProfileOption of userprofiles; trackBy: trackUserProfileById">{{userProfileOption.id}}</option>
                     </select>
                 </div>
                 <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.post.privacySetting" for="field_privacySetting">Privacy Setting</label>
-                    <select class="form-control" id="field_privacySetting" name="privacySetting" [(ngModel)]="post.privacySetting">
-                        <option [ngValue]="null"></option>
-                        <option [ngValue]="privacyOption.id === post.privacySetting?.id ? post.privacySetting : privacyOption" *ngFor="let privacyOption of privacysettings; trackBy: trackPrivacyById">{{privacyOption.id}}</option>
-                    </select>
-                </div>
-                <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.post.poster" for="field_poster">Poster</label>
-                    <select class="form-control" id="field_poster" name="poster" [(ngModel)]="post.poster" >
+                    <select class="form-control" id="field_privacySetting" name="privacySetting" [(ngModel)]="post.privacySetting" >
                         <option [ngValue]="null"></option>
-                        <option [ngValue]="userOption.id === post.poster?.id ? post.poster : userOption" *ngFor="let userOption of users; trackBy: trackUserById">{{userOption.id}}</option>
+                        <option [ngValue]="privacyOption.id === post.privacySetting?.id ? post.privacySetting : privacyOption" *ngFor="let privacyOption of privacies; trackBy: trackPrivacyById">{{privacyOption.id}}</option>
                     </select>
                 </div>
             </div>

src/main/webapp/app/entities/post/post-update.component.ts

@@ -7,7 +7,8 @@ import { JhiAlertService } from 'ng-jhipster';
 
 import { IPost } from 'app/shared/model/post.model';
 import { PostService } from './post.service';
-import { IUser, UserService } from 'app/core';
+import { IUserProfile } from 'app/shared/model/user-profile.model';
+import { UserProfileService } from 'app/entities/user-profile';
 import { IPrivacy } from 'app/shared/model/privacy.model';
 import { PrivacyService } from 'app/entities/privacy';
 
@@ -19,15 +20,15 @@ export class PostUpdateComponent implements OnInit {
     post: IPost;
     isSaving: boolean;
 
-    users: IUser[];
+    userprofiles: IUserProfile[];
 
-    privacysettings: IPrivacy[];
+    privacies: IPrivacy[];
     timestampDp: any;
 
     constructor(
         private jhiAlertService: JhiAlertService,
         private postService: PostService,
-        private userService: UserService,
+        private userProfileService: UserProfileService,
         private privacyService: PrivacyService,
         private activatedRoute: ActivatedRoute
     ) {}
@@ -37,24 +38,15 @@ export class PostUpdateComponent implements OnInit {
         this.activatedRoute.data.subscribe(({ post }) => {
             this.post = post;
         });
-        this.userService.query().subscribe(
-            (res: HttpResponse<IUser[]>) => {
-                this.users = res.body;
+        this.userProfileService.query().subscribe(
+            (res: HttpResponse<IUserProfile[]>) => {
+                this.userprofiles = res.body;
             },
             (res: HttpErrorResponse) => this.onError(res.message)
         );
-        this.privacyService.query({ filter: 'post-is-null' }).subscribe(
+        this.privacyService.query().subscribe(
             (res: HttpResponse<IPrivacy[]>) => {
-                if (!this.post.privacySetting || !this.post.privacySetting.id) {
-                    this.privacysettings = res.body;
-                } else {
-                    this.privacyService.find(this.post.privacySetting.id).subscribe(
-                        (subRes: HttpResponse<IPrivacy>) => {
-                            this.privacysettings = [subRes.body].concat(res.body);
-                        },
-                        (subRes: HttpErrorResponse) => this.onError(subRes.message)
-                    );
-                }
+                this.privacies = res.body;
             },
             (res: HttpErrorResponse) => this.onError(res.message)
         );
@@ -90,7 +82,7 @@ export class PostUpdateComponent implements OnInit {
         this.jhiAlertService.error(errorMessage, null, null);
     }
 
-    trackUserById(index: number, item: IUser) {
+    trackUserProfileById(index: number, item: IUserProfile) {
         return item.id;
     }
 

src/main/webapp/app/entities/post/post.component.html

@@ -15,34 +15,30 @@
             <thead>
             <tr>
             <th><span jhiTranslate="global.field.id">ID</span></th>
-            <th><span jhiTranslate="zipConnectApp.post.postId">Post Id</span></th>
             <th><span jhiTranslate="zipConnectApp.post.timestamp">Timestamp</span></th>
             <th><span jhiTranslate="zipConnectApp.post.content">Content</span></th>
             <th><span jhiTranslate="zipConnectApp.post.likes">Likes</span></th>
             <th><span jhiTranslate="zipConnectApp.post.poster">Poster</span></th>
             <th><span jhiTranslate="zipConnectApp.post.privacySetting">Privacy Setting</span></th>
-            <th><span jhiTranslate="zipConnectApp.post.poster">Poster</span></th>
             <th></th>
             </tr>
             </thead>
             <tbody>
             <tr *ngFor="let post of posts ;trackBy: trackId">
                 <td><a [routerLink]="['/post', post.id, 'view' ]">{{post.id}}</a></td>
-                <td>{{post.postId}}</td>
                 <td>{{post.timestamp | date:'mediumDate'}}</td>
                 <td>{{post.content}}</td>
                 <td>{{post.likes}}</td>
                 <td>
-                    {{post.poster?.id}}
+                    <div *ngIf="post.poster">
+                        <a [routerLink]="['../user-profile', post.poster?.id, 'view' ]" >{{post.poster?.id}}</a>
+                    </div>
                 </td>
                 <td>
                     <div *ngIf="post.privacySetting">
                         <a [routerLink]="['../privacy', post.privacySetting?.id, 'view' ]" >{{post.privacySetting?.id}}</a>
                     </div>
                 </td>
-                <td>
-                    {{post.poster?.id}}
-                </td>
                 <td class="text-right">
                     <div class="btn-group flex-btn-group-container">
                         <button type="submit"

src/main/webapp/app/entities/post/post.module.ts

@@ -2,7 +2,6 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { ZipConnectSharedModule } from 'app/shared';
-import { ZipConnectAdminModule } from 'app/admin/admin.module';
 import {
     PostComponent,
     PostDetailComponent,
@@ -16,7 +15,7 @@ import {
 const ENTITY_STATES = [...postRoute, ...postPopupRoute];
 
 @NgModule({
-    imports: [ZipConnectSharedModule, ZipConnectAdminModule, RouterModule.forChild(ENTITY_STATES)],
+    imports: [ZipConnectSharedModule, RouterModule.forChild(ENTITY_STATES)],
     declarations: [PostComponent, PostDetailComponent, PostUpdateComponent, PostDeleteDialogComponent, PostDeletePopupComponent],
     entryComponents: [PostComponent, PostUpdateComponent, PostDeleteDialogComponent, PostDeletePopupComponent],
     schemas: [CUSTOM_ELEMENTS_SCHEMA]

src/main/webapp/app/entities/privacy/privacy-detail.component.html

@@ -5,10 +5,6 @@
             <hr>
             <jhi-alert-error></jhi-alert-error>
             <dl class="row-md jh-entity-details">
-                <dt><span jhiTranslate="zipConnectApp.privacy.privacyId">Privacy Id</span></dt>
-                <dd>
-                    <span>{{privacy.privacyId}}</span>
-                </dd>
                 <dt><span jhiTranslate="zipConnectApp.privacy.publicView">Public View</span></dt>
                 <dd>
                     <span>{{privacy.publicView}}</span>

src/main/webapp/app/entities/privacy/privacy-update.component.html

@@ -10,11 +10,6 @@
                         [(ngModel)]="privacy.id" readonly />
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.privacy.privacyId" for="field_privacyId">Privacy Id</label>
-                    <input type="number" class="form-control" name="privacyId" id="field_privacyId"
-                        [(ngModel)]="privacy.privacyId" />
-                </div>
-                <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.privacy.publicView" for="field_publicView">Public View</label>
                     <input type="checkbox" class="form-control" name="publicView" id="field_publicView"
                         [(ngModel)]="privacy.publicView" />

src/main/webapp/app/entities/privacy/privacy.component.html

@@ -15,7 +15,6 @@
             <thead>
             <tr>
             <th><span jhiTranslate="global.field.id">ID</span></th>
-            <th><span jhiTranslate="zipConnectApp.privacy.privacyId">Privacy Id</span></th>
             <th><span jhiTranslate="zipConnectApp.privacy.publicView">Public View</span></th>
             <th><span jhiTranslate="zipConnectApp.privacy.cohortView">Cohort View</span></th>
             <th><span jhiTranslate="zipConnectApp.privacy.employerView">Employer View</span></th>
@@ -25,7 +24,6 @@
             <tbody>
             <tr *ngFor="let privacy of privacies ;trackBy: trackId">
                 <td><a [routerLink]="['/privacy', privacy.id, 'view' ]">{{privacy.id}}</a></td>
-                <td>{{privacy.privacyId}}</td>
                 <td>{{privacy.publicView}}</td>
                 <td>{{privacy.cohortView}}</td>
                 <td>{{privacy.employerView}}</td>

src/main/webapp/app/entities/user-profile/user-profile-detail.component.html

@@ -5,10 +5,6 @@
             <hr>
             <jhi-alert-error></jhi-alert-error>
             <dl class="row-md jh-entity-details">
-                <dt><span jhiTranslate="zipConnectApp.userProfile.profileId">Profile Id</span></dt>
-                <dd>
-                    <span>{{userProfile.profileId}}</span>
-                </dd>
                 <dt><span jhiTranslate="zipConnectApp.userProfile.firstName">First Name</span></dt>
                 <dd>
                     <span>{{userProfile.firstName}}</span>
@@ -25,18 +21,6 @@
                 <dd>
                     {{userProfile.user?.id}}
                 </dd>
-                <dt><span jhiTranslate="zipConnectApp.userProfile.cohort">Cohort</span></dt>
-                <dd>
-                    <div *ngIf="userProfile.cohort">
-                        <a [routerLink]="['/cohort', userProfile.cohort?.id, 'view']">{{userProfile.cohort?.id}}</a>
-                    </div>
-                </dd>
-                <dt><span jhiTranslate="zipConnectApp.userProfile.employer">Employer</span></dt>
-                <dd>
-                    <div *ngIf="userProfile.employer">
-                        <a [routerLink]="['/employer', userProfile.employer?.id, 'view']">{{userProfile.employer?.id}}</a>
-                    </div>
-                </dd>
                 <dt><span jhiTranslate="zipConnectApp.userProfile.employer">Employer</span></dt>
                 <dd>
                     <div *ngIf="userProfile.employer">

src/main/webapp/app/entities/user-profile/user-profile-update.component.html

@@ -10,11 +10,6 @@
                         [(ngModel)]="userProfile.id" readonly />
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.profileId" for="field_profileId">Profile Id</label>
-                    <input type="number" class="form-control" name="profileId" id="field_profileId"
-                        [(ngModel)]="userProfile.profileId" />
-                </div>
-                <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.firstName" for="field_firstName">First Name</label>
                     <input type="text" class="form-control" name="firstName" id="field_firstName"
                         [(ngModel)]="userProfile.firstName" />

src/main/webapp/app/entities/user-profile/user-profile-update.component.ts

@@ -7,10 +7,10 @@ import { JhiAlertService } from 'ng-jhipster';
 import { IUserProfile } from 'app/shared/model/user-profile.model';
 import { UserProfileService } from './user-profile.service';
 import { IUser, UserService } from 'app/core';
-import { ICohort } from 'app/shared/model/cohort.model';
-import { CohortService } from 'app/entities/cohort';
 import { IEmployer } from 'app/shared/model/employer.model';
 import { EmployerService } from 'app/entities/employer';
+import { ICohort } from 'app/shared/model/cohort.model';
+import { CohortService } from 'app/entities/cohort';
 
 @Component({
     selector: 'jhi-user-profile-update',
@@ -22,16 +22,16 @@ export class UserProfileUpdateComponent implements OnInit {
 
     users: IUser[];
 
-    cohorts: ICohort[];
-
     employers: IEmployer[];
 
+    cohorts: ICohort[];
+
     constructor(
         private jhiAlertService: JhiAlertService,
         private userProfileService: UserProfileService,
         private userService: UserService,
-        private cohortService: CohortService,
         private employerService: EmployerService,
+        private cohortService: CohortService,
         private activatedRoute: ActivatedRoute
     ) {}
 
@@ -46,36 +46,6 @@ export class UserProfileUpdateComponent implements OnInit {
             },
             (res: HttpErrorResponse) => this.onError(res.message)
         );
-        this.cohortService.query({ filter: 'userprofile-is-null' }).subscribe(
-            (res: HttpResponse<ICohort[]>) => {
-                if (!this.userProfile.cohort || !this.userProfile.cohort.id) {
-                    this.cohorts = res.body;
-                } else {
-                    this.cohortService.find(this.userProfile.cohort.id).subscribe(
-                        (subRes: HttpResponse<ICohort>) => {
-                            this.cohorts = [subRes.body].concat(res.body);
-                        },
-                        (subRes: HttpErrorResponse) => this.onError(subRes.message)
-                    );
-                }
-            },
-            (res: HttpErrorResponse) => this.onError(res.message)
-        );
-        this.employerService.query({ filter: 'userprofile-is-null' }).subscribe(
-            (res: HttpResponse<IEmployer[]>) => {
-                if (!this.userProfile.employer || !this.userProfile.employer.id) {
-                    this.employers = res.body;
-                } else {
-                    this.employerService.find(this.userProfile.employer.id).subscribe(
-                        (subRes: HttpResponse<IEmployer>) => {
-                            this.employers = [subRes.body].concat(res.body);
-                        },
-                        (subRes: HttpErrorResponse) => this.onError(subRes.message)
-                    );
-                }
-            },
-            (res: HttpErrorResponse) => this.onError(res.message)
-        );
         this.employerService.query().subscribe(
             (res: HttpResponse<IEmployer[]>) => {
                 this.employers = res.body;
@@ -124,11 +94,11 @@ export class UserProfileUpdateComponent implements OnInit {
         return item.id;
     }
 
-    trackCohortById(index: number, item: ICohort) {
+    trackEmployerById(index: number, item: IEmployer) {
         return item.id;
     }
 
-    trackEmployerById(index: number, item: IEmployer) {
+    trackCohortById(index: number, item: ICohort) {
         return item.id;
     }
 }

src/main/webapp/app/entities/user-profile/user-profile.component.html

@@ -15,13 +15,10 @@
             <thead>
             <tr>
             <th><span jhiTranslate="global.field.id">ID</span></th>
-            <th><span jhiTranslate="zipConnectApp.userProfile.profileId">Profile Id</span></th>
             <th><span jhiTranslate="zipConnectApp.userProfile.firstName">First Name</span></th>
             <th><span jhiTranslate="zipConnectApp.userProfile.lastName">Last Name</span></th>
             <th><span jhiTranslate="zipConnectApp.userProfile.userStack">User Stack</span></th>
             <th><span jhiTranslate="zipConnectApp.userProfile.user">User</span></th>
-            <th><span jhiTranslate="zipConnectApp.userProfile.cohort">Cohort</span></th>
-            <th><span jhiTranslate="zipConnectApp.userProfile.employer">Employer</span></th>
             <th><span jhiTranslate="zipConnectApp.userProfile.employer">Employer</span></th>
             <th><span jhiTranslate="zipConnectApp.userProfile.cohort">Cohort</span></th>
             <th></th>
@@ -30,7 +27,6 @@
             <tbody>
             <tr *ngFor="let userProfile of userProfiles ;trackBy: trackId">
                 <td><a [routerLink]="['/user-profile', userProfile.id, 'view' ]">{{userProfile.id}}</a></td>
-                <td>{{userProfile.profileId}}</td>
                 <td>{{userProfile.firstName}}</td>
                 <td>{{userProfile.lastName}}</td>
                 <td>{{userProfile.userStack}}</td>
@@ -38,16 +34,6 @@
                     {{userProfile.user?.id}}
                 </td>
                 <td>
-                    <div *ngIf="userProfile.cohort">
-                        <a [routerLink]="['../cohort', userProfile.cohort?.id, 'view' ]" >{{userProfile.cohort?.id}}</a>
-                    </div>
-                </td>
-                <td>
-                    <div *ngIf="userProfile.employer">
-                        <a [routerLink]="['../employer', userProfile.employer?.id, 'view' ]" >{{userProfile.employer?.id}}</a>
-                    </div>
-                </td>
-                <td>
                     <div *ngIf="userProfile.employer">
                         <a [routerLink]="['../employer', userProfile.employer?.id, 'view' ]" >{{userProfile.employer?.id}}</a>
                     </div>

src/main/webapp/app/shared/model/cohort.model.ts

@@ -1,6 +1,5 @@
 export interface ICohort {
     id?: number;
-    cohortId?: number;
     gradDate?: string;
 }
 

src/main/webapp/app/shared/model/employer.model.ts

@@ -1,6 +1,5 @@
 export interface IEmployer {
     id?: number;
-    employerId?: number;
     companyName?: string;
     city?: string;
     state?: string;

src/main/webapp/app/shared/model/post.model.ts

@@ -1,5 +1,5 @@
 import { Moment } from 'moment';
-import { IUser } from 'app/core/user/user.model';
+import { IUserProfile } from 'app/shared/model//user-profile.model';
 import { IPrivacy } from 'app/shared/model//privacy.model';
 
 export interface IPost {
@@ -7,7 +7,7 @@ export interface IPost {
     timestamp?: Moment;
     content?: string;
     likes?: string;
-    poster?: IUser;
+    poster?: IUserProfile;
     privacySetting?: IPrivacy;
 }
 
@@ -17,7 +17,7 @@ export class Post implements IPost {
         public timestamp?: Moment,
         public content?: string,
         public likes?: string,
-        public poster?: IUser,
+        public poster?: IUserProfile,
         public privacySetting?: IPrivacy
     ) {}
 }

src/main/webapp/app/shared/model/privacy.model.ts

@@ -1,6 +1,5 @@
 export interface IPrivacy {
     id?: number;
-    privacyId?: number;
     publicView?: boolean;
     cohortView?: boolean;
     employerView?: boolean;

src/main/webapp/app/shared/model/user-profile.model.ts

@@ -1,6 +1,6 @@
 import { IUser } from 'app/core/user/user.model';
-import { ICohort } from 'app/shared/model//cohort.model';
 import { IEmployer } from 'app/shared/model//employer.model';
+import { ICohort } from 'app/shared/model//cohort.model';
 
 export interface IUserProfile {
     id?: number;
@@ -8,8 +8,8 @@ export interface IUserProfile {
     lastName?: string;
     userStack?: string;
     user?: IUser;
-    cohort?: ICohort;
     employer?: IEmployer;
+    cohort?: ICohort;
 }
 
 export class UserProfile implements IUserProfile {
@@ -19,7 +19,7 @@ export class UserProfile implements IUserProfile {
         public lastName?: string,
         public userStack?: string,
         public user?: IUser,
-        public cohort?: ICohort,
-        public employer?: IEmployer
+        public employer?: IEmployer,
+        public cohort?: ICohort
     ) {}
 }

src/main/webapp/i18n/en/cohort.json

@@ -15,7 +15,6 @@
             "detail": {
                 "title": "Cohort"
             },
-            "cohortId": "Cohort Id",
             "gradDate": "Grad Date"
         }
     }

src/main/webapp/i18n/en/employer.json

@@ -15,7 +15,6 @@
             "detail": {
                 "title": "Employer"
             },
-            "employerId": "Employer Id",
             "companyName": "Company Name",
             "city": "City",
             "state": "State"

src/main/webapp/i18n/en/post.json

@@ -15,13 +15,11 @@
             "detail": {
                 "title": "Post"
             },
-            "postId": "Post Id",
             "timestamp": "Timestamp",
             "content": "Content",
             "likes": "Likes",
             "poster": "Poster",
-            "privacySetting": "Privacy Setting",
-            "poster": "Poster"
+            "privacySetting": "Privacy Setting"
         }
     }
 }

src/main/webapp/i18n/en/privacy.json

@@ -15,7 +15,6 @@
             "detail": {
                 "title": "Privacy"
             },
-            "privacyId": "Privacy Id",
             "publicView": "Public View",
             "cohortView": "Cohort View",
             "employerView": "Employer View"

src/main/webapp/i18n/en/userProfile.json

@@ -15,13 +15,10 @@
             "detail": {
                 "title": "User Profile"
             },
-            "profileId": "Profile Id",
             "firstName": "First Name",
             "lastName": "Last Name",
             "userStack": "User Stack",
             "user": "User",
-            "cohort": "Cohort",
-            "employer": "Employer",
             "employer": "Employer",
             "cohort": "Cohort"
         }

src/main/webapp/i18n/es/cohort.json

@@ -15,7 +15,6 @@
             "detail": {
                 "title": "Cohort"
             },
-            "cohortId": "Cohort Id",
             "gradDate": "Grad Date"
         }
     }

src/main/webapp/i18n/es/employer.json

@@ -15,7 +15,6 @@
             "detail": {
                 "title": "Employer"
             },
-            "employerId": "Employer Id",
             "companyName": "Company Name",
             "city": "City",
             "state": "State"

src/main/webapp/i18n/es/post.json

@@ -15,13 +15,11 @@
             "detail": {
                 "title": "Post"
             },
-            "postId": "Post Id",
             "timestamp": "Timestamp",
             "content": "Content",
             "likes": "Likes",
             "poster": "Poster",
-            "privacySetting": "Privacy Setting",
-            "poster": "Poster"
+            "privacySetting": "Privacy Setting"
         }
     }
 }

src/main/webapp/i18n/es/privacy.json

@@ -15,7 +15,6 @@
             "detail": {
                 "title": "Privacy"
             },
-            "privacyId": "Privacy Id",
             "publicView": "Public View",
             "cohortView": "Cohort View",
             "employerView": "Employer View"

src/main/webapp/i18n/es/userProfile.json

@@ -15,13 +15,10 @@
             "detail": {
                 "title": "User Profile"
             },
-            "profileId": "Profile Id",
             "firstName": "First Name",
             "lastName": "Last Name",
             "userStack": "User Stack",
             "user": "User",
-            "cohort": "Cohort",
-            "employer": "Employer",
             "employer": "Employer",
             "cohort": "Cohort"
         }

src/test/javascript/e2e/entities/cohort/cohort.page-object.ts

@@ -26,21 +26,12 @@ export class CohortUpdatePage {
     pageTitle = element(by.id('jhi-cohort-heading'));
     saveButton = element(by.id('save-entity'));
     cancelButton = element(by.id('cancel-save'));
-    cohortIdInput = element(by.id('field_cohortId'));
     gradDateInput = element(by.id('field_gradDate'));
 
     async getPageTitle() {
         return this.pageTitle.getAttribute('jhiTranslate');
     }
 
-    async setCohortIdInput(cohortId) {
-        await this.cohortIdInput.sendKeys(cohortId);
-    }
-
-    async getCohortIdInput() {
-        return this.cohortIdInput.getAttribute('value');
-    }
-
     async setGradDateInput(gradDate) {
         await this.gradDateInput.sendKeys(gradDate);
     }

src/test/javascript/e2e/entities/cohort/cohort.spec.ts

@@ -38,8 +38,7 @@ describe('Cohort e2e test', () => {
         const nbButtonsBeforeCreate = await cohortComponentsPage.countDeleteButtons();
 
         await cohortComponentsPage.clickOnCreateButton();
-        await promise.all([cohortUpdatePage.setCohortIdInput('5'), cohortUpdatePage.setGradDateInput('gradDate')]);
-        expect(await cohortUpdatePage.getCohortIdInput()).to.eq('5');
+        await promise.all([cohortUpdatePage.setGradDateInput('gradDate')]);
         expect(await cohortUpdatePage.getGradDateInput()).to.eq('gradDate');
         await cohortUpdatePage.save();
         expect(await cohortUpdatePage.getSaveButton().isPresent()).to.be.false;

src/test/javascript/e2e/entities/employer/employer.page-object.ts

@@ -26,7 +26,6 @@ export class EmployerUpdatePage {
     pageTitle = element(by.id('jhi-employer-heading'));
     saveButton = element(by.id('save-entity'));
     cancelButton = element(by.id('cancel-save'));
-    employerIdInput = element(by.id('field_employerId'));
     companyNameInput = element(by.id('field_companyName'));
     cityInput = element(by.id('field_city'));
     stateInput = element(by.id('field_state'));
@@ -35,14 +34,6 @@ export class EmployerUpdatePage {
         return this.pageTitle.getAttribute('jhiTranslate');
     }
 
-    async setEmployerIdInput(employerId) {
-        await this.employerIdInput.sendKeys(employerId);
-    }
-
-    async getEmployerIdInput() {
-        return this.employerIdInput.getAttribute('value');
-    }
-
     async setCompanyNameInput(companyName) {
         await this.companyNameInput.sendKeys(companyName);
     }

src/test/javascript/e2e/entities/employer/employer.spec.ts

@@ -39,12 +39,10 @@ describe('Employer e2e test', () => {
 
         await employerComponentsPage.clickOnCreateButton();
         await promise.all([
-            employerUpdatePage.setEmployerIdInput('5'),
             employerUpdatePage.setCompanyNameInput('companyName'),
             employerUpdatePage.setCityInput('city'),
             employerUpdatePage.setStateInput('state')
         ]);
-        expect(await employerUpdatePage.getEmployerIdInput()).to.eq('5');
         expect(await employerUpdatePage.getCompanyNameInput()).to.eq('companyName');
         expect(await employerUpdatePage.getCityInput()).to.eq('city');
         expect(await employerUpdatePage.getStateInput()).to.eq('state');

src/test/javascript/e2e/entities/post/post.page-object.ts

@@ -26,7 +26,6 @@ export class PostUpdatePage {
     pageTitle = element(by.id('jhi-post-heading'));
     saveButton = element(by.id('save-entity'));
     cancelButton = element(by.id('cancel-save'));
-    postIdInput = element(by.id('field_postId'));
     timestampInput = element(by.id('field_timestamp'));
     contentInput = element(by.id('field_content'));
     likesInput = element(by.id('field_likes'));
@@ -37,14 +36,6 @@ export class PostUpdatePage {
         return this.pageTitle.getAttribute('jhiTranslate');
     }
 
-    async setPostIdInput(postId) {
-        await this.postIdInput.sendKeys(postId);
-    }
-
-    async getPostIdInput() {
-        return this.postIdInput.getAttribute('value');
-    }
-
     async setTimestampInput(timestamp) {
         await this.timestampInput.sendKeys(timestamp);
     }
@@ -76,6 +67,18 @@ export class PostUpdatePage {
             .click();
     }
 
+    async posterSelectOption(option) {
+        await this.posterSelect.sendKeys(option);
+    }
+
+    getPosterSelect(): ElementFinder {
+        return this.posterSelect;
+    }
+
+    async getPosterSelectedOption() {
+        return this.posterSelect.element(by.css('option:checked')).getText();
+    }
+
     async privacySettingSelectLastOption() {
         await this.privacySettingSelect
             .all(by.tagName('option'))
@@ -95,18 +98,6 @@ export class PostUpdatePage {
         return this.privacySettingSelect.element(by.css('option:checked')).getText();
     }
 
-    async posterSelectOption(option) {
-        await this.posterSelect.sendKeys(option);
-    }
-
-    getPosterSelect(): ElementFinder {
-        return this.posterSelect;
-    }
-
-    async getPosterSelectedOption() {
-        return this.posterSelect.element(by.css('option:checked')).getText();
-    }
-
     async save() {
         await this.saveButton.click();
     }

src/test/javascript/e2e/entities/post/post.spec.ts

@@ -39,15 +39,12 @@ describe('Post e2e test', () => {
 
         await postComponentsPage.clickOnCreateButton();
         await promise.all([
-            postUpdatePage.setPostIdInput('5'),
             postUpdatePage.setTimestampInput('2000-12-31'),
             postUpdatePage.setContentInput('content'),
             postUpdatePage.setLikesInput('likes'),
             postUpdatePage.posterSelectLastOption(),
-            postUpdatePage.privacySettingSelectLastOption(),
-            postUpdatePage.posterSelectLastOption()
+            postUpdatePage.privacySettingSelectLastOption()
         ]);
-        expect(await postUpdatePage.getPostIdInput()).to.eq('5');
         expect(await postUpdatePage.getTimestampInput()).to.eq('2000-12-31');
         expect(await postUpdatePage.getContentInput()).to.eq('content');
         expect(await postUpdatePage.getLikesInput()).to.eq('likes');

src/test/javascript/e2e/entities/privacy/privacy.page-object.ts

@@ -26,7 +26,6 @@ export class PrivacyUpdatePage {
     pageTitle = element(by.id('jhi-privacy-heading'));
     saveButton = element(by.id('save-entity'));
     cancelButton = element(by.id('cancel-save'));
-    privacyIdInput = element(by.id('field_privacyId'));
     publicViewInput = element(by.id('field_publicView'));
     cohortViewInput = element(by.id('field_cohortView'));
     employerViewInput = element(by.id('field_employerView'));
@@ -35,14 +34,6 @@ export class PrivacyUpdatePage {
         return this.pageTitle.getAttribute('jhiTranslate');
     }
 
-    async setPrivacyIdInput(privacyId) {
-        await this.privacyIdInput.sendKeys(privacyId);
-    }
-
-    async getPrivacyIdInput() {
-        return this.privacyIdInput.getAttribute('value');
-    }
-
     getPublicViewInput() {
         return this.publicViewInput;
     }

src/test/javascript/e2e/entities/privacy/privacy.spec.ts

@@ -38,8 +38,7 @@ describe('Privacy e2e test', () => {
         const nbButtonsBeforeCreate = await privacyComponentsPage.countDeleteButtons();
 
         await privacyComponentsPage.clickOnCreateButton();
-        await promise.all([privacyUpdatePage.setPrivacyIdInput('5')]);
-        expect(await privacyUpdatePage.getPrivacyIdInput()).to.eq('5');
+        await promise.all([]);
         const selectedPublicView = privacyUpdatePage.getPublicViewInput();
         if (await selectedPublicView.isSelected()) {
             await privacyUpdatePage.getPublicViewInput().click();

src/test/javascript/e2e/entities/user-profile/user-profile.page-object.ts

@@ -26,26 +26,17 @@ export class UserProfileUpdatePage {
     pageTitle = element(by.id('jhi-user-profile-heading'));
     saveButton = element(by.id('save-entity'));
     cancelButton = element(by.id('cancel-save'));
-    profileIdInput = element(by.id('field_profileId'));
     firstNameInput = element(by.id('field_firstName'));
     lastNameInput = element(by.id('field_lastName'));
     userStackInput = element(by.id('field_userStack'));
     userSelect = element(by.id('field_user'));
-    cohortSelect = element(by.id('field_cohort'));
     employerSelect = element(by.id('field_employer'));
+    cohortSelect = element(by.id('field_cohort'));
 
     async getPageTitle() {
         return this.pageTitle.getAttribute('jhiTranslate');
     }
 
-    async setProfileIdInput(profileId) {
-        await this.profileIdInput.sendKeys(profileId);
-    }
-
-    async getProfileIdInput() {
-        return this.profileIdInput.getAttribute('value');
-    }
-
     async setFirstNameInput(firstName) {
         await this.firstNameInput.sendKeys(firstName);
     }

src/test/javascript/e2e/entities/user-profile/user-profile.spec.ts

@@ -39,17 +39,13 @@ describe('UserProfile e2e test', () => {
 
         await userProfileComponentsPage.clickOnCreateButton();
         await promise.all([
-            userProfileUpdatePage.setProfileIdInput('5'),
             userProfileUpdatePage.setFirstNameInput('firstName'),
             userProfileUpdatePage.setLastNameInput('lastName'),
             userProfileUpdatePage.setUserStackInput('userStack'),
             userProfileUpdatePage.userSelectLastOption(),
-            userProfileUpdatePage.cohortSelectLastOption(),
-            userProfileUpdatePage.employerSelectLastOption(),
             userProfileUpdatePage.employerSelectLastOption(),
             userProfileUpdatePage.cohortSelectLastOption()
         ]);
-        expect(await userProfileUpdatePage.getProfileIdInput()).to.eq('5');
         expect(await userProfileUpdatePage.getFirstNameInput()).to.eq('firstName');
         expect(await userProfileUpdatePage.getLastNameInput()).to.eq('lastName');
         expect(await userProfileUpdatePage.getUserStackInput()).to.eq('userStack');

src/test/javascript/spec/app/entities/cohort/cohort.service.spec.ts

@@ -21,7 +21,7 @@ describe('Service Tests', () => {
             service = injector.get(CohortService);
             httpMock = injector.get(HttpTestingController);
 
-            elemDefault = new Cohort(0, 'January 2019');
+            elemDefault = new Cohort(0, 'AAAAAAA');
         });
 
         describe('Service methods', async () => {
@@ -55,7 +55,6 @@ describe('Service Tests', () => {
             it('should update a Cohort', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        cohortId: 1,
                         gradDate: 'BBBBBB'
                     },
                     elemDefault
@@ -73,7 +72,6 @@ describe('Service Tests', () => {
             it('should return a list of Cohort', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        cohortId: 1,
                         gradDate: 'BBBBBB'
                     },
                     elemDefault

src/test/javascript/spec/app/entities/employer/employer.service.spec.ts

@@ -55,7 +55,6 @@ describe('Service Tests', () => {
             it('should update a Employer', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        employerId: 1,
                         companyName: 'BBBBBB',
                         city: 'BBBBBB',
                         state: 'BBBBBB'
@@ -75,7 +74,6 @@ describe('Service Tests', () => {
             it('should return a list of Employer', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        employerId: 1,
                         companyName: 'BBBBBB',
                         city: 'BBBBBB',
                         state: 'BBBBBB'

src/test/javascript/spec/app/entities/post/post.service.spec.ts

@@ -70,7 +70,6 @@ describe('Service Tests', () => {
             it('should update a Post', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        postId: 1,
                         timestamp: currentDate.format(DATE_FORMAT),
                         content: 'BBBBBB',
                         likes: 'BBBBBB'
@@ -95,7 +94,6 @@ describe('Service Tests', () => {
             it('should return a list of Post', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        postId: 1,
                         timestamp: currentDate.format(DATE_FORMAT),
                         content: 'BBBBBB',
                         likes: 'BBBBBB'

src/test/javascript/spec/app/entities/privacy/privacy.service.spec.ts

@@ -55,7 +55,6 @@ describe('Service Tests', () => {
             it('should update a Privacy', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        privacyId: 1,
                         publicView: true,
                         cohortView: true,
                         employerView: true
@@ -75,7 +74,6 @@ describe('Service Tests', () => {
             it('should return a list of Privacy', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        privacyId: 1,
                         publicView: true,
                         cohortView: true,
                         employerView: true

src/test/javascript/spec/app/entities/user-profile/user-profile.service.spec.ts

@@ -55,7 +55,6 @@ describe('Service Tests', () => {
             it('should update a UserProfile', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        profileId: 1,
                         firstName: 'BBBBBB',
                         lastName: 'BBBBBB',
                         userStack: 'BBBBBB'
@@ -75,7 +74,6 @@ describe('Service Tests', () => {
             it('should return a list of UserProfile', async () => {
                 const returnedFromService = Object.assign(
                     {
-                        profileId: 1,
                         firstName: 'BBBBBB',
                         lastName: 'BBBBBB',
                         userStack: 'BBBBBB'