Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv13643/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterSubscriptionServicesImpl.java
StatisticServiceImpl.java
Log Message:
CMSC-725 ,Newsletter Statistic
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-725
Index: NewsletterSubscriptionServicesImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterSubscriptionServicesImpl.java 9 May 2008 07:08:50 -0000
1.14
+++ NewsletterSubscriptionServicesImpl.java 14 May 2008 05:32:48 -0000
1.15
@@ -13,7 +13,8 @@
import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.domain.Term;
-import static com.finalist.newsletter.domain.Subscription.STATUS;
+import com.finalist.newsletter.domain.Subscription.STATUS;
+import com.finalist.newsletter.domain.StatisticResult.HANDLE;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
import com.finalist.newsletter.services.NewsletterService;
import com.finalist.newsletter.util.DateUtil;
@@ -112,7 +113,12 @@
subscription.setStatus(STATUS.ACTIVE);
}
subscriptionCAO.modifySubscriptionStauts(subscription);
-
statisticCAO.logPubliction(userId,newsletterId,subscription.getStatus());
+ if(STATUS.ACTIVE.equals(subscription.getStatus())){
+ statisticCAO.logPubliction(userId,newsletterId,HANDLE.ACTIVE);
+ }
+ else {
+ statisticCAO.logPubliction(userId,newsletterId,HANDLE.INACTIVE);
+ }
}
public void pause(String subscriptionId, String duration, String
durationunit) {
@@ -215,7 +221,7 @@
subscription.setMimeType("text/html");
subscription.setStatus(STATUS.ACTIVE);
subscriptionCAO.addSubscriptionRecord(subscription, userId);
- statisticCAO.logPubliction(userId,newsletterId,STATUS.ACTIVE);
+ statisticCAO.logPubliction(userId,newsletterId,HANDLE.ACTIVE);
}
public void resume(String subscriptionId) {
@@ -230,7 +236,7 @@
subscriptionCAO.updateSubscription(subscription);
int newsletterId =
newsletterCAO.getNewsletterIdBySubscription(Integer.parseInt(subscriptionId));
int userId = CommunityModuleAdapter.getCurrentUserId();
- statisticCAO.logPubliction(userId,newsletterId,STATUS.INACTIVE);
+ statisticCAO.logPubliction(userId,newsletterId,HANDLE.INACTIVE);
}
public Subscription getSubscription(String sId) {
Index: StatisticServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/StatisticServiceImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- StatisticServiceImpl.java 3 May 2008 15:23:34 -0000 1.2
+++ StatisticServiceImpl.java 14 May 2008 05:32:48 -0000 1.3
@@ -11,29 +11,31 @@
import com.finalist.newsletter.cao.NewsletterCAO;
import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.StatisticResult;
+import com.finalist.newsletter.domain.StatisticResult.HANDLE;
+import com.finalist.newsletter.services.CommunityModuleAdapter;
import com.finalist.newsletter.services.ServiceException;
import com.finalist.newsletter.services.StatisticService;
import com.finalist.newsletter.util.DateUtil;
public class StatisticServiceImpl implements StatisticService {
- NewsLetterStatisticCAO statisticcao;
+ NewsLetterStatisticCAO statisticCAO;
- NewsletterCAO newLettercao;
+ NewsletterCAO newsletterCAO;
- public void setStatisticcao (NewsLetterStatisticCAO statisticcao){
+ public void setStatisticCAO (NewsLetterStatisticCAO statisticCAO){
- this.statisticcao = statisticcao;
+ this.statisticCAO = statisticCAO;
}
- public void setNewLettercao (NewsletterCAO newLettercao){
+ public void setNewsletterCAO (NewsletterCAO newsletterCAO){
- this.newLettercao = newLettercao;
+ this.newsletterCAO = newsletterCAO;
}
public List<StatisticResult> statisticAll (){
- List<StatisticResult> list = statisticcao.getAllRecords();
+ List<StatisticResult> list = statisticCAO.getAllRecords();
return list;
}
@@ -45,14 +47,14 @@
Date endDate;
startDate = DateUtil.parser(start);
endDate = DateUtil.parser(end);
- List<StatisticResult> list = statisticcao.getAllRecordsByPeriod(
+ List<StatisticResult> list = statisticCAO.getAllRecordsByPeriod(
startDate, endDate);
return list;
}
public List<StatisticResult> statisticByNewsletter (int newsletterId){
- List<StatisticResult> list = statisticcao
+ List<StatisticResult> list = statisticCAO
.getRecordsByNewsletter(newsletterId);
return list;
}
@@ -64,7 +66,7 @@
Date endDate;
startDate = DateUtil.parser(start);
endDate = DateUtil.parser(end);
- List<StatisticResult> list = statisticcao
+ List<StatisticResult> list = statisticCAO
.getRecordsByNewsletterAndPeriod(startDate,
endDate, newsletterId);
StatisticResult result = new StatisticResult();
for (StatisticResult r : list) {
@@ -80,7 +82,7 @@
public StatisticResult statisticSummery (){
- List<StatisticResult> list = statisticcao.getAllRecords();
+ List<StatisticResult> list = statisticCAO.getAllRecords();
StatisticResult result = new StatisticResult();
for (StatisticResult r : list) {
result.setPost(result.getPost() + r.getPost());
@@ -100,7 +102,7 @@
Date endDate;
startDate = DateUtil.parser(start);
endDate = DateUtil.parser(end);
- List<StatisticResult> list = statisticcao.getAllRecordsByPeriod(
+ List<StatisticResult> list = statisticCAO.getAllRecordsByPeriod(
startDate, endDate);
StatisticResult result = new StatisticResult();
for (StatisticResult r : list) {
@@ -121,14 +123,14 @@
Date endDate;
startDate = DateUtil.parser(start);
endDate = DateUtil.parser(end);
- List<StatisticResult> list = statisticcao
+ List<StatisticResult> list = statisticCAO
.getRecordsByNewsletterAndPeriod(startDate,
endDate, newsletterId);
return list;
}
public StatisticResult StatisticSummaryByNewsletter (int newsletterId){
- List<StatisticResult> list = statisticcao
+ List<StatisticResult> list = statisticCAO
.getRecordsByNewsletter(newsletterId);
StatisticResult result = new StatisticResult();
for (StatisticResult r : list) {
@@ -141,5 +143,9 @@
result.setName("newsletter.summary");
return result;
}
+ public void logPubliction(int newsletterId, HANDLE handle){
+ int userId = CommunityModuleAdapter.getCurrentUserId();
+ statisticCAO.logPubliction(userId,newsletterId,handle);
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
