mall：完善商品品牌的前后端实现

yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/BrandServiceImplTest.java

@@ -1,173 +0,0 @@
-package cn.iocoder.yudao.module.product.service.brand;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.product.controller.admin.brand.vo.*;
-import cn.iocoder.yudao.module.product.dal.dataobject.brand.BrandDO;
-import cn.iocoder.yudao.module.product.dal.mysql.brand.BrandMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
-
-import static cn.hutool.core.util.RandomUtil.*;
-import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
-* {@link BrandServiceImpl} 的单元测试类
-*
-* @author 芋道源码
-*/
-@Import(BrandServiceImpl.class)
-public class BrandServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private BrandServiceImpl brandService;
-
-    @Resource
-    private BrandMapper brandMapper;
-
-    @Test
-    public void testCreateBrand_success() {
-        // 准备参数
-        BrandCreateReqVO reqVO = randomPojo(BrandCreateReqVO.class);
-
-        // 调用
-        Long brandId = brandService.createBrand(reqVO);
-        // 断言
-        assertNotNull(brandId);
-        // 校验记录的属性是否正确
-        BrandDO brand = brandMapper.selectById(brandId);
-        assertPojoEquals(reqVO, brand);
-    }
-
-    @Test
-    public void testUpdateBrand_success() {
-        // mock 数据
-        BrandDO dbBrand = randomPojo(BrandDO.class);
-        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        BrandUpdateReqVO reqVO = randomPojo(BrandUpdateReqVO.class, o -> {
-            o.setId(dbBrand.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        brandService.updateBrand(reqVO);
-        // 校验是否更新正确
-        BrandDO brand = brandMapper.selectById(reqVO.getId()); // 获取最新的
-        assertPojoEquals(reqVO, brand);
-    }
-
-    @Test
-    public void testUpdateBrand_notExists() {
-        // 准备参数
-        BrandUpdateReqVO reqVO = randomPojo(BrandUpdateReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> brandService.updateBrand(reqVO), BRAND_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteBrand_success() {
-        // mock 数据
-        BrandDO dbBrand = randomPojo(BrandDO.class);
-        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbBrand.getId();
-
-        // 调用
-        brandService.deleteBrand(id);
-       // 校验数据不存在了
-       assertNull(brandMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteBrand_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> brandService.deleteBrand(id), BRAND_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetBrandPage() {
-       // mock 数据
-       BrandDO dbBrand = randomPojo(BrandDO.class, o -> { // 等会查询到
-           o.setCategoryId(null);
-           o.setName(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       brandMapper.insert(dbBrand);
-       // 测试 categoryId 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCategoryId(null)));
-       // 测试 name 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setName(null)));
-       // 测试 status 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(null)));
-       // 准备参数
-       BrandPageReqVO reqVO = new BrandPageReqVO();
-       reqVO.setCategoryId(null);
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime((new Date[]{}));
-
-       // 调用
-       PageResult<BrandDO> pageResult = brandService.getBrandPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbBrand, pageResult.getList().get(0));
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetBrandList() {
-       // mock 数据
-       BrandDO dbBrand = randomPojo(BrandDO.class, o -> { // 等会查询到
-           o.setCategoryId(null);
-           o.setName(null);
-           o.setStatus(null);
-           o.setCreateTime(null);
-       });
-       brandMapper.insert(dbBrand);
-       // 测试 categoryId 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCategoryId(null)));
-       // 测试 name 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setName(null)));
-       // 测试 status 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(null)));
-       // 测试 createTime 不匹配
-       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(null)));
-       // 准备参数
-       BrandExportReqVO reqVO = new BrandExportReqVO();
-       reqVO.setCategoryId(null);
-       reqVO.setName(null);
-       reqVO.setStatus(null);
-       reqVO.setCreateTime((new Date[]{}));
-
-       // 调用
-       List<BrandDO> list = brandService.getBrandList(reqVO);
-       // 断言
-       assertEquals(1, list.size());
-       assertPojoEquals(dbBrand, list.get(0));
-    }
-
-}

yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java

@@ -0,0 +1,132 @@
+package cn.iocoder.yudao.module.product.service.brand;
+
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandCreateReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandPageReqVO;
+import cn.iocoder.yudao.module.product.controller.admin.brand.vo.ProductBrandUpdateReqVO;
+import cn.iocoder.yudao.module.product.dal.dataobject.brand.ProductBrandDO;
+import cn.iocoder.yudao.module.product.dal.mysql.brand.ProductBrandMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
+import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.PRODUCT_BRAND_NOT_EXISTS;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+* {@link ProductBrandServiceImpl} 的单元测试类
+*
+* @author 芋道源码
+*/
+@Import(ProductBrandServiceImpl.class)
+public class ProductBrandServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private ProductBrandServiceImpl brandService;
+
+    @Resource
+    private ProductBrandMapper brandMapper;
+
+    @Test
+    public void testCreateBrand_success() {
+        // 准备参数
+        ProductBrandCreateReqVO reqVO = randomPojo(ProductBrandCreateReqVO.class);
+
+        // 调用
+        Long brandId = brandService.createProductBrand(reqVO);
+        // 断言
+        assertNotNull(brandId);
+        // 校验记录的属性是否正确
+        ProductBrandDO brand = brandMapper.selectById(brandId);
+        assertPojoEquals(reqVO, brand);
+    }
+
+    @Test
+    public void testUpdateBrand_success() {
+        // mock 数据
+        ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class);
+        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        ProductBrandUpdateReqVO reqVO = randomPojo(ProductBrandUpdateReqVO.class, o -> {
+            o.setId(dbBrand.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        brandService.updateBrand(reqVO);
+        // 校验是否更新正确
+        ProductBrandDO brand = brandMapper.selectById(reqVO.getId()); // 获取最新的
+        assertPojoEquals(reqVO, brand);
+    }
+
+    @Test
+    public void testUpdateBrand_notExists() {
+        // 准备参数
+        ProductBrandUpdateReqVO reqVO = randomPojo(ProductBrandUpdateReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> brandService.updateBrand(reqVO), PRODUCT_BRAND_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteBrand_success() {
+        // mock 数据
+        ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class);
+        brandMapper.insert(dbBrand);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbBrand.getId();
+
+        // 调用
+        brandService.deleteBrand(id);
+       // 校验数据不存在了
+       assertNull(brandMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteBrand_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> brandService.deleteBrand(id), PRODUCT_BRAND_NOT_EXISTS);
+    }
+
+    @Test
+    public void testGetBrandPage() {
+       // mock 数据
+       ProductBrandDO dbBrand = randomPojo(ProductBrandDO.class, o -> { // 等会查询到
+           o.setName("芋道源码");
+           o.setStatus(CommonStatusEnum.ENABLE.getStatus());
+           o.setCreateTime(buildTime(2022, 2, 1));
+       });
+       brandMapper.insert(dbBrand);
+       // 测试 name 不匹配
+       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setName("源码")));
+       // 测试 status 不匹配
+       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
+       // 测试 createTime 不匹配
+       brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildTime(2022, 3, 1))));
+       // 准备参数
+       ProductBrandPageReqVO reqVO = new ProductBrandPageReqVO();
+       reqVO.setName("芋道");
+       reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+       reqVO.setCreateTime((new Date[]{buildTime(2022, 1, 1), buildTime(2022, 2, 25)}));
+
+       // 调用
+       PageResult<ProductBrandDO> pageResult = brandService.getBrandPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbBrand, pageResult.getList().get(0));
+    }
+
+}

yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql

@@ -16,9 +16,8 @@ CREATE TABLE IF NOT EXISTS "product_category" (
 
 CREATE TABLE IF NOT EXISTS "product_brand" (
     "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "category_id" bigint(20) NOT NULL,
     "name" varchar(255) NOT NULL,
-    "banner_url" varchar(255) NOT NULL,
+    "pic_url" varchar(255) NOT NULL,
     "sort" int(11),
     "description" varchar(1024),
     "status" tinyint(4) NOT NULL,
@@ -28,4 +27,4 @@ CREATE TABLE IF NOT EXISTS "product_brand" (
     "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
-) COMMENT '品牌';
+) COMMENT '商品品牌';