Merge pull request #376 from khoa-nd/master

Merged

src/main/java/com/techlooper/config/CoreConfiguration.java

@@ -93,8 +93,6 @@ public class CoreConfiguration implements ApplicationContextAware {
 
   @Value("classpath:google-auth/techLooper.p12")
   private org.springframework.core.io.Resource googleApiAuthResource;
-//  @Value("classpath:google-auth")
-//  private org.springframework.core.io.Resource googleApiAuthResource;
 
   private ApplicationContext applicationContext;
 
@@ -392,13 +390,18 @@ public JsonNode vietnamworksConfiguration() throws IOException {
 
   @Bean
   @DependsOn("jsonConfigRepository")
+  public SocialConfig googleSocialConfig() {
+    return applicationContext.getBean(JsonConfigRepository.class).getSocialConfig().stream()
+      .filter(socialConfig -> socialConfig.getProvider() == SocialProvider.GOOGLE)
+      .findFirst().get();
+  }
+
+  @Bean
   public Calendar googleCalendar() throws GeneralSecurityException, IOException {
     JacksonFactory jsonFactory = JacksonFactory.getDefaultInstance();
     HttpTransport transport = GoogleNetHttpTransport.newTrustedTransport();
 
-    SocialConfig googleConfig = applicationContext.getBean(JsonConfigRepository.class).getSocialConfig().stream()
-      .filter(socialConfig -> socialConfig.getProvider() == SocialProvider.GOOGLE)
-      .findFirst().get();
+    SocialConfig googleConfig = googleSocialConfig();
 
 //    GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(transport, jsonFactory,
 //      googleConfig.getApiKey(), googleConfig.getSecretKey(),
@@ -417,45 +420,11 @@ public Calendar googleCalendar() throws GeneralSecurityException, IOException {
       .setServiceAccountId(googleConfig.getServiceAccountEmail())
       .setServiceAccountPrivateKeyFromP12File(googleApiAuthResource.getFile())
       .setServiceAccountScopes(Collections.singleton(CalendarScopes.CALENDAR))
-      .setServiceAccountUser("[email protected]")
+      .setServiceAccountUser(googleConfig.getCalendarOwner())
       .build();
 
-//    boolean bool = credential.refreshToken();
-//    String token = credential.getAccessToken();
-//    System.out.println(bool);
-//    System.out.println(token);
-
     return new Calendar.Builder(transport, jsonFactory, credential)
       .setApplicationName("Techlooper").build();
-
-//    Event event = new Event()
-//      .setSummary("Google I/O 2015")
-//      .setLocation("800 Howard St., San Francisco, CA 94103")
-//      .setDescription("A chance to hear more about Google's developer products.");
-//
-//    DateTime startDateTime = new DateTime("2015-09-28T09:00:00-07:00");
-//    EventDateTime start = new EventDateTime()
-//      .setDateTime(startDateTime)
-//      .setTimeZone("America/Los_Angeles");
-//    event.setStart(start);
-//
-//    DateTime endDateTime = new DateTime("2015-09-28T17:00:00-07:00");
-//    EventDateTime end = new EventDateTime()
-//      .setDateTime(endDateTime)
-//      .setTimeZone("America/Los_Angeles");
-//    event.setEnd(end);
-//
-//    EventAttendee[] attendees = new EventAttendee[]{
-//      new EventAttendee().setEmail("[email protected]"),
-//      new EventAttendee().setEmail("[email protected]"),
-//    };
-//    event.setAttendees(Arrays.asList(attendees));
-//
-//    String calendarId = "[email protected]";
-//    event = calendar.events().insert(calendarId, event).setSendNotifications(true).execute();
-//    System.out.printf("Event created: %s\n", event.getHtmlLink());
-//    event.getHangoutLink()
-//    return calendar;
   }
 
   public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {

src/main/java/com/techlooper/config/web/sec/SwitchingAuthenticationProvider.java

@@ -25,7 +25,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
       }
     }
     catch (Exception ex) {
-      LOGGER.debug(ex.getMessage(), ex);
+      LOGGER.debug(ex.getMessage());
     }
 
     return providers.get(SocialProvider.VIETNAMWORKS).authenticate(authentication);

src/main/java/com/techlooper/controller/JobListingController.java

@@ -1,9 +1,10 @@
 package com.techlooper.controller;
 
-import com.techlooper.model.JobListingCriteria;
-import com.techlooper.model.JobListingModel;
-import com.techlooper.model.JobResponse;
+import com.techlooper.model.*;
 import com.techlooper.service.JobAlertService;
+import com.techlooper.service.JobSearchService;
+import com.techlooper.service.ScrapeJobService;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,9 +19,17 @@
 @Controller
 public class JobListingController {
 
+    private final static String JOB_CATEGORY_IT = "35,55,57";
+
     @Resource
     private JobAlertService jobAlertService;
 
+    @Resource
+    private ScrapeJobService scrapeJobService;
+
+    @Resource
+    private JobSearchService vietnamWorksJobSearchService;
+
     @ResponseBody
     @RequestMapping(value = "/jobListing", method = RequestMethod.POST)
     public JobListingModel list(@RequestBody JobListingCriteria criteria) throws Exception {
@@ -37,4 +46,38 @@ public JobListingModel list(@RequestBody JobListingCriteria criteria) throws Exc
         return jobListing;
     }
 
+    @Scheduled(cron = "${scheduled.cron.indexVietnamworksJob}")
+    public void indexJobFromVietnamworks() throws Exception {
+        VNWJobSearchRequest vnwJobSearchRequest = getTopPriorityJobSearchRequest();
+        VNWJobSearchResponse vnwJobSearchResponse = vietnamWorksJobSearchService.searchJob(vnwJobSearchRequest);
+        if (vnwJobSearchResponse.hasData()) {
+            scrapeJobService.save(vnwJobSearchResponse.getData().getJobs(), Boolean.TRUE);
+        }
+
+        vnwJobSearchRequest = getNormalJobSearchRequest();
+        vnwJobSearchResponse = vietnamWorksJobSearchService.searchJob(vnwJobSearchRequest);
+        if (vnwJobSearchResponse.hasData()) {
+            scrapeJobService.save(vnwJobSearchResponse.getData().getJobs(), Boolean.FALSE);
+        }
+
+    }
+
+    private VNWJobSearchRequest getTopPriorityJobSearchRequest() {
+        VNWJobSearchRequest vnwJobSearchRequest = new VNWJobSearchRequest();
+        vnwJobSearchRequest.setJobCategories(JOB_CATEGORY_IT);
+        vnwJobSearchRequest.setTechlooperJobType(1);
+        vnwJobSearchRequest.setPageNumber(1);
+        vnwJobSearchRequest.setPageSize(20);
+        return vnwJobSearchRequest;
+    }
+
+    private VNWJobSearchRequest getNormalJobSearchRequest() {
+        VNWJobSearchRequest vnwJobSearchRequest = new VNWJobSearchRequest();
+        vnwJobSearchRequest.setJobCategories(JOB_CATEGORY_IT);
+        vnwJobSearchRequest.setTechlooperJobType(2);
+        vnwJobSearchRequest.setPageNumber(1);
+        vnwJobSearchRequest.setPageSize(20);
+        return vnwJobSearchRequest;
+    }
+
 }

src/main/java/com/techlooper/controller/UserController.java

@@ -317,7 +317,7 @@ public WebinarInfoDto findWebinarById(@PathVariable Long id) {
   }
 
   @RequestMapping(value = "user/webinar/join", method = RequestMethod.POST)
-  public WebinarInfoDto joinWebinar(@RequestBody JoinBySocialDto joinBySocialDto) {
+  public WebinarInfoDto joinWebinar(@RequestBody JoinBySocialDto joinBySocialDto) throws IOException {
     return webinarService.joinWebinar(joinBySocialDto);
   }
 }

src/main/java/com/techlooper/entity/CalendarInfo.java

@@ -0,0 +1,39 @@
+package com.techlooper.entity;
+
+import java.io.Serializable;
+
+/**
+ * Created by phuonghqh on 8/27/15.
+ */
+public class CalendarInfo implements Serializable {
+
+  private String id;
+
+  private String htmlLink;
+
+  private String hangoutLink;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public String getHtmlLink() {
+    return htmlLink;
+  }
+
+  public void setHtmlLink(String htmlLink) {
+    this.htmlLink = htmlLink;
+  }
+
+  public String getHangoutLink() {
+    return hangoutLink;
+  }
+
+  public void setHangoutLink(String hangoutLink) {
+    this.hangoutLink = hangoutLink;
+  }
+}

src/main/java/com/techlooper/entity/ScrapeJobEntity.java

@@ -6,12 +6,18 @@
 
 import java.util.List;
 
+import static org.springframework.data.elasticsearch.annotations.FieldType.Boolean;
+import static org.springframework.data.elasticsearch.annotations.FieldType.Long;
 import static org.springframework.data.elasticsearch.annotations.FieldType.*;
+import static org.springframework.data.elasticsearch.annotations.FieldType.String;
 
 @Document(indexName = "techlooper", type = "job")
 public class ScrapeJobEntity {
 
     @Id
+    private String jobId;
+
+    @Field(type = String, index = FieldIndex.not_analyzed)
     private String jobTitleUrl;
 
     @Field(type = String)
@@ -50,6 +56,14 @@ public class ScrapeJobEntity {
     @Field(type = Nested)
     private List<JobSkill> skills;
 
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
     public String getJobTitleUrl() {
         return jobTitleUrl;
     }

src/main/java/com/techlooper/entity/WebinarEntity.java

@@ -6,6 +6,7 @@
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.Set;
 
 /**
  * Created by phuonghqh on 8/18/15.
@@ -29,23 +30,37 @@ public class WebinarEntity {
   private String description;
 
   @Field(type = FieldType.Nested)
-  private Collection<UserProfileDto> attendees;
+  private Set<UserProfileDto> attendees;
 
   @Field(type = FieldType.Nested)
   private UserProfileDto organiser;
 
   @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
   private String where = "Google Hangout";
 
-  @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
-  private String calendarUrl;
+  @Field(type = FieldType.Nested)
+  private CalendarInfo calendarInfo;
 
-  @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
-  private String hangoutLink;
+//  @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
+//  private String calendarUrl;
+//
+//  @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
+//  private String hangoutLink;
+//
+//  @Field(type = FieldType.String, index = FieldIndex.not_analyzed)
+//  private String eventId;
 
   @Field(type = FieldType.String)
   private String whatEvent;
 
+  public CalendarInfo getCalendarInfo() {
+    return calendarInfo;
+  }
+
+  public void setCalendarInfo(CalendarInfo calendarInfo) {
+    this.calendarInfo = calendarInfo;
+  }
+
   public Long getCreatedDateTime() {
     return createdDateTime;
   }
@@ -86,11 +101,11 @@ public void setDescription(String description) {
     this.description = description;
   }
 
-  public Collection<UserProfileDto> getAttendees() {
+  public Set<UserProfileDto> getAttendees() {
     return attendees;
   }
 
-  public void setAttendees(Collection<UserProfileDto> attendees) {
+  public void setAttendees(Set<UserProfileDto> attendees) {
     this.attendees = attendees;
   }
 
@@ -110,22 +125,6 @@ public void setWhere(String where) {
     this.where = where;
   }
 
-  public String getCalendarUrl() {
-    return calendarUrl;
-  }
-
-  public void setCalendarUrl(String calendarUrl) {
-    this.calendarUrl = calendarUrl;
-  }
-
-  public String getHangoutLink() {
-    return hangoutLink;
-  }
-
-  public void setHangoutLink(String hangoutLink) {
-    this.hangoutLink = hangoutLink;
-  }
-
   public String getWhatEvent() {
     return whatEvent;
   }

src/main/java/com/techlooper/model/SocialConfig.java

@@ -22,6 +22,26 @@ public class SocialConfig {
 
   private String serviceAccountEmail;
 
+  private String calendarId;
+
+  private String calendarOwner;
+
+  public String getCalendarOwner() {
+    return calendarOwner;
+  }
+
+  public void setCalendarOwner(String calendarOwner) {
+    this.calendarOwner = calendarOwner;
+  }
+
+  public String getCalendarId() {
+    return calendarId;
+  }
+
+  public void setCalendarId(String calendarId) {
+    this.calendarId = calendarId;
+  }
+
   public String getServiceAccountEmail() {
     return serviceAccountEmail;
   }

src/main/java/com/techlooper/model/UserProfileDto.java

@@ -2,10 +2,12 @@
 
 import com.techlooper.entity.vnw.RoleName;
 
+import java.io.Serializable;
+
 /**
  * Created by NguyenDangKhoa on 7/30/15.
  */
-public class UserProfileDto {
+public class UserProfileDto implements Serializable {
 
   private String username;
 

src/main/java/com/techlooper/model/VNWJobSearchResponseDataItem.java

@@ -15,6 +15,9 @@ public class VNWJobSearchResponseDataItem {
 
     public static final String JOB_LEVEL = "top_level";
 
+    @JsonProperty(value = "job_id")
+    private Long jobId;
+
     @JsonProperty(value = "job_detail_url")
     private String url;
 
@@ -51,6 +54,14 @@ public class VNWJobSearchResponseDataItem {
     @JsonProperty(value = "skills")
     private List<JobSkill> skills;
 
+    public Long getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(Long jobId) {
+        this.jobId = jobId;
+    }
+
     public String getUrl() {
         return url;
     }