Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ build/
/data/**

.DS_Store
/logs/
23 changes: 20 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand All @@ -56,6 +61,18 @@
<version>1.0.0-rc1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>


</dependencies>

Expand Down
4 changes: 0 additions & 4 deletions src/main/java/hub/event/adminapi/AdminController.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package hub.event.adminapi;

import hub.event.auth.AuthService;
import hub.event.users.UserService;
import hub.event.statistics.StatsService;

class AdminController {


Expand Down
3 changes: 0 additions & 3 deletions src/main/java/hub/event/newsletter/NewsLetterService.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
package hub.event.newsletter;

import hub.event.mailmodule.MailService;
import hub.event.events.EventService;

public class NewsLetterService {
}
7 changes: 0 additions & 7 deletions src/main/java/hub/event/scrapers/ScrapersService.java

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/hub/event/scrapers/Scrappable.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package hub.event.scrapers.core;

import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Objects;

@Entity(name = "scraper_scraped_event_maker")
class EntityLastScrapedEventMarker implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer markerId;
@Column(nullable = false)
private Instant runTime;
private String eventTitle;
@Column(nullable = false)
private String marker;
@Column(nullable = false)
private Boolean isComplete;
@Column(nullable = false)
private Integer scraperId;

EntityLastScrapedEventMarker() {
}

Integer getMarkerId() {
return markerId;
}

void setMarkerId(Integer markerId) {
this.markerId = markerId;
}

Instant getRunTime() {
return runTime;
}

void setRunTime(Instant runTime) {
this.runTime = runTime;
}

String getEventTitle() {
return eventTitle;
}

void setEventTitle(String eventTitle) {
this.eventTitle = eventTitle;
}

String getMarker() {
return marker;
}

void setMarker(String marker) {
this.marker = marker;
}

Boolean getComplete() {
return isComplete;
}

void setComplete(Boolean complete) {
isComplete = complete;
}

Integer getScraperId() {
return scraperId;
}

void setScraperId(Integer scraperId) {
this.scraperId = scraperId;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
EntityLastScrapedEventMarker that = (EntityLastScrapedEventMarker) o;
return Objects.equals(markerId, that.markerId) && Objects.equals(runTime, that.runTime) && Objects.equals(eventTitle, that.eventTitle) && Objects.equals(marker, that.marker) && Objects.equals(isComplete, that.isComplete) && Objects.equals(scraperId, that.scraperId);
}

@Override
public int hashCode() {
return Objects.hash(markerId, runTime, eventTitle, marker, isComplete, scraperId);
}
}
72 changes: 72 additions & 0 deletions src/main/java/hub/event/scrapers/core/EntityScraperConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package hub.event.scrapers.core;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Objects;

@Entity(name = "scraper_config")
class EntityScraperConfig implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer scraperId;
@Column(unique = true)
private String configurationName;
@Column(nullable = false)
private String timeZone;
@Column(nullable = false)
private boolean isActive;

EntityScraperConfig() {
}

EntityScraperConfig(String configurationName, String timeZone, boolean isActive) {
this.configurationName = configurationName;
this.timeZone = timeZone;
this.isActive = isActive;
}

Integer getScraperId() {
return scraperId;
}

void setScraperId(Integer scraperId) {
this.scraperId = scraperId;
}

String getConfigurationName() {
return configurationName;
}

void setConfigurationName(String configurationName) {
this.configurationName = configurationName;
}

String getTimeZone() {
return timeZone;
}

void setTimeZone(String timeZone) {
this.timeZone = timeZone;
}

boolean isActive() {
return isActive;
}

void setActive(boolean active) {
isActive = active;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
EntityScraperConfig that = (EntityScraperConfig) o;
return isActive == that.isActive && Objects.equals(scraperId, that.scraperId) && Objects.equals(configurationName, that.configurationName) && Objects.equals(timeZone, that.timeZone);
}

@Override
public int hashCode() {
return Objects.hash(scraperId, configurationName, timeZone, isActive);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package hub.event.scrapers.core;

import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.Objects;

@Entity(name = "scraperErrorLog")
class EntityScraperRunErrorLog implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer logId;

@Column(nullable = false, name = "error_time")
private Instant time;

@Column(nullable = false)
private String errorCode;
private String description;
@Column(nullable = false)
private Integer scraperId;

EntityScraperRunErrorLog() {
}

EntityScraperRunErrorLog(Integer scraperId, Instant time, String errorCode, String description) {
this.scraperId = scraperId;
this.time = time;
this.errorCode = errorCode;
this.description = description;
}

Integer getLogId() {
return logId;
}

void setLogId(Integer logId) {
this.logId = logId;
}

Instant getTime() {
return time;
}

void setTime(Instant time) {
this.time = time;
}

String getErrorCode() {
return errorCode;
}

void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}

String getDescription() {
return description;
}

void setDescription(String description) {
this.description = description;
}

Integer getScraperId() {
return scraperId;
}

void setScraperId(Integer scraperId) {
this.scraperId = scraperId;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
EntityScraperRunErrorLog that = (EntityScraperRunErrorLog) o;
return Objects.equals(logId, that.logId) && Objects.equals(time, that.time) && Objects.equals(errorCode, that.errorCode) && Objects.equals(description, that.description) && Objects.equals(scraperId, that.scraperId);
}

@Override
public int hashCode() {
return Objects.hash(logId, time, errorCode, description, scraperId);
}
}
Loading