Merge pull request #365 from Dapp-Learning-DAO/dev

add feature

Author: cheng521521

src/main/java/com/dl/officialsite/bounty/BountyService.java

@@ -204,10 +204,11 @@ public void apply(ApplyBountyParam applyBountyParam) {
             .orElseThrow(() -> new BizException(NOT_FOUND_MEMBER.getCode(), NOT_FOUND_MEMBER.getMsg()));
 
         try {
-            emailService.sendMail(createBountyMember.getEmail(), "有新人申请bounty", "bounty名称:"
-                + bounty.getTitle() + "\n" + "申请人地址:" + createBountyMember.getAddress() +
-                "\n" + "赶紧去看看吧 "
-                + "https://dapplearning.org/bounty");
+            emailService.sendMail(createBountyMember.getEmail(), "有新人申请bounty", "bounty名称:" + bounty.getTitle() + "\n"
+                + "申请人地址:" + createBountyMember.getAddress()  + "\n"
+                + "联系方式:" + applyBountyParam.getContractAddress() + "\n"
+                + "简介:\n" + applyBountyParam.getIntroduction() + "\n"
+                + "赶紧去看看吧: https://dapplearning.org/bounty");
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/main/java/com/dl/officialsite/common/constants/Constants.java

@@ -64,6 +64,7 @@ public class Constants {
     public static final String CHAIN_ID_LINEA = "59144";
     public static final String CHAIN_ID_BASE = "8453";
     public static final String CHAIN_ID_GNOSIS = "100";
+    public static final String CHAIN_ID_OP_SEPOLIA = "11155420";
 
 
     /**

src/main/java/com/dl/officialsite/common/enums/CodeEnums.java

@@ -57,7 +57,10 @@ public enum CodeEnums {
     INVALID_AMOUNT("6007", "Invalid amount"),
     DUPLICATE_CLAIMER("6008", "Duplicate claimer"),
     SIZE_NOT_MATCH("6009", "Size not match"),
-    ;
+    NOT_FOUND_WISH("7000", "not found wish"),
+
+    // wish
+    NOT_REPEAT_LIKE("7001", "not repeat like");
 
     private String code;
 

src/main/java/com/dl/officialsite/login/filter/LoginFilter.java

@@ -73,6 +73,7 @@ public class LoginFilter extends OncePerRequestFilter {
         add("/sponsors/all");
         add("/course/detail");
         add("/course/list");
+        add("/wish");
     }} ;
 
     private Set<String> noAddrCheckApis = new HashSet() {{

src/main/java/com/dl/officialsite/sharing/Share.java

@@ -157,4 +157,8 @@ public class Share {
 
     @Column(columnDefinition = "MEDIUMTEXT")
     private String outline;
+
+    private Long wishId;
+
+    private String wishTitle;
 }

src/main/java/com/dl/officialsite/sharing/SharingController.java

@@ -92,9 +92,9 @@ public BaseResponse loadSharing(@RequestParam(value = "pageNo",defaultValue = "1
      * 条件搜索
      */
     @PostMapping("/search")
-    public BaseResponse searchSharing(@RequestBody ShareSearchVo searchVo, @RequestParam(value =
-        "pageNo",defaultValue = "1") int pageNumber,
-                                      @RequestParam(value = "pageSize",defaultValue = "20") int pageSize){
+    public BaseResponse searchSharing(@RequestBody ShareSearchVo searchVo,
+        @RequestParam(value = "pageNo",defaultValue = "1") int pageNumber,
+        @RequestParam(value = "pageSize",defaultValue = "20") int pageSize){
         Pageable pageable = PageRequest.of(pageNumber - 1, pageSize);
         Page<Share> page = sharingService.searchSharing(searchVo, pageable);
         return BaseResponse.successWithData(page);

src/main/java/com/dl/officialsite/sharing/SharingRepository.java

@@ -1,6 +1,7 @@
 package com.dl.officialsite.sharing;
 
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -53,4 +54,7 @@ List<Share> findAllSharesByUidPaged(@Param("memberAddress") String memberAddress
     //通过courseId查询share表中的数据
     @Query(value = "select * from share s where s.course_id = :courseId", nativeQuery = true)
     List<Share> findByCourseId(Long courseId);
+
+    @Query(value = "select * from share s where s.wish_id = :wishId", nativeQuery = true)
+    Optional<Share> findByWishId(Long wishId);
 }

src/main/java/com/dl/officialsite/sharing/SharingService.java

@@ -20,6 +20,9 @@
 import com.dl.officialsite.sharing.model.req.UpdateSharingReq;
 import com.dl.officialsite.sharing.model.resp.ShareTagResp;
 import com.dl.officialsite.team.TeamService;
+import com.dl.officialsite.wish.WishService;
+import com.dl.officialsite.wish.domain.Wish;
+import com.dl.officialsite.wish.repository.WishRepository;
 import com.google.common.collect.Lists;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
@@ -31,6 +34,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +46,7 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 @Service
@@ -60,6 +65,9 @@ public class SharingService {
     @Autowired
     TeamService teamService;
 
+    @Resource
+    private WishRepository wishRepository;
+
     private final EmailService emailService;
 
     private final ApplicationContext applicationContext;
@@ -73,6 +81,15 @@ public SharingService(EmailService emailService, ApplicationContext applicationC
     @Transactional(rollbackFor = Exception.class)
     public Share createSharing(Share share, String address) {
 
+        if (!ObjectUtils.isEmpty(share.getWishId())) {
+            Wish wish = wishRepository.findById(share.getWishId()).orElseThrow(() -> new BizException(
+                CodeEnums.NOT_FOUND_WISH
+            ));
+            wish.setApply(1);
+            wishRepository.save(wish);
+            share.setWishTitle(wish.getTitle());
+        }
+
         // 保存分享记录
         share = sharingRepository.save(share);
 
@@ -98,6 +115,8 @@ public Share createSharing(Share share, String address) {
         // 发送邮件
         emailService.sendMail(toAddressList, emailTitle, emailContent, null);
 
+
+
         return share;
     }
 
@@ -123,11 +142,20 @@ private void publishShareCreationEvent(Member creatorInfo, Share share, String f
     }
 
     private String createEmailContent(Share share, Member creatorInfo) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        String shareTime = formatter.format(share.getDate()) + "-" + share.getTime();
+        String shareLanguage = share.getLanguage() == 0 ? "Chinese" : "English";
         // 构造邮件内容
         return String.format(
-            "Have a new sharing\n👉👉👉Theme: %s👈👈👈\nCreator: %s",
+            "Have a new sharing\n👉👉👉Theme: %s👈👈👈\nOutLine: %s\nCreator: %s\nlanguage: "
+                + "%s\nsharingDoc: %s\nShareTime: %s\nOrg: %s\n",
             share.getTheme(),
-            creatorInfo.getNickName()
+            share.getOutline(),
+            creatorInfo.getNickName(),
+            shareLanguage,
+            share.getSharingDoc(),
+            shareTime,
+            share.getOrg()
         );
     }
 
@@ -162,6 +190,7 @@ public void updateSharing(UpdateSharingReq req, String address) {
             sharing.setTag(req.getTag());
             sharing.setCourseId(req.getCourseId());
             sharing.setOutline(req.getOutline());
+            sharing.setWishId(req.getWishId());
 
             this.sharingRepository.save(sharing);
         } else {
@@ -204,6 +233,10 @@ public Share querySharing(long shareId) {
         return sharingEntity.get();
     }
 
+    public Optional<Share> querySharingByWishId(Long wishId) {
+        return this.sharingRepository.findByWishId(wishId);
+    }
+
 
     public PagedList loadSharingByUser(String memberAddress, int pageNo, int pageSize) {
         int offset = (pageNo - 1) * pageSize;

src/main/java/com/dl/officialsite/sharing/model/req/UpdateSharingReq.java

@@ -86,4 +86,6 @@ public class UpdateSharingReq {
 
     @ApiModelProperty("课程大纲")
     private String outline;
+
+    private Long wishId;
 }

src/main/java/com/dl/officialsite/wish/WishController.java

@@ -1,10 +1,23 @@
 package com.dl.officialsite.wish;
 
 import com.dl.officialsite.common.base.BaseResponse;
+import com.dl.officialsite.wish.domain.Wish;
 import com.dl.officialsite.wish.params.AddWishParam;
+import com.dl.officialsite.wish.params.ApplyWishParam;
+import com.dl.officialsite.wish.params.DonationWishParam;
+import com.dl.officialsite.wish.params.EditWishParam;
+import com.dl.officialsite.wish.params.QueryWishParam;
+import com.dl.officialsite.wish.params.SettleWishParam;
+import com.dl.officialsite.wish.result.WishDetailResult;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,5 +43,66 @@ public BaseResponse add(@RequestBody AddWishParam addWishParam, @RequestParam St
         return BaseResponse.successWithData(wishService.add(addWishParam, address));
     }
 
+    //edit wish
+    @PutMapping
+    public BaseResponse edit(@RequestBody EditWishParam editWishParam, @RequestParam String address) {
+        wishService.edit(editWishParam, address);
+        return BaseResponse.success();
+    }
+
+    //delete wish
+    @DeleteMapping
+    public BaseResponse delete(@RequestParam Long id, @RequestParam String address) {
+        wishService.delete(id, address);
+        return BaseResponse.success();
+    }
+
+    //list wish
+    @PostMapping("/list")
+    public BaseResponse list(@RequestBody QueryWishParam queryWishParam,
+        @RequestParam(value = "pageNo",defaultValue = "1") int pageNumber,
+        @RequestParam(value = "pageSize",defaultValue = "20") int pageSize,
+        @RequestParam String address) {
+        Pageable pageable = PageRequest.of(pageNumber - 1, pageSize);
+        Page<Wish> page = wishService.list(queryWishParam, pageable);
+        return BaseResponse.successWithData(page);
+    }
+
+    //get wish
+    @GetMapping
+    public BaseResponse<WishDetailResult> get(@RequestParam Long id, @RequestParam String address) {
+        return BaseResponse.successWithData(wishService.get(id, address));
+    }
+
+    //like wish
+    @PostMapping("/like")
+    public BaseResponse like(@RequestParam Long wishId, @RequestParam String address) {
+        wishService.like(wishId, address);
+        return BaseResponse.success();
+    }
+
+    //donation wish
+    @PostMapping("/donation")
+    public BaseResponse apply(@RequestParam String address,
+        @RequestBody DonationWishParam donationWishParam) {
+        wishService.donation(address, donationWishParam);
+        return BaseResponse.success();
+    }
+
+    //settle wish
+    @PostMapping("/settle")
+    public BaseResponse apply(@RequestParam String address,
+        @RequestBody SettleWishParam settleWishParam) {
+        wishService.settle(address, settleWishParam);
+        return BaseResponse.success();
+    }
+
+
+    @GetMapping("test")
+    public void test() {
+        wishService.updateWishTokenAmount();
+    }
+
+
 
 }