поиск презентации

pom.xml

@@ -42,6 +42,10 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin.external.google</groupId>
+					<artifactId>android-json</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.junit.vintage</groupId>
 					<artifactId>junit-vintage-engine</artifactId>
@@ -59,6 +63,13 @@
 			<artifactId>telegrambotsextensions</artifactId>
 			<version>4.6</version>
 		</dependency>
+
+
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20170516</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/ru/javacourse/sourcecodebot/config/TelegramConfig.java

@@ -9,6 +9,7 @@
 import ru.javacourse.sourcecodebot.telegram.ServiceBot;
 import ru.javacourse.sourcecodebot.telegram.handlers.HelpHandler;
 import ru.javacourse.sourcecodebot.telegram.handlers.InterviewHandler;
+import ru.javacourse.sourcecodebot.telegram.handlers.LessonHandler;
 
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
@@ -37,6 +38,8 @@ public ServiceBot createCommonBot() {
         Map<String, MessageHandler> handlers = new HashMap<>();
         handlers.put("/help", helpHandler());
         handlers.put("/java/interview/random", interviewHandler());
+        handlers.put("/java/lesson/", lessonHandler());
+
 
         return new ServiceBot(handlers);
     }
@@ -50,5 +53,10 @@ public HelpHandler helpHandler() {
     public InterviewHandler interviewHandler() {
         return new InterviewHandler();
     }
+
+    @Bean
+    public LessonHandler lessonHandler() {
+        return new LessonHandler();
+    }
 }
 

src/main/java/ru/javacourse/sourcecodebot/model/Lesson.java

@@ -18,11 +18,15 @@ public class Lesson {
     @Column(name = "chapter")
     private String chapter;
 
+    @Column(name = "chapter_id")
+    private String chapterId;
+
     @OneToMany(mappedBy = "lesson")
     @LazyCollection(LazyCollectionOption.FALSE)
     private List<LessonTask> lessonTasks;
 
     @OneToOne
+    @JoinColumn(name="resource_id")
     private Resource resources;
 
     public Integer getLessonId() {
@@ -41,11 +45,23 @@ public void setChapter(String chapter) {
         this.chapter = chapter;
     }
 
+    public String getChapter_id() { return chapterId; }
+
+    public Resource getResources() {
+        return resources;
+    }
+
+    public void setResources(Resource resources) {
+        this.resources = resources;
+    }
+
+    public void setChapter_id(String chapter_id) { this.chapterId = chapter_id; }
     @Override
     public String toString() {
         return "Lesson{" +
                 "lessonId=" + lessonId +
                 ", chapter='" + chapter + '\'' +
+                ", chapter_id='" + chapterId +
                 '}';
     }
 

src/main/java/ru/javacourse/sourcecodebot/model/LessonTask.java

@@ -11,17 +11,23 @@ public class LessonTask {
     @Column(name = "lt_id")
     private Integer ltId;
 
-
     @ManyToOne
     @JoinColumn(name = "lesson_id")
     private Lesson lesson;
 
     @Column(name = "title")
     private String title;
 
+    @Column(name = "link")
+    private String link;
+
     @Column(name = "description")
     private String description;
 
+    public String getLink() { return link; }
+
+    public void setLink(String link) { this.link = link; }
+
     public Integer getLtId() {
         return ltId;
     }

src/main/java/ru/javacourse/sourcecodebot/repository/LessonRepository.java

@@ -4,4 +4,7 @@
 import ru.javacourse.sourcecodebot.model.Lesson;
 
 public interface LessonRepository extends JpaRepository<Lesson, Integer> {
+
+    public Lesson findLessonByChapterId(String chapterId);
+
 }

src/main/java/ru/javacourse/sourcecodebot/telegram/handlers/InterviewHandler.java

@@ -24,7 +24,6 @@ public SendMessage handle(Update update) {
         msg.setChatId(update.getMessage().getChatId());
         msg.setText(question.getTitle());
 
-
         return msg;
     }
 }

src/main/java/ru/javacourse/sourcecodebot/telegram/handlers/LessonHandler.java

@@ -0,0 +1,32 @@
+package ru.javacourse.sourcecodebot.telegram.handlers;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.javacourse.sourcecodebot.model.Lesson;
+import ru.javacourse.sourcecodebot.model.Resource;
+import ru.javacourse.sourcecodebot.repository.LessonRepository;
+import ru.javacourse.sourcecodebot.telegram.MessageHandler;
+
+public class LessonHandler implements MessageHandler {
+
+    @Autowired
+    private LessonRepository repository;
+
+    @Override
+    public SendMessage handle(Update update) {
+        Lesson lesson = repository.findLessonByChapterId("2.1");
+        Resource resource = lesson.getResources();
+
+        SendMessage msg = new SendMessage();
+        msg.enableMarkdown(true);
+        msg.setChatId(update.getMessage().getChatId());
+
+        if (resource != null) {
+            msg.setText(resource.getLink());
+        } else {
+            msg.setText("123");
+        }
+        return  msg;
+    }
+}

src/test/java/ru/javacourse/sourcecodebot/repository/LessonRepositoryTest.java

@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import ru.javacourse.sourcecodebot.model.Lesson;
+import ru.javacourse.sourcecodebot.model.Resource;
 
 import java.util.List;
 
@@ -19,4 +20,11 @@ public void testFind() {
         List<Lesson> lessons = repository.findAll();
         Assertions.assertNotEquals(0, lessons.size());
     }
+
+    @Test
+    public void testFindByChapter() {
+        Lesson lesson = repository.findLessonByChapterId("2.1");
+        Resource resources = lesson.getResources();
+        Assertions.assertNotNull(lesson);
+    }
 }

src/test/java/ru/javacourse/sourcecodebot/repository/ResourceRepositoryTest.java

@@ -15,7 +15,7 @@ public class ResourceRepositoryTest {
     private ResourceRepository repository;
 
     @Test
-    public void testFind() {
+    public void testFindAll() {
         List<Resource> resources = repository.findAll();
         Assertions.assertNotEquals(0, resources.size());
     }