add comment

MaCoredroid · MaCoredroid · commit 97c18e544035 · 2019-09-06T12:22:23.000+08:00
diff --git a/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/service/ModifyUserInfo.java b/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/service/ModifyUserInfo.java
@@ -6,7 +6,7 @@ public interface ModifyUserInfo {
     public boolean ModifyExp(String username,int num);
     public boolean blockUser(String username);//block user from login (set star)
     public boolean SetPet(String username, int pet);//user set the pet to fight
-    public boolean AddDistance(String username, double distance);
-    public boolean addFriend(String username,String friendname);
+    public boolean AddDistance(String username, double distance);//add to the whole distance a user has run
+    public boolean addFriend(String username,String friendname);//add a user as another user's friend, automatically back and forth
     public boolean addCover(Coverinfo Coverinfo);
 }
diff --git a/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/service/RegisterService.java b/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/service/RegisterService.java
@@ -1,5 +1,5 @@
 package org.pokemonrun.service;
 
 public interface RegisterService {
-     boolean Register(String username, String password, String email, int star);
+     boolean Register(String username, String password, String email, int star);//no duplicate username
 }
diff --git a/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/GetUserInfoimpl.java b/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/GetUserInfoimpl.java
@@ -25,18 +25,18 @@ public class GetUserInfoimpl implements GetUserInfo {
     @Override
     public Userinfo getUserInfo(String username) {
         User temp=UserDao.findOne(username);
-        if(temp==null)
+        if(temp==null)//fault handling
         {
             return null;
         }
         else
         {
             List<Friendinfo> friends = new ArrayList<>();
             Set<User> friendsset= temp.getFollowers();
-            for(User tempUser:friendsset)
+            for(User tempUser:friendsset)//get friend
             {
-                Friendinfo tempInfo=new Friendinfo(tempUser.getUsername());
-                friends.add(tempInfo);
+                Friendinfo tempfriendInfo=new Friendinfo(tempUser.getUsername());
+                friends.add(tempfriendInfo);
             }
             Userinfo tempinfo=new Userinfo(temp.getUsername(),temp.getStar(),temp.getEmail(),temp.getExp(),temp.getPet(),temp.getDistance(),friends);
             return tempinfo;
@@ -60,22 +60,21 @@ public UserInfoForAdmin AdminGetUserInfo(String username) {
     @Override
     public int GetPet(String username) {
         User temp=UserDao.findOne(username);
-        if(temp==null)
+        if(temp==null)//fault handling
         {
             return -1;
         }
         else
         {
-            int temppet=temp.getPet();
-            return temppet;
+            return temp.getPet();
         }
     }
 
     @Override
     public List<String> GetAllUser() {
         List<User> tempList=UserDao.findAll();
         List<String> usernamelist=new ArrayList<>();
-        for(User tempUser:tempList)
+        for(User tempUser:tempList)//get all user's name
         {
             usernamelist.add(tempUser.getUsername());
         }
@@ -90,7 +89,7 @@ public Coverinfo getCover(String username) {
             return null;
         }
         Cover tempCover=CoverDao.getOneCover(username);
-        if(tempCover==null)
+        if(tempCover==null)//fault handling
         {
             return null;
         }
@@ -104,7 +103,7 @@ public Coverinfo getCover(String username) {
     @Override
     public int getExp(String username) {
         User tempUser=UserDao.findOne(username);
-        if(tempUser==null)
+        if(tempUser==null)//fault handling
         {
             return 0;
         }
diff --git a/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/LoginServiceimpl.java b/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/LoginServiceimpl.java
@@ -22,7 +22,7 @@ public boolean Login(String username, String password) {
         }
         else
         {
-            if(tempUser.getStar()==-1)
+            if(tempUser.getStar()==-1)//blocked user
             {
                 return false;
             }
diff --git a/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/ModifyUserInfoimpl.java b/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/ModifyUserInfoimpl.java
@@ -20,26 +20,26 @@ public class ModifyUserInfoimpl implements ModifyUserInfo {
     @Override
     public boolean ModifyExp(String username, int num) {
         User temp=UserDao.findOne(username);
-        if(temp==null)
+        if(temp==null)//fault handling
         {
             return false;
         }
         else
         {
             int oldexp=temp.getExp();
             int newexp=oldexp+num;
-            if(newexp<0)
+            if(newexp<0)//fault handling
             {
                 return false;
             }
             temp.setExp(newexp);
-            UserDao.save(temp);
+            UserDao.save(temp);//will automatically overwrite the old one, keep the same ID
         }
         return true;
     }
 
     @Override
-    public boolean blockUser(String username) {
+    public boolean blockUser(String username) {//block and unblock , back and forth
         User temp=UserDao.findOne(username);
         if(temp==null)
         {
@@ -48,23 +48,15 @@ public boolean blockUser(String username) {
         else
         {
             int star=temp.getStar();
-            if(star==-1)
+            if(star==-1)//unblock
             {
                 temp.setStar(0);
             }
-            else if(star==-2)
-            {
-                temp.setStar(1);
-            }
-            else if(star==1)
-            {
-                temp.setStar(-2);
-            }
-            else if(star==0)
+            else if(star==0)//block
             {
                 temp.setStar(-1);
             }
-            else
+            else//fault handling
             {
                 return false;
             }
@@ -116,14 +108,14 @@ public boolean AddDistance(String username, double distance) {
     public boolean addFriend(String username, String friendname) {
         User temp1=UserDao.findOne(username);
         User temp2=UserDao.findOne(friendname);
-        if(temp1==null||temp2==null)
+        if(temp1==null||temp2==null)//fault handling
         {
             return false;
         }
         else
         {
             Set<User> follower1=temp1.getFollowers();
-            if(follower1.contains(temp2))
+            if(follower1.contains(temp2))//already friend
             {
                 return false;
             }
@@ -133,7 +125,7 @@ public boolean addFriend(String username, String friendname) {
             following1.add(temp2);
             temp1.setFollowing(following1);
 
-            UserDao.save(temp1);
+            UserDao.save(temp1);//and user2 as user1's friend
 
             Set<User> follower2=temp2.getFollowers();
             follower2.add(temp1);
@@ -144,7 +136,7 @@ public boolean addFriend(String username, String friendname) {
             following2.add(temp1);
             temp2.setFollowing(following2);
 
-            UserDao.save(temp2);
+            UserDao.save(temp2);//add user1 as user2's friend
             return true;
         }
     }
diff --git a/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/RegisterServiceimpl.java b/code/back-end/Cloud_native_first_attempt/sample-spring-microservices-new-master/user-service/src/main/java/org/pokemonrun/serviceimpl/RegisterServiceimpl.java
@@ -18,7 +18,7 @@ public boolean Register(String username, String password, String email, int star
             UserDao.save(username, password, email, star);
             return true;
         }
-        else
+        else//already registered
         {
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package org.pokemonrun.service;`
`2`	`2`
`3`	`3`	`public interface RegisterService {`
`4`		`- boolean Register(String username, String password, String email, int star);`
	`4`	`+ boolean Register(String username, String password, String email, int star);//no duplicate username`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,18 @@ public class GetUserInfoimpl implements GetUserInfo {`
`25`	`25`	`@Override`
`26`	`26`	`public Userinfo getUserInfo(String username) {`
`27`	`27`	`User temp=UserDao.findOne(username);`
`28`		`- if(temp==null)`
	`28`	`+ if(temp==null)//fault handling`
`29`	`29`	`{`
`30`	`30`	`return null;`
`31`	`31`	`}`
`32`	`32`	`else`
`33`	`33`	`{`
`34`	`34`	`List<Friendinfo> friends = new ArrayList<>();`
`35`	`35`	`Set<User> friendsset= temp.getFollowers();`
`36`		`- for(User tempUser:friendsset)`
	`36`	`+ for(User tempUser:friendsset)//get friend`
`37`	`37`	`{`
`38`		`- Friendinfo tempInfo=new Friendinfo(tempUser.getUsername());`
`39`		`- friends.add(tempInfo);`
	`38`	`+ Friendinfo tempfriendInfo=new Friendinfo(tempUser.getUsername());`
	`39`	`+ friends.add(tempfriendInfo);`
`40`	`40`	`}`
`41`	`41`	`Userinfo tempinfo=new Userinfo(temp.getUsername(),temp.getStar(),temp.getEmail(),temp.getExp(),temp.getPet(),temp.getDistance(),friends);`
`42`	`42`	`return tempinfo;`
`@@ -60,22 +60,21 @@ public UserInfoForAdmin AdminGetUserInfo(String username) {`
`60`	`60`	`@Override`
`61`	`61`	`public int GetPet(String username) {`
`62`	`62`	`User temp=UserDao.findOne(username);`
`63`		`- if(temp==null)`
	`63`	`+ if(temp==null)//fault handling`
`64`	`64`	`{`
`65`	`65`	`return -1;`
`66`	`66`	`}`
`67`	`67`	`else`
`68`	`68`	`{`
`69`		`- int temppet=temp.getPet();`
`70`		`- return temppet;`
	`69`	`+ return temp.getPet();`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`@Override`
`75`	`74`	`public List<String> GetAllUser() {`
`76`	`75`	`List<User> tempList=UserDao.findAll();`
`77`	`76`	`List<String> usernamelist=new ArrayList<>();`
`78`		`- for(User tempUser:tempList)`
	`77`	`+ for(User tempUser:tempList)//get all user's name`
`79`	`78`	`{`
`80`	`79`	`usernamelist.add(tempUser.getUsername());`
`81`	`80`	`}`
`@@ -90,7 +89,7 @@ public Coverinfo getCover(String username) {`
`90`	`89`	`return null;`
`91`	`90`	`}`
`92`	`91`	`Cover tempCover=CoverDao.getOneCover(username);`
`93`		`- if(tempCover==null)`
	`92`	`+ if(tempCover==null)//fault handling`
`94`	`93`	`{`
`95`	`94`	`return null;`
`96`	`95`	`}`
`@@ -104,7 +103,7 @@ public Coverinfo getCover(String username) {`
`104`	`103`	`@Override`
`105`	`104`	`public int getExp(String username) {`
`106`	`105`	`User tempUser=UserDao.findOne(username);`
`107`		`- if(tempUser==null)`
	`106`	`+ if(tempUser==null)//fault handling`
`108`	`107`	`{`
`109`	`108`	`return 0;`
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public boolean Login(String username, String password) {`
`22`	`22`	`}`
`23`	`23`	`else`
`24`	`24`	`{`
`25`		`- if(tempUser.getStar()==-1)`
	`25`	`+ if(tempUser.getStar()==-1)//blocked user`
`26`	`26`	`{`
`27`	`27`	`return false;`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,26 +20,26 @@ public class ModifyUserInfoimpl implements ModifyUserInfo {`
`20`	`20`	`@Override`
`21`	`21`	`public boolean ModifyExp(String username, int num) {`
`22`	`22`	`User temp=UserDao.findOne(username);`
`23`		`- if(temp==null)`
	`23`	`+ if(temp==null)//fault handling`
`24`	`24`	`{`
`25`	`25`	`return false;`
`26`	`26`	`}`
`27`	`27`	`else`
`28`	`28`	`{`
`29`	`29`	`int oldexp=temp.getExp();`
`30`	`30`	`int newexp=oldexp+num;`
`31`		`- if(newexp<0)`
	`31`	`+ if(newexp<0)//fault handling`
`32`	`32`	`{`
`33`	`33`	`return false;`
`34`	`34`	`}`
`35`	`35`	`temp.setExp(newexp);`
`36`		`- UserDao.save(temp);`
	`36`	`+ UserDao.save(temp);//will automatically overwrite the old one, keep the same ID`
`37`	`37`	`}`
`38`	`38`	`return true;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
`42`		`- public boolean blockUser(String username) {`
	`42`	`+ public boolean blockUser(String username) {//block and unblock , back and forth`
`43`	`43`	`User temp=UserDao.findOne(username);`
`44`	`44`	`if(temp==null)`
`45`	`45`	`{`
`@@ -48,23 +48,15 @@ public boolean blockUser(String username) {`
`48`	`48`	`else`
`49`	`49`	`{`
`50`	`50`	`int star=temp.getStar();`
`51`		`- if(star==-1)`
	`51`	`+ if(star==-1)//unblock`
`52`	`52`	`{`
`53`	`53`	`temp.setStar(0);`
`54`	`54`	`}`
`55`		`- else if(star==-2)`
`56`		`- {`
`57`		`- temp.setStar(1);`
`58`		`- }`
`59`		`- else if(star==1)`
`60`		`- {`
`61`		`- temp.setStar(-2);`
`62`		`- }`
`63`		`- else if(star==0)`
	`55`	`+ else if(star==0)//block`
`64`	`56`	`{`
`65`	`57`	`temp.setStar(-1);`
`66`	`58`	`}`
`67`		`- else`
	`59`	`+ else//fault handling`
`68`	`60`	`{`
`69`	`61`	`return false;`
`70`	`62`	`}`
`@@ -116,14 +108,14 @@ public boolean AddDistance(String username, double distance) {`
`116`	`108`	`public boolean addFriend(String username, String friendname) {`
`117`	`109`	`User temp1=UserDao.findOne(username);`
`118`	`110`	`User temp2=UserDao.findOne(friendname);`
`119`		`- if(temp1==null\|\|temp2==null)`
	`111`	`+ if(temp1==null\|\|temp2==null)//fault handling`
`120`	`112`	`{`
`121`	`113`	`return false;`
`122`	`114`	`}`
`123`	`115`	`else`
`124`	`116`	`{`
`125`	`117`	`Set<User> follower1=temp1.getFollowers();`
`126`		`- if(follower1.contains(temp2))`
	`118`	`+ if(follower1.contains(temp2))//already friend`
`127`	`119`	`{`
`128`	`120`	`return false;`
`129`	`121`	`}`
`@@ -133,7 +125,7 @@ public boolean addFriend(String username, String friendname) {`
`133`	`125`	`following1.add(temp2);`
`134`	`126`	`temp1.setFollowing(following1);`
`135`	`127`
`136`		`- UserDao.save(temp1);`
	`128`	`+ UserDao.save(temp1);//and user2 as user1's friend`
`137`	`129`
`138`	`130`	`Set<User> follower2=temp2.getFollowers();`
`139`	`131`	`follower2.add(temp1);`
`@@ -144,7 +136,7 @@ public boolean addFriend(String username, String friendname) {`
`144`	`136`	`following2.add(temp1);`
`145`	`137`	`temp2.setFollowing(following2);`
`146`	`138`
`147`		`- UserDao.save(temp2);`
	`139`	`+ UserDao.save(temp2);//add user1 as user2's friend`
`148`	`140`	`return true;`
`149`	`141`	`}`
`150`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public boolean Register(String username, String password, String email, int star`
`18`	`18`	`UserDao.save(username, password, email, star);`
`19`	`19`	`return true;`
`20`	`20`	`}`
`21`		`- else`
	`21`	`+ else//already registered`
`22`	`22`	`{`
`23`	`23`	`return false;`
`24`	`24`	`}`