Changed LocalDate to LocalDateTime for better sorting

olegshan · olegshan · commit 549d79c72f87 · 2016-10-17T20:15:28.000+03:00
diff --git a/src/main/java/com/olegshan/entity/Job.java b/src/main/java/com/olegshan/entity/Job.java
@@ -3,7 +3,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -15,18 +15,18 @@ public class Job {
     @Id
     private String url;
     private String title;
-//    @Column(length = Integer.MAX_VALUE)
+    //  Max value for PostgreSQL
     @Column(length = 10485760)
     private String description;
     private String company;
     private String source;
-    private LocalDate date;
+    private LocalDateTime date;
     private String dateToDisplay;
 
     public Job() {
     }
 
-    public Job(String title, String description, String company, String source, String url, LocalDate date) {
+    public Job(String title, String description, String company, String source, String url, LocalDateTime date) {
         this.title = title;
         this.description = description;
         this.company = company;
@@ -75,11 +75,11 @@ public void setUrl(String url) {
         this.url = url;
     }
 
-    public LocalDate getDate() {
+    public LocalDateTime getDate() {
         return date;
     }
 
-    public void setDate(LocalDate date) {
+    public void setDate(LocalDateTime date) {
         this.date = date;
     }
 
diff --git a/src/main/java/com/olegshan/parser/Parser.java b/src/main/java/com/olegshan/parser/Parser.java
@@ -15,6 +15,8 @@
 
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 /**
  * Created by olegshan on 03.10.2016.
@@ -55,7 +57,7 @@ public void parse(JobService jobService,
             String title = titleBlock.text();
             String description = job.getElementsByAttributeValue(descriptionData[0], descriptionData[1]).text();
             String company = getCompany(jobService, job, url, companyData);
-            LocalDate date = getDate(jobService, url, dateData, titleBlock, job);
+            LocalDateTime date = getDate(jobService, url, dateData, titleBlock, job);
 
             Job parsedJob = new Job(title, description, company, siteName, url, date);
             jobRepository.save(parsedJob);
@@ -111,8 +113,8 @@ private Elements getTitleBlock(JobService jobService, Element job, String[] titl
         return titleBlock;
     }
 
-    private LocalDate getDate(JobService jobService, String url, String[] dateData, Elements titleBlock, Element job) {
-        LocalDate date;
+    private LocalDateTime getDate(JobService jobService, String url, String[] dateData, Elements titleBlock, Element job) {
+        LocalDateTime date;
         String dateLine;
         if (jobService instanceof DouService) {
             Document dateDoc = getDoc(url);
@@ -131,7 +133,7 @@ private LocalDate getDate(JobService jobService, String url, String[] dateData,
         return date;
     }
 
-    private LocalDate getDateByLine(JobService jobService, String dateLine) {
+    private LocalDateTime getDateByLine(JobService jobService, String dateLine) {
         String[] dateParts;
         int year;
         int month;
@@ -155,10 +157,10 @@ private LocalDate getDateByLine(JobService jobService, String dateLine) {
         if (jobService instanceof DouService || jobService instanceof HeadHunterService) {
             month = MonthsTools.MONTHS.get(dateParts[1].toLowerCase());
         } else month = Integer.parseInt(dateParts[1]);
-        return LocalDate.of(year, month, day);
+        return LocalDate.of(year, month, day).atTime(LocalTime.now());
     }
 
-    private LocalDate getDateForRabotaUa(String url) {
+    private LocalDateTime getDateForRabotaUa(String url) {
         /*
         * There are several problems here.
         * First: there are two types of date tags, used on the site on different pages: "d-date" and "datePosted".
@@ -181,7 +183,7 @@ private LocalDate getDateForRabotaUa(String url) {
             dateLine = dateDoc.getElementsByAttributeValue("itemprop", "datePosted").text();
             if (dateLine.length() == 0) {
                 //no date at all, sometimes it happens
-                return LocalDate.now();
+                return LocalDateTime.now();
             }
         }
         try {
@@ -199,7 +201,7 @@ private LocalDate getDateForRabotaUa(String url) {
             month = Integer.parseInt(dateParts[1]);
             day = Integer.parseInt(dateParts[2]);
         }
-        return LocalDate.of(year, month, day);
+        return LocalDate.of(year, month, day).atTime(LocalTime.now());
     }
 
     private String getCompany(JobService jobService, Element job, String url, String[] companyData) {
