Intermediate commit: Renaming userIdId et al.

src/main/java/at/ac/uibk/gitsearch/service/MailService.java

@@ -100,7 +100,7 @@ public class MailService {
     @Scheduled(cron = "0 0 5 * * ?")
     public void sendInfoMails() {
     	for(User u: userRepository.findAll()) {
-    		
+    		// TODO
     	}
     }
 

src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java

@@ -82,7 +82,7 @@ public class UserWatchListService {
     	}
     	if(!mustExist)
     		return Optional.empty();
-    	final boolean isAccessible = watchListO.get().getUserIdLogin().equals(currentPrincipal.get().getUsername());
+    	final boolean isAccessible = watchListO.get().getUserLogin().equals(currentPrincipal.get().getUsername());
     	if(!isAccessible) {
     		log.warn("watchlist {} does not belong to current user",  watchListO.get().getName());
             throw new IllegalAccessError("watchlist does not belong to current User");

src/main/java/at/ac/uibk/gitsearch/service/dto/UserWatchListDTO.java

@@ -24,9 +24,9 @@ public class UserWatchListDTO implements Serializable {
     private CheckFrequency checkFrequency;
 
 
-    private Long userIdId;
+    private Long userId;
 
-    private String userIdLogin;
+    private String userLogin;
     
     public Long getId() {
         return id;
@@ -52,20 +52,20 @@ public class UserWatchListDTO implements Serializable {
         this.checkFrequency = checkFrequency;
     }
 
-    public Long getUserIdId() {
-        return userIdId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setUserIdId(Long userId) {
-        this.userIdId = userId;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
-    public String getUserIdLogin() {
-        return userIdLogin;
+    public String getUserLogin() {
+        return userLogin;
     }
 
-    public void setUserIdLogin(String userLogin) {
-        this.userIdLogin = userLogin;
+    public void setUserLogin(String userLogin) {
+        this.userLogin = userLogin;
     }
 
     @Override
@@ -92,8 +92,8 @@ public class UserWatchListDTO implements Serializable {
             "id=" + getId() +
             ", name='" + getName() + "'" +
             ", checkFrequency='" + getCheckFrequency() + "'" +
-            ", userIdId=" + getUserIdId() +
-            ", userIdLogin='" + getUserIdLogin() + "'" +
+            ", userIdId=" + getUserId() +
+            ", userIdLogin='" + getUserLogin() + "'" +
             "}";
     }
 }

src/main/java/at/ac/uibk/gitsearch/service/mapper/UserWatchListMapper.java

@@ -12,11 +12,11 @@ import org.mapstruct.*;
 @Mapper(componentModel = "spring", uses = {UserMapper.class})
 public interface UserWatchListMapper extends EntityMapper<UserWatchListDTO, UserWatchList> {
 
-    @Mapping(source = "userId.id", target = "userIdId")
-    @Mapping(source = "user.login", target = "userIdLogin")
+    @Mapping(source = "user.id", target = "userId")
+    @Mapping(source = "user.login", target = "userLogin")
     UserWatchListDTO toDto(UserWatchList userWatchList);
 
-    @Mapping(source = "userIdId", target = "userId")
+    @Mapping(source = "userId", target = "user")
     UserWatchList toEntity(UserWatchListDTO userWatchListDTO);
 
     default UserWatchList fromId(Long id) {

src/main/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResource.java

@@ -95,14 +95,14 @@ public class UserWatchListResource {
            log.debug("unknown user cannot create watchlist {}", userWatchListDTO.getName());
            return ResponseEntity.badRequest().build();
        }
-       if(userWatchListDTO.getUserIdId() == null) {
+       if(userWatchListDTO.getUserId() == null) {
     	   Optional<at.ac.uibk.gitsearch.domain.User> u =  userService.getUserWithAuthoritiesByLogin(SecurityUtils.getCurrentUserLogin().get());
     	   if(u.isEmpty()) {
                log.debug(" user not found, cannot create watchlist {}", userWatchListDTO.getName());
                return ResponseEntity.badRequest().build();
     	   }
-    	   userWatchListDTO.setUserIdId(u.get().getId());
-    	   userWatchListDTO.setUserIdLogin(u.get().getLastName());
+    	   userWatchListDTO.setUserId(u.get().getId());
+    	   userWatchListDTO.setUserLogin(u.get().getLastName());
        }
         if (userWatchListDTO.getId() != null) {
             throw new BadRequestAlertException("A new userWatchList cannot already have an ID", ENTITY_NAME, "idexists");
@@ -137,8 +137,8 @@ public class UserWatchListResource {
         	log.warn("Cannot create a watchlist {} for unknown user", springUser.getUsername());
             throw new BadRequestAlertException("Cannot create a watchlist for unknown user", ENTITY_NAME, "unknownUser");
         }
-        userWatchListDTO.setUserIdLogin(springUser.getUsername());
-		userWatchListDTO.setUserIdId(userWithAuthoritiesByLogin.get().getId());
+        userWatchListDTO.setUserLogin(springUser.getUsername());
+		userWatchListDTO.setUserId(userWithAuthoritiesByLogin.get().getId());
         UserWatchListDTO result = userWatchListService.save(userWatchListDTO);
         return ResponseEntity.created(new URI("/api/user-watch-lists/" + result.getId()))
             .headers(HeaderUtil.createEntityCreationAlert(applicationName, true, ENTITY_NAME, result.getId().toString()))

src/main/webapp/app/bookmarks/bookmarks-update.component.ts

@@ -24,7 +24,7 @@ export class UserWatchListUpdateComponent implements OnInit {
   editForm = this.fb.group({
     id: [],
     name: [null, [Validators.required, Validators.minLength(1)]],
-    userIdId: [null],
+    userId: [null],
     checkFrequency: CheckFrequency.NEVER
   });
 
@@ -47,7 +47,7 @@ export class UserWatchListUpdateComponent implements OnInit {
     this.editForm.patchValue({
       id: userWatchList.id,
       name: userWatchList.name,
-      userIdId: userWatchList.userIdId,
+      userId: userWatchList.userId,
       checkFrequency: userWatchList.checkFrequency,
     });
   }
@@ -71,7 +71,7 @@ export class UserWatchListUpdateComponent implements OnInit {
       ...new UserWatchList(),
       id: this.editForm.get(['id'])!.value,
       name: this.editForm.get(['name'])!.value,
-      userIdId: this.editForm.get(['userIdId'])!.value,
+      userId: this.editForm.get(['userId'])!.value,
       checkFrequency: this.editForm.get(['checkFrequency'])!.value,
     };
   }

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

@@ -18,7 +18,7 @@
                 </dd>
                 <dt><span jhiTranslate="gitsearchApp.userWatchList.userId">User Id</span></dt>
                 <dd>
-                    {{ userWatchList.userIdLogin }}
+                    {{ userWatchList.userLogin }}
                 </dd>
             </dl>
 

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

@@ -22,7 +22,7 @@ export class UserWatchListUpdateComponent implements OnInit {
     id: [],
     name: [null, [Validators.required, Validators.minLength(1)]],
     checkFrequency: [null, [Validators.required]],
-    userIdId: [null, Validators.required],
+    userId: [null, Validators.required],
   });
 
   constructor(
@@ -45,7 +45,7 @@ export class UserWatchListUpdateComponent implements OnInit {
       id: userWatchList.id,
       name: userWatchList.name,
       checkFrequency: userWatchList.checkFrequency,
-      userIdId: userWatchList.userIdId,
+      userId: userWatchList.userId,
     });
   }
 
@@ -69,7 +69,7 @@ export class UserWatchListUpdateComponent implements OnInit {
       id: this.editForm.get(['id'])!.value,
       name: this.editForm.get(['name'])!.value,
       checkFrequency: this.editForm.get(['checkFrequency'])!.value,
-      userIdId: this.editForm.get(['userIdId'])!.value,
+      userId: this.editForm.get(['userId'])!.value,
     };
   }
 

src/main/webapp/app/shared/model/user-watch-list.model.ts

@@ -4,8 +4,8 @@ export interface IUserWatchList {
   id?: number;
   name?: string;
   checkFrequency?: CheckFrequency;
-  userIdLogin?: string;
-  userIdId?: number;
+  userLogin?: string;
+  userId?: number;
 }
 
 export class UserWatchList implements IUserWatchList {
@@ -13,8 +13,8 @@ export class UserWatchList implements IUserWatchList {
     public id?: number,
     public name?: string,
     public checkFrequency?: CheckFrequency,
-    public userIdLogin?: string,
-    public userIdId?: number
+    public userLogin?: string,
+    public userId?: number
   ) {}
 }
 

src/main/webapp/app/shared/watchlist/watchlist-manager.ts

@@ -58,8 +58,8 @@ export class WatchlistManager implements OnInit, OnDestroy {
 
                   const userWatchlist: IUserWatchList = {
                     name: this.translate.instant('gitsearchApp.userWatchList.defaultName'),
-                    userIdLogin: this.account!.login,
-                    userIdId: 1, // unused, replaced by correct userId by create service
+                    userLogin: this.account!.login,
+                    userId: 1, // unused, replaced by correct userId by create service
                     checkFrequency: CheckFrequency.NEVER,
                   };
                   this.watchListService.createForCurrentUser(userWatchlist).subscribe(