working on #141 #142 #143

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/frontend/controller/common/impl/HashTagsOverviewHelperImpl.java

@@ -75,7 +75,7 @@ public HashTagOverview getHashTagOverview() {
                 pageRequest=myPage.nextPageable();
             }
         }
-        return null;
+        return new HashTagOverview(hashTagsTweets,hashTagsUsers);
     }
 
     private static final Logger log = LoggerFactory.getLogger(HashTagsOverviewHelperImpl.class);

src/main/java/org/woehlke/twitterwall/oodm/service/TweetService.java

@@ -16,12 +16,8 @@
  */
 public interface TweetService extends DomainServiceWithIdTwitter<Tweet>,DomainServiceWithTask<Tweet> {
 
-    //Page<Tweet> findLatestTweets(Pageable pageRequest);
-
     Page<Tweet> findTweetsForHashTag(HashTag hashtag, Pageable pageRequest);
 
-    //long countTweetsForHashTag(String hashtagText);
-
     Page<Tweet> findTweetsForUser(User user, Pageable pageRequest);
 
     Page<Long> findAllTwitterIds(Pageable pageRequest);

src/main/java/org/woehlke/twitterwall/scheduled/mq/endoint/impl/StartTaskImpl.java

@@ -5,6 +5,7 @@
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.woehlke.twitterwall.conf.TwitterwallSchedulerProperties;
 import org.woehlke.twitterwall.oodm.entities.Task;
@@ -32,12 +33,14 @@ public void fetchTweetsFromTwitterSearch() {
         sendAndReceiveTweet(taskType);
     }
 
+    @Async
     @Override
     public void updateTweets() {
         TaskType taskType = TaskType.UPDATE_TWEETS;
         sendAndReceiveTweet(taskType);
     }
 
+    @Async
     @Override
     public void updateUserProfiles() {
         TaskType taskType = TaskType.UPDATE_USER_PROFILES;

src/main/java/org/woehlke/twitterwall/scheduled/mq/endoint/impl/UpdateTweetsImpl.java

@@ -1,5 +1,7 @@
 package org.woehlke.twitterwall.scheduled.mq.endoint.impl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -46,7 +48,6 @@ public UpdateTweetsImpl(TwitterProperties twitterProperties, TweetService tweetS
     @Override
     public List<TweetFromTwitter> splitMessage(Message<TaskMessage> message) {
         CountedEntities countedEntities = countedEntitiesService.countAll();
-        List<TweetFromTwitter> tweets = new ArrayList<>();
         TaskMessage msgIn = message.getPayload();
         long taskId = msgIn.getTaskId();
         Task task = taskService.findById(taskId);
@@ -55,13 +56,18 @@ public List<TweetFromTwitter> splitMessage(Message<TaskMessage> message) {
         boolean hasNext=true;
         Pageable pageRequest = new PageRequest(FIRST_PAGE_NUMBER, twitterProperties.getPageSize());
         while(hasNext) {
-            Page<Long> tweetTwitterIds = tweetService.findAllTwitterIds(pageRequest);
-            worklistTwitterIds.addAll(tweetTwitterIds.getContent());
+            Page<org.woehlke.twitterwall.oodm.entities.Tweet> tweetTwitterIds = tweetService.getAll(pageRequest);
+            for(org.woehlke.twitterwall.oodm.entities.Tweet tweetTwitterId:tweetTwitterIds.getContent()){
+                log.debug("### tweetService.findAllTwitterIds (1): "+tweetTwitterId.getIdTwitter());
+                worklistTwitterIds.add(tweetTwitterId.getIdTwitter());
+            }
             hasNext = tweetTwitterIds.hasNext();
             pageRequest = pageRequest.next();
         }
         int millisToWaitBetweenTwoApiCalls = twitterProperties.getMillisToWaitBetweenTwoApiCalls();
+        List<TweetFromTwitter> tweets = new ArrayList<>();
         for(Long tweetTwitterId : worklistTwitterIds){
+            log.debug("### tweetService.findAllTwitterIds (2): "+tweetTwitterId);
             Tweet foundTweetFromTwitter = twitterApiService.findOneTweetById(tweetTwitterId);
             TweetFromTwitter result = new TweetFromTwitter(task.getId(),foundTweetFromTwitter);
             tweets.add(result);
@@ -72,4 +78,7 @@ public List<TweetFromTwitter> splitMessage(Message<TaskMessage> message) {
         }
         return tweets;
     }
+
+    private static final Logger log = LoggerFactory.getLogger(UpdateTweetsImpl.class);
+
 }

src/main/java/org/woehlke/twitterwall/scheduled/mq/endoint/impl/UpdateUserProfilesImpl.java

@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Component;
 import org.woehlke.twitterwall.conf.TwitterProperties;
 import org.woehlke.twitterwall.oodm.entities.Task;
+import org.woehlke.twitterwall.oodm.entities.User;
 import org.woehlke.twitterwall.oodm.entities.parts.CountedEntities;
 import org.woehlke.twitterwall.oodm.service.TaskService;
 import org.woehlke.twitterwall.oodm.service.UserService;
@@ -54,7 +55,6 @@ public UpdateUserProfilesImpl(TwitterProperties twitterProperties, TwitterApiSer
     public List<TwitterProfileMessage> splitMessage(Message<TaskMessage> message) {
         String msg = "mqUpdateUserProfiles.splitMessage: ";
         CountedEntities countedEntities = countedEntitiesService.countAll();
-        List<TwitterProfileMessage> userProfileList = new ArrayList<>();
         TaskMessage msgIn = message.getPayload();
         long id = msgIn.getTaskId();
         Task task = taskService.findById(id);
@@ -65,13 +65,17 @@ public List<TwitterProfileMessage> splitMessage(Message<TaskMessage> message) {
         List<Long> worklistProfileTwitterIds = new ArrayList<>();
         Pageable pageRequest = new PageRequest(FIRST_PAGE_NUMBER, twitterProperties.getPageSize());
         while (hasNext) {
-            Page<Long> userProfileTwitterIds = userService.getAllTwitterIds(pageRequest);
-            worklistProfileTwitterIds.addAll(userProfileTwitterIds.getContent());
+            Page<User> userProfileTwitterIds = userService.getAll(pageRequest);
+            for(User user:userProfileTwitterIds.getContent()){
+                log.debug(msg+ " userService.getAllTwitterIds:  "+user.getIdTwitter());
+                worklistProfileTwitterIds.add(user.getIdTwitter());
+            }
             hasNext = userProfileTwitterIds.hasNext();
             pageRequest = pageRequest.next();
         }
         long number = worklistProfileTwitterIds.size();
         int millisToWaitBetweenTwoApiCalls = twitterProperties.getMillisToWaitBetweenTwoApiCalls();
+        List<TwitterProfileMessage> userProfileList = new ArrayList<>();
         for(Long userProfileTwitterId:worklistProfileTwitterIds){
             allLoop++;
             loopId++;