commit commit

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

@@ -154,27 +154,10 @@ public class AuthController extends Controller {
                 return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Invalid email");
             }
 
-            if (password == null || password.isEmpty()) {
-                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Password is Empty");
-            }
-
-            if (!isPasswordValid(password)) {
-
-                String string = "Password is not strong";
+            String validatePassword = validatePassword(password);
 
-                if (!isPasswordValidDigit(password)) {
-                    string += ", a digit must occur at least once";
-                }
-
-                if (!isPasswordValidUpperCase(password)) {
-                    string += ", an upper case letter must occur at least once";
-                }
-
-                if (!isPasswordValidLength(password)) {
-                    string += ", at least eight characters though";
-                }
-
-                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), string);
+            if( validatePassword != null ){
+                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(),validatePassword);
             }
 
             boolean byEmail = userRepository.existsByFirebaseUid(email);
@@ -217,6 +200,104 @@ public class AuthController extends Controller {
     }
 
 
+    private String validatePassword(String password){
+
+        if (password == null || password.isEmpty()) {
+            return "Password is Empty";
+        }
+
+        if (!isPasswordValid(password)) {
+
+            String string = "Password is not strong";
+
+            if (!isPasswordValidDigit(password)) {
+                string += ", a digit must occur at least once";
+            }
+
+            if (!isPasswordValidUpperCase(password)) {
+                string += ", an upper case letter must occur at least once";
+            }
+
+            if (!isPasswordValidLength(password)) {
+                string += ", at least eight characters though";
+            }
+
+            return string;
+        }
+
+        return null;
+    }
+
+    @PostMapping("/signup/phone")
+    public Result<?> registerUserPhone(@RequestBody TbCfUserInfo signUpRequest) {
+        try {
+//			boolean byAccount = userRepository.existsByAccount(signUpRequest.getEmail());
+//			if ( byAccount ) {
+//				return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Username is already taken!");
+//			}
+
+            String phone = signUpRequest.getPhone();
+
+            String password = signUpRequest.getPassword();
+
+            phone = phone == null ? "" : phone.trim();
+
+
+            if (phone.isEmpty()) {
+                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Email is empty");
+            }
+
+            if (!isPhoneValid(phone)) {
+                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Invalid phone");
+            }
+
+            String validatePassword = validatePassword(password);
+
+            if( validatePassword != null ){
+                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(),validatePassword);
+            }
+
+
+            boolean byEmail = userRepository.existsByFirebaseUid(phone);
+            boolean byEmail2 = userRepository.existsByAccount(phone);
+
+            if (byEmail || byEmail2) {
+                return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Error: Phone is already in use!");
+            }
+
+
+            //signUpRequest.setFirebaseUid(phone);
+            signUpRequest.setAccount(phone);
+
+            signUpRequest.setUserId(IdUtil.createIdbyUUID());
+
+            fillUserNecessayInfo(signUpRequest);
+
+            signUpRequest.setPassword(encoder.encode(password));
+
+            signUpRequest.setLastLoginTime(new Date());
+
+
+            fixCode(signUpRequest);
+
+            signUpRequest.setUserType(UserTypeEnum.PHONE.getCode());
+
+            TbCfUserInfo userInfo = userRepository.save(signUpRequest);
+
+
+            //addToNetwork(signUpRequest);
+
+
+            fixCoupon(signUpRequest);
+
+            return authenticateUser(new LoginRequest(userInfo.getAccount(), password, userInfo.getFcm()));
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return new Result<>(ResultCodeEnum.SERVICE_ERROR.getCode(), e.getMessage());
+        }
+    }
+
+
     @PostMapping(value = "/register/user")
     public Result checkFirebase(@RequestBody TbCfUserInfo user) {
         //Data to be userInfoVo
@@ -314,6 +395,11 @@ public class AuthController extends Controller {
                //addToNetwork(user);
 
                user.setLastLoginTime(new Date());
+
+               if( user.getAccount() == null){
+                   user.setAccount(user.getEmail() == null ? user.getEmail() : user.getPhone());
+               }
+
                userRepository.save(user);
                //注册成功 创建token
 

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

@@ -40,6 +40,12 @@ abstract class Controller {
         return validRex(email,"^[\\w.-]+@([\\w\\-]+\\.)+[A-Z]{2,4}$");
     }
 
+    static boolean isPhoneValid(String phone) {
+        return validRex(phone,"^(\\+\\d{1,3}( )?)?((\\(\\d{3}\\))|\\d{3})[- .]?\\d{3}[- .]?\\d{4}$"
+                + "|^(\\+\\d{1,3}( )?)?(\\d{3}[ ]?){2}\\d{3}$"
+                + "|^(\\+\\d{1,3}( )?)?(\\d{3}[ ]?)(\\d{2}[ ]?){2}\\d{2}$");
+    }
+
     static boolean isPasswordVeryStrong(String password) {
         return validRex(password,"^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=])(?=\\S+$).{8,}$");
     }

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

@@ -185,7 +185,7 @@ public class ItemController {
         List<TbCfItemParam> itemParamList = itemParamRepository.findAllByItemId(itemId);
 
         map.put("score",item.getTotalScore());
-        map.put("isCollection",userId != null && !userId.isEmpty() && collectionRepository.existsByUserIdAndItemId(userId,itemId));
+        map.put("isCollection",userId != null && !userId.isEmpty() && collectionRepository.existsByUserIdAndItemItemId(userId,itemId));
         map.put("optionList",categoryList);
         map.put("itemDetail",skusList);
         map.put("itemInfo", item);

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

@@ -3,7 +3,11 @@ package com.example.afrishop_v3.controllers;
 import com.example.afrishop_v3.base.Result;
 import com.example.afrishop_v3.enums.ResultCodeEnum;
 import com.example.afrishop_v3.models.ResetBody;
+import com.example.afrishop_v3.models.TbCfItemCollection;
+import com.example.afrishop_v3.models.TbCfStationItem;
 import com.example.afrishop_v3.models.TbCfUserInfo;
+import com.example.afrishop_v3.repository.TbCfItemCollectionRepository;
+import com.example.afrishop_v3.repository.TbCfStationItemRepository;
 import com.example.afrishop_v3.repository.UserRepository;
 import com.example.afrishop_v3.security.services.AuthenticationUser;
 import com.example.afrishop_v3.util.*;
@@ -16,19 +20,24 @@ import org.springframework.web.bind.annotation.*;
 
 import java.net.URLDecoder;
 import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 @RestController
 @RequestMapping("user")
 public class UserController extends Controller {
     private final UserRepository repository;
+    private final TbCfItemCollectionRepository itemCollectionRepository;
+    private final TbCfStationItemRepository itemRepository;
     private final AuthenticationUser user;
     private final PasswordEncoder encoder;
     private final EmailHelper emailHelper;
     private static Logger logger = LoggerFactory.getLogger(UserController.class);
 
-    public UserController(UserRepository repository, AuthenticationUser user, PasswordEncoder encoder, EmailHelper emailHelper) {
+    public UserController(UserRepository repository, TbCfItemCollectionRepository itemCollectionRepository, TbCfStationItemRepository itemRepository, AuthenticationUser user, PasswordEncoder encoder, EmailHelper emailHelper) {
         this.repository = repository;
+        this.itemCollectionRepository = itemCollectionRepository;
+        this.itemRepository = itemRepository;
         this.user = user;
         this.encoder = encoder;
         this.emailHelper = emailHelper;
@@ -251,4 +260,42 @@ public class UserController extends Controller {
 
         return new Result<>(user);
     }
+
+
+    @GetMapping("/queryCollectionByUserId")
+    public Result queryCollectionByUserId() {
+
+        List<TbCfItemCollection> list = itemCollectionRepository.findAllByUserId(user.userId());
+
+        return new Result<>(list);
+    }
+
+    @PutMapping("/itemCollection/{itemId}")
+    public Result itemCollection(@PathVariable("itemId") String itemId) {
+        String userId = user.userId();
+        boolean exists = itemCollectionRepository.existsByUserIdAndItemItemId(userId, itemId);
+
+        if( exists ){
+            return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Favorite item already exists !!!");
+        }else{
+            Optional<TbCfStationItem> itemOptional = itemRepository.findById(itemId);
+            if( itemOptional.isPresent() ) {
+                TbCfItemCollection tbCfItemCollection = new TbCfItemCollection();
+                tbCfItemCollection.setUserId(userId);
+                tbCfItemCollection.setItem(itemOptional.get());
+                itemCollectionRepository.save(tbCfItemCollection);
+                return new Result<>(tbCfItemCollection);
+            }else{
+                return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Item not found");
+            }
+        }
+    }
+
+    @DeleteMapping("/delCollection")
+    public Result delCollection(@RequestBody String[] collectionIds) {
+
+        String userId = user.userId();
+         itemCollectionRepository.deleteAllByIdInAndUserId(collectionIds,userId);
+         return new Result();
+    }
 }

src/main/java/com/example/afrishop_v3/models/TbCfItemCollection.java

@@ -4,6 +4,8 @@ import lombok.Data;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.util.Date;
 
 /**
@@ -29,7 +31,11 @@ public class TbCfItemCollection {
     /**
      * 商品
      */
-    private String itemId;
+    //private String itemId;
+
+    @ManyToOne
+    @JoinColumn(columnDefinition = "item_id",name = "item_id")
+    private TbCfStationItem item;
     /**
      * 删除
      */
@@ -63,25 +69,29 @@ public class TbCfItemCollection {
         this.userId = userId;
     }
 
+    public void setItem(TbCfStationItem item) {
+        this.item = item;
+    }
+
     /**
      * 获取：用户
      */
     public String getUserId() {
         return userId;
     }
-    /**
-     * 设置：商品
-     */
-    public void setItemId(String itemId) {
-        this.itemId = itemId;
-    }
-
-    /**
-     * 获取：商品
-     */
-    public String getItemId() {
-        return itemId;
-    }
+//    /**
+//     * 设置：商品
+//     */
+//    public void setItemId(String itemId) {
+//        this.itemId = itemId;
+//    }
+//
+//    /**
+//     * 获取：商品
+//     */
+//    public String getItemId() {
+//        return itemId;
+//    }
     /**
      * 设置：删除
      */

src/main/java/com/example/afrishop_v3/repository/TbCfItemCollectionRepository.java

@@ -2,7 +2,16 @@ package com.example.afrishop_v3.repository;
 
 import com.example.afrishop_v3.models.TbCfItemCollection;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
 
 public interface TbCfItemCollectionRepository extends PagingAndSortingRepository<TbCfItemCollection,String> {
-    boolean existsByUserIdAndItemId(String userId, String itemId);
+    boolean existsByUserIdAndItemItemId(String userId, String itemId);
+    List<TbCfItemCollection> findAllByUserId(String userId);
+
+
+    @Transactional
+    void deleteAllByIdInAndUserId(String[] ids, String userId);
 }