commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -125,10 +125,13 @@ public class AuthController extends Controller {
 
 			signUpRequest.setPassword(encoder.encode(password));
 
+			fixCode(signUpRequest);
 
 			TbCfUserInfo userInfo = userRepository.save(signUpRequest);
 
 
+			addToNetwork(signUpRequest);
+
 			return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password,userInfo.getFcm()));
 		}
 		catch (Exception e){
@@ -228,29 +231,11 @@ public class AuthController extends Controller {
 				user.setPassword(encoder.encode(user.getFirebaseUid()));// Assign user from database to the user we have to return back to request
 			}
 
-			if( user.getCode() == null){
-				Hashids hashids = new Hashids("big father is daddy", 6);
-				Long codeCount = user.getCodeCount();
-
-				if( codeCount == null){
-					codeCount = userRepository.count();
-				}
 
-				user.setCode(hashids.encode(codeCount));
-			}
 
-			Network top = networkRepository.findTopByOrderByIdDesc();
+			fixCode(user);
 
-			if( top != null && !user.invited() ) {
-				if (!networkRepository.existsByUserInfo_UserIdAndNetworkInfo_UserId(top.getNetworkId(), user.getUserId())){
-					Network network = new Network();
-					network.setUserInfo(top.getNetworkInfo());
-					network.setNetworkInfo(user);
-					//network.setId(uid());
-					networkRepository.save(network);
-					user.setInvitation(1);
-				}
-			}
+			addToNetwork(user);
 
 			user.setLastLoginTime(new Date());
 			userRepository.save(user);
@@ -265,6 +250,34 @@ public class AuthController extends Controller {
 
 	}
 
+	private void fixCode(TbCfUserInfo user){
+		if( user.getCode() == null){
+			Hashids hashids = new Hashids("big father is daddy", 6);
+			Long codeCount = user.getCodeCount();
+
+			if( codeCount == null){
+				codeCount = userRepository.count();
+			}
+
+			user.setCode(hashids.encode(codeCount));
+		}
+	}
+
+	private void addToNetwork(TbCfUserInfo user){
+		Network top = networkRepository.findTopByOrderByIdDesc();
+
+		if( top != null && !user.invited() ) {
+			if (!networkRepository.existsByUserInfo_UserIdAndNetworkInfo_UserId(top.getNetworkId(), user.getUserId())){
+				Network network = new Network();
+				network.setUserInfo(top.getNetworkInfo());
+				network.setNetworkInfo(user);
+				//network.setId(uid());
+				networkRepository.save(network);
+				user.setInvitation(1);
+			}
+		}
+	}
+
 	private void fillUserNecessayInfo(TbCfUserInfo tbCfUserInfoVo) {
 		if( tbCfUserInfoVo.getAvatar() == null) tbCfUserInfoVo.setAvatar(domainProperties.getProperty("user.avatar"));
 		tbCfUserInfoVo.setUserNo(IdUtil.createIdByDate());