feat: merge remote

cms/src/main/java/com/pudonghot/yo/cms/common/AuthHookImpl.java

@@ -0,0 +1,29 @@
+package com.pudonghot.yo.cms.common;
+
+import me.chyxion.tigon.dal.hook.AuthHook;
+import com.pudonghot.yo.webauth.SessionAbility;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Donghuang
+ * @date 9月 12, 2023 16:51:16
+ */
+@Component
+public class AuthHookImpl extends AuthHook<Long> implements SessionAbility {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Long doGetTenantId() {
+        return getTenantId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Long doGetMemberId() {
+        return getMemberId();
+    }
+}

cms/src/main/java/com/pudonghot/yo/cms/common/TenantIdGetterImpl.java

@@ -1,30 +0,0 @@
-package com.pudonghot.yo.cms.common;
-
-import me.chyxion.tigon.dal.hook.AuthHook;
-import com.pudonghot.yo.webauth.SessionAbility;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Donghuang
- * @date 9月 12, 2023 16:51:16
- */
-@Component
-public class TenantIdGetterImpl extends AuthHook<Long> implements SessionAbility {
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Long doGetMemberId() {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Long doGetTenantId() {
-        return SessionAbility.super.getTenantId();
-    }
-
-}

cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentGroupServiceImpl.java

@@ -65,7 +65,7 @@ public class AgentGroupServiceImpl
     @Autowired
     private TrunkStrategyDal trunkStrategyDal;
     @Autowired
-    private AuthHook<Long> tenantIdGetter;
+    private AuthHook<Long> authHook;
 
 
     /**
@@ -76,7 +76,7 @@ public class AgentGroupServiceImpl
         super.afterFind(req, servModel);
 
         val extAttrs = servModel.getExtAttrs();
-        extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(tenantIdGetter.getTenantId()));
+        extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(authHook.getTenantId()));
         extAttrs.put("privacyLevelsList", PrivacyLevelEnum.values());
     }
 
@@ -88,7 +88,7 @@ public class AgentGroupServiceImpl
         super.afterList(req, servModel);
 
         val extAttrs = servModel.getExtAttrs();
-        extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(tenantIdGetter.getTenantId()));
+        extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(authHook.getTenantId()));
         extAttrs.put("privacyLevelsList", PrivacyLevelEnum.values());
     }
 

cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentServiceImpl.java

@@ -64,7 +64,7 @@ public class AgentServiceImpl
     @Autowired
     private QueueAgentDal queueAgentDal;
     @Autowired
-    private AuthHook<Long> tenantIdGetter;
+    private AuthHook<Long> authHook;
 
     // Debug: EventExpressionEvaluator
     @EventListener(value = EntityBatchDeletedEvent.class,
@@ -181,7 +181,7 @@ public class AgentServiceImpl
         super.afterFind(req, servModel);
 
         val extAttrs = servModel.getExtAttrs();
-        val tenantId = tenantIdGetter.getTenantId();
+        val tenantId = authHook.getTenantId();
         extAttrs.put("groupsList", agentGroupDal.listAll(tenantId));
         extAttrs.put("queuesList", queueDal.listAll(tenantId));
     }
@@ -194,7 +194,7 @@ public class AgentServiceImpl
         super.afterList(req, servModel);
 
         val extAttrs = servModel.getExtAttrs();
-        val tenantId = tenantIdGetter.getTenantId();
+        val tenantId = authHook.getTenantId();
         extAttrs.put("groupsList", agentGroupDal.listAll(tenantId));
         extAttrs.put("queuesList", queueDal.listAll(tenantId));
     }
@@ -256,6 +256,9 @@ public class AgentServiceImpl
             () -> "Agent [" + form.getAccount() + "] existed");
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     protected boolean beforeUpdate(final AgentUpdateServReq req, final Agent agent, final AgentBO agentBO) {
         super.beforeUpdate(req, agent, agentBO);

cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListServiceImpl.java

@@ -55,7 +55,7 @@ public class CallingListServiceImpl
     @Autowired
     private IdSequence idSeq;
     @Autowired
-    private AuthHook<Long> tenantIdGetter;
+    private AuthHook<Long> authHook;
 
     /**
      * {@inheritDoc}
@@ -65,7 +65,7 @@ public class CallingListServiceImpl
         super.afterFind(req, servModel);
 
         val extAttrs = servModel.getExtAttrs();
-        extAttrs.put("campaignList", campaignDal.listAll(tenantIdGetter.getTenantId()));
+        extAttrs.put("campaignList", campaignDal.listAll(authHook.getTenantId()));
         extAttrs.put("callingListStatus", status());
     }
 
@@ -81,7 +81,7 @@ public class CallingListServiceImpl
             item.getExtAttrs().put("campaign", campaignDal.find(item.getCampaignId()));
         }
 
-        extAttrs.put("campaignList", campaignDal.listAll(tenantIdGetter.getTenantId()));
+        extAttrs.put("campaignList", campaignDal.listAll(authHook.getTenantId()));
         extAttrs.put("callingListStatus", status());
     }
 

cms/src/main/java/com/pudonghot/yo/cms/service/campaign/impl/CampaignServiceImpl.java

@@ -67,7 +67,7 @@ public class CampaignServiceImpl extends TaggableServiceImpl<CampaignBO,
     @Autowired
     private TagDal tagDal;
     @Autowired
-    private AuthHook<Long> tenantIdGetter;
+    private AuthHook<Long> authHook;
 
     /**
      * {@inheritDoc}
@@ -171,7 +171,7 @@ public class CampaignServiceImpl extends TaggableServiceImpl<CampaignBO,
     public CampaignCreateDataServResp createData() {
         val resp = beanService.convert(buildEntityExtData(), CampaignCreateDataServResp.class);
         resp.setActive(true);
-        resp.setTagsList(beanService.convert(tagDal.listOfTenant(tenantIdGetter.getTenantId()), TagBO.class));
+        resp.setTagsList(beanService.convert(tagDal.listOfTenant(authHook.getTenantId()), TagBO.class));
 
         resp.setType(CampaignTypeEnum.AGENT);
         resp.setTargetType(CampaignTargetTypeEnum.QUEUE);
@@ -186,7 +186,7 @@ public class CampaignServiceImpl extends TaggableServiceImpl<CampaignBO,
     }
 
     EntityExtData buildEntityExtData() {
-        val tenantId = tenantIdGetter.getTenantId();
+        val tenantId = authHook.getTenantId();
 
         val entityExtData = new EntityExtData();
         entityExtData.setTrunkStrategiesList(beanService.convert(trunkStrategyDal.listAll(tenantId), TrunkStrategyBO.class));

cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TaggableServiceImpl.java

@@ -42,7 +42,7 @@ public abstract class TaggableServiceImpl<
     @Autowired
     private ObjectTagDal objectTagDal;
     @Autowired
-    private AuthHook<Long> tenantIdGetter;
+    private AuthHook<Long> authHook;
 
     /**
      * {@inheritDoc}
@@ -52,7 +52,7 @@ public abstract class TaggableServiceImpl<
         super.afterFind(req, servModel);
 
         if (servModel != null) {
-            servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(tenantIdGetter.getTenantId()));
+            servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(authHook.getTenantId()));
         }
     }
 
@@ -62,7 +62,7 @@ public abstract class TaggableServiceImpl<
     @Override
     protected void afterList(final ListServReq req, final ListServResp<ServModel> servModel) {
         super.afterList(req, servModel);
-        servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(tenantIdGetter.getTenantId()));
+        servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(authHook.getTenantId()));
     }
 
     /**

cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkServiceImpl.java

@@ -96,7 +96,7 @@ public class TrunkServiceImpl
     @Autowired
     private AgentGroupDal agentGroupDal;
     @Autowired
-    private AuthHook<Long> tenantIdGetter;
+    private AuthHook<Long> authHook;
 
     @Override
     protected void afterFind(FindServReq<Long> req, TrunkBO servModel) {
@@ -292,7 +292,7 @@ public class TrunkServiceImpl
     EntityExtData buildEntityExtData() {
         val entityExtData = new EntityExtData();
 
-        val tenantId = tenantIdGetter.getTenantId();
+        val tenantId = authHook.getTenantId();
         entityExtData.setGatewaysList(beanService.convert(gatewayDal.listActive(), GatewayBO.class));
         entityExtData.setTelecomVendorsList(beanService.convert(telecomVendorDal.listAll(), TelecomVendorBO.class));
         entityExtData.setTrunkStrategiesList(beanService.convert(trunkStrategyDal.listAll(tenantId), TrunkStrategyBO.class));