fixed #222, fixed #217, working on #215, working on #200

phasenraum2010 · phasenraum2010 · commit 4eec3eb6f18b · 2017-08-05T13:25:07.000+02:00
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/MentionRepository.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/MentionRepository.java
@@ -8,13 +8,15 @@
 import org.woehlke.twitterwall.oodm.repositories.common.DomainRepository;
 import org.woehlke.twitterwall.oodm.repositories.custom.MentionRepositoryCustom;
 
+import java.util.List;
+
 /**
  * Created by tw on 15.07.17.
  */
 @Repository
 public interface MentionRepository extends DomainRepository<Mention>,MentionRepositoryCustom {
 
-    Mention findByIdTwitter(long idTwitter);
+    List<Mention> findByIdTwitter(long idTwitter);
 
     Mention findByScreenNameUnique(String screenNameUnique);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/MentionServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/MentionServiceImpl.java
@@ -16,6 +16,8 @@
 import org.woehlke.twitterwall.oodm.repositories.TaskRepository;
 import org.woehlke.twitterwall.oodm.service.MentionService;
 
+import java.util.List;
+
 
 /**
  * Created by tw on 12.06.17.
@@ -36,7 +38,16 @@ public MentionServiceImpl(MentionRepository mentionRepository, TaskRepository ta
 
     @Override
     public Mention findByIdTwitter(long idTwitter) {
-        return mentionRepository.findByIdTwitter(idTwitter);
+        if(idTwitter < 0L){
+            return null;
+        }
+        List<Mention> resultList = mentionRepository.findByIdTwitter(idTwitter);
+        for(Mention result:resultList){
+            if (result.getIdTwitter() >0L){
+                return result;
+            }
+        }
+        return null;
     }
 
     @Override
diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/ImprintControllerTest.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/ImprintControllerTest.java
@@ -16,6 +16,7 @@
 import org.woehlke.twitterwall.Application;
 import org.woehlke.twitterwall.conf.properties.TwitterProperties;
 import org.woehlke.twitterwall.conf.properties.FrontendProperties;
+import org.woehlke.twitterwall.frontend.controller.common.PrepareDataTest;
 import org.woehlke.twitterwall.test.UserServiceTestHelper;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -42,15 +43,18 @@ public class ImprintControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @Autowired
-    private UserServiceTestHelper userServiceTestHelper;
+    //@Autowired
+    //private UserServiceTestHelper userServiceTestHelper;
 
-    @Autowired
-    private TwitterProperties twitterProperties;
+    //@Autowired
+    //private TwitterProperties twitterProperties;
 
     @Autowired
     private FrontendProperties frontendProperties;
 
+    @Autowired
+    private PrepareDataTest prepareDataTest;
+
     //@Commit
     @Test
     public void controllerIsPresentTest(){
@@ -63,7 +67,7 @@ public void controllerIsPresentTest(){
     public void fetchTweetsFromTwitterSearchTest() throws Exception  {
         log.info("------------------------------------");
         log.info("fetchTweetsFromSearchTest: START  userServiceTest.createUser("+ frontendProperties.getImprintScreenName()+")");
-        userServiceTestHelper.createUser(frontendProperties.getImprintScreenName());
+        prepareDataTest.createUser(frontendProperties.getImprintScreenName());
         log.info("fetchTweetsFromSearchTest: DONE  userServiceTest.createUser("+ frontendProperties.getImprintScreenName()+")");
         log.info("------------------------------------");
         Assert.assertTrue(true);
diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/MediaControllerTest.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/MediaControllerTest.java
@@ -59,9 +59,9 @@ public void setupTestData() throws Exception {
     @Test
     public void getAllTest() throws Exception {
         String msg ="getAllTest: ";
-        MvcResult result = this.mockMvc.perform(get("/mention/all"))
+        MvcResult result = this.mockMvc.perform(get("/media/all"))
                 .andExpect(status().isOk())
-                .andExpect(view().name("mention/all"))
+                .andExpect(view().name("media/all"))
                 .andExpect(model().attributeExists("myPageContent"))
                 .andExpect(model().attributeExists("page"))
                 .andReturn();
diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/common/PrepareDataTest.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/common/PrepareDataTest.java
@@ -1,9 +1,13 @@
 package org.woehlke.twitterwall.frontend.controller.common;
 
 
+import org.woehlke.twitterwall.oodm.entities.User;
+
 public interface PrepareDataTest {
 
     void getTestDataTweets(String msg);
 
     void getTestDataUser(String msg);
+
+    User createUser(String screenName);
 }
diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/common/impl/PrepareDataTestImpl.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/common/impl/PrepareDataTestImpl.java
@@ -16,6 +16,7 @@
 import org.woehlke.twitterwall.frontend.controller.common.PrepareDataTest;
 import org.woehlke.twitterwall.oodm.entities.Tweet;
 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.entities.parts.TaskType;
 import org.woehlke.twitterwall.oodm.service.TaskService;
@@ -28,6 +29,7 @@
 
 import javax.persistence.NoResultException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -173,6 +175,60 @@ public void getTestDataUser(String msg){
         taskService.done(task,countedEntities);
     }
 
+    @Override
+    public User createUser(String screenName) {
+        CountedEntities countedEntities = countedEntitiesService.countAll();
+        String msg = "createUser for screenName="+screenName;
+        Task task = taskService.create(msg, TaskType.CONTROLLER_CREATE_TESTDATA_USERS,countedEntities);
+        log.info("-----------------------------------------");
+        try {
+            log.info("screenName = "+ screenName);
+            User user = userService.findByScreenName(screenName);
+            log.info("userService.findByScreenName: found User = "+user.toString());
+            log.info("model.addAttribute user = "+user.toString());
+            return user;
+        } catch (EmptyResultDataAccessException e){
+            log.info("EmptyResultDataAccessException at userService.findByScreenName for screenName="+screenName);
+            TwitterProfile twitterProfile = twitterApiService.getUserProfileForScreenName(screenName);
+            log.info("twitterApiService.getUserProfileForScreenName: found TwitterProfile = "+twitterProfile.toString());
+            try {
+                log.info("try: persistDataFromTwitter.storeUserProfile for twitterProfile = "+twitterProfile.toString());
+                User user = storeUserProfile.storeUserProfile(twitterProfile,task);
+                log.info("persistDataFromTwitter.storeUserProfile: stored User = "+user.toString());
+                log.info("model.addAttribute user = "+user.toString());
+                return user;
+            } catch (EmptyResultDataAccessException ex){
+                log.warn("persistDataFromTwitter.storeUserProfile raised EmptyResultDataAccessException: "+ex.getMessage());
+                User user = getDummyUser(task);
+                log.info("model.addAttribute user = "+user.toString());
+                return user;
+            } catch (NoResultException exe) {
+                log.warn("persistDataFromTwitter.storeUserProfile raised NoResultException: "+exe.getMessage());
+                User user = getDummyUser(task);
+                log.info("model.addAttribute user = "+user.toString());
+                return user;
+            }
+        }  finally {
+            countedEntities = countedEntitiesService.countAll();
+            taskService.done(task,countedEntities);
+            log.info("... finally done ...");
+            log.info("-----------------------------------------");
+        }
+    }
+
+    private User getDummyUser(Task task){
+        long idTwitter=0L;
+        String screenName = frontendProperties.getImprintScreenName();
+        String name="Exception Handler Dummy Username";
+        String url="https://github.com/phasenraum2010/twitterwall2";
+        String profileImageUrl="https://avatars2.githubusercontent.com/u/303766?v=3&s=460";
+        String description="Exception Handler Dummy Description with some #HashTag an URL like https://thomas-woehlke.blogspot.de/ and an @Mention.";
+        String location="Berlin, Germany";
+        Date createdDate = new Date();
+        User user = new User(task,null,idTwitter,screenName, name, url, profileImageUrl, description, location, createdDate);
+        return user;
+    }
+
     private final TwitterApiService twitterApiService;
 
     private final StoreOneTweet storeOneTweet;
diff --git a/src/test/java/org/woehlke/twitterwall/oodm/service/MentionServiceTest.java b/src/test/java/org/woehlke/twitterwall/oodm/service/MentionServiceTest.java
@@ -101,16 +101,17 @@ public void getAllWithoutPersistentUser() throws Exception {
     public void findByIdTwitter() throws Exception {
         String msg = "findByIdTwitter: ";
         int page=1;
-        int size=1;
+        int size=20;
         Pageable pageRequest = new PageRequest(page,size);
         Page<Mention> myPage = mentionService.getAll(pageRequest);
         Assert.assertTrue(msg,myPage.getTotalElements()>0);
-        if(myPage.getTotalElements()>0) {
-            Mention myMention = myPage.getContent().iterator().next();
+        for(Mention myMention:myPage.getContent()){
             long idTwitter = myMention.getIdTwitter();
-            Mention myFoundMention = mentionService.findByIdTwitter(idTwitter);
-            Assert.assertNotNull(myFoundMention);
-            Assert.assertEquals(msg,idTwitter,myFoundMention.getIdTwitter().longValue());
+            if(idTwitter > 0L) {
+                Mention myFoundMention = mentionService.findByIdTwitter(idTwitter);
+                Assert.assertNotNull(myFoundMention);
+                Assert.assertEquals(msg, idTwitter, myFoundMention.getIdTwitter().longValue());
+            }
         }
     }
 
diff --git a/src/test/java/org/woehlke/twitterwall/test/TestDataHelper.java b/src/test/java/org/woehlke/twitterwall/test/TestDataHelper.java
@@ -6,6 +6,7 @@
 @Deprecated
 public interface TestDataHelper {
 
+    /*
     @Deprecated
     String PROFILE_URLS[] = {
             "http://t.co/hIxL9WeoP1",
@@ -67,4 +68,5 @@ public interface TestDataHelper {
             "https://t.co/hMMJBGFFKR",
             "https://t.co/cbsEBiSW2E",
     };
+    */
 }
diff --git a/src/test/java/org/woehlke/twitterwall/test/UrlServiceTestHelper.java b/src/test/java/org/woehlke/twitterwall/test/UrlServiceTestHelper.java
@@ -11,6 +11,8 @@
 @Deprecated
 public interface UrlServiceTestHelper {
 
+    /*
     @Deprecated
     List<Url> getTestData(Task task);
+    */
 }
diff --git a/src/test/java/org/woehlke/twitterwall/test/UrlServiceTestImpl.java b/src/test/java/org/woehlke/twitterwall/test/UrlServiceTestImpl.java
@@ -1,6 +1,7 @@
 package org.woehlke.twitterwall.test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,13 +15,15 @@
  * Created by tw on 01.07.17.
  */
 @Deprecated
-@Service
+@Component
+//@Service
 //@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UrlServiceTestImpl implements UrlServiceTestHelper {
 
     //@Autowired
     //private BackendProperties backendProperties;
 
+    /*
     @Override
     //@Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
     public List<Url> getTestData(Task task) {
@@ -46,6 +49,7 @@ public List<Url> getTestData(Task task) {
         }
         return testData;
     }
+    */
 
     //TODO: #198 https://github.com/phasenraum2010/twitterwall2/issues/198
     //private static Map<String, String> hosts = new HashMap<>();
diff --git a/src/test/java/org/woehlke/twitterwall/test/UserServiceTestHelper.java b/src/test/java/org/woehlke/twitterwall/test/UserServiceTestHelper.java
@@ -8,9 +8,11 @@
 @Deprecated
 public interface UserServiceTestHelper {
 
+    /*
     @Deprecated
     User createImprintUser();
 
     @Deprecated
     User createUser(String username);
+    */
 }
diff --git a/src/test/java/org/woehlke/twitterwall/test/UserServiceTestHelperImpl.java b/src/test/java/org/woehlke/twitterwall/test/UserServiceTestHelperImpl.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.social.twitter.api.TwitterProfile;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,12 +27,14 @@
  * Created by tw on 01.07.17.
  */
 @Deprecated
-@Service
+@Component
+//@Service
 //@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
 public class UserServiceTestHelperImpl implements UserServiceTestHelper {
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceTestHelperImpl.class);
 
+    /*
     @Autowired
     private UserService userService;
 
@@ -49,7 +52,9 @@ public class UserServiceTestHelperImpl implements UserServiceTestHelper {
 
     @Autowired
     private CountedEntitiesService countedEntitiesService;
+    */
 
+    /*
     @Override
     public User createImprintUser(){
         return createUser(frontendProperties.getImprintScreenName());
@@ -108,5 +113,5 @@ private User getDummyUser(Task task){
         User user = new User(task,null,idTwitter,screenName, name, url, profileImageUrl, description, location, createdDate);
         return user;
     }
-
+*/
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`@Deprecated`
`12`	`12`	`public interface UrlServiceTestHelper {`
`13`	`13`
	`14`	`+ /*`
`14`	`15`	`@Deprecated`
`15`	`16`	`List<Url> getTestData(Task task);`
	`17`	`+ */`
`16`	`18`	`}`