Compare commits

..

8 Commits

Author SHA1 Message Date
57ab9b3e01 [07.12.20] Brought back graphql queries 2020-12-07 20:04:34 +00:00
487eb48322 Revert "[07.12.20] Updating dependencies"
This reverts commit a78cdb24
2020-12-07 19:34:45 +00:00
8955933a47 Revert "[07.12.20] Updating dependencies"
This reverts commit 0626395b
2020-12-07 19:34:37 +00:00
0626395b9f [07.12.20] Updating dependencies 2020-12-07 19:26:55 +00:00
a78cdb24fd [07.12.20] Updating dependencies 2020-12-07 19:14:19 +00:00
1b1bde8c76 [15.10.20] Logging changes 2020-10-15 20:33:57 +01:00
ddb5012b95 [11.10.20] Removed graphql deletion 2020-10-11 15:17:40 +01:00
80843da00e [11.10.20] Sentiment process service and lowered CPU limit 2020-10-11 14:53:05 +01:00
8 changed files with 49 additions and 104 deletions

38
pom.xml
View File

@ -48,23 +48,6 @@
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<!-- GraghQL -->
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-spring-boot-starter</artifactId>
<version>5.0.2</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-tools</artifactId>
<version>5.2.4</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphiql-spring-boot-starter</artifactId>
<version>5.0.2</version>
</dependency>
<!-- Local database -->
<dependency>
<groupId>com.h2database</groupId>
@ -84,6 +67,23 @@
<version>4.3.8.Final</version>
</dependency>
<!-- GraghQL -->
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-spring-boot-starter</artifactId>
<version>5.0.2</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-tools</artifactId>
<version>5.2.4</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphiql-spring-boot-starter</artifactId>
<version>5.0.2</version>
</dependency>
<!-- Artemis -->
<dependency>
<groupId>org.springframework.boot</groupId>
@ -98,6 +98,10 @@
<version>1.18.8</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!--- Logging -->
<dependency>

View File

@ -78,7 +78,7 @@ public class PriceConsumer {
JsonNode messageJson = objectMapper.readTree(message.getText());
cryptoPriceModel = objectMapper.readValue(messageJson.traverse(), CryptoPriceModel.class);
logger.info("Message with syncId of [{}] is for customer [{}]", syncId, cryptoPriceModel);
logger.info("Message with syncId of [{}] is for [{}]", syncId, cryptoPriceModel);
priceService.createRecord(cryptoPriceModel, correlationId, message);

View File

@ -77,7 +77,7 @@ public class TweetConsumer {
JsonNode messageJson = objectMapper.readTree(message.getText());
sentimentModel = objectMapper.readValue(messageJson.traverse(), SentimentModel.class);
logger.info("Message with syncId of [{}] is for customer [{}]", syncId, sentimentModel);
logger.info("Message with syncId of [{}] is for [{}]", syncId, sentimentModel);
sentimentService.createRecord(sentimentModel, correlationId, message);

View File

@ -1,26 +0,0 @@
package cryptosky.me.pricing.graphql.mutations;
import com.coxautodev.graphql.tools.GraphQLMutationResolver;
import cryptosky.me.pricing.models.entities.BtcPriceModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import cryptosky.me.pricing.service.PriceService;
@Component
public class BtcPriceMutation implements GraphQLMutationResolver {
@Autowired
private PriceService priceService;
public BtcPriceModel createBtc(final String createdDate, final String type,
final float av_price,
final float h_price,
final float l_price,
final float o_price,
final float c_price,
final float volume ) {
return this.priceService.createBtc(createdDate, type, av_price, h_price, l_price, o_price, c_price, volume);
}
}

View File

@ -2,7 +2,6 @@ package cryptosky.me.pricing.graphql.queries;
import com.coxautodev.graphql.tools.GraphQLQueryResolver;
import cryptosky.me.pricing.models.entities.BtcPriceModel;
import cryptosky.me.pricing.models.entities.CryptoPriceModel;
import cryptosky.me.pricing.service.PriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

View File

@ -9,7 +9,6 @@ import cryptosky.me.pricing.models.entities.CryptoPriceModel;
import cryptosky.me.pricing.models.repositories.BtcPriceRepository;
import cryptosky.me.exceptions.NotSupportedCurrencyTypeException;
import cryptosky.me.exceptions.DatabaseViolationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -22,11 +21,9 @@ import org.springframework.transaction.annotation.Transactional;
import javax.jms.JMSException;
import javax.jms.TextMessage;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.time.LocalDateTime;
import static cryptosky.me.ArtemisSyncMessaging.*;
import static cryptosky.me.SupportedCurrencies.*;
@ -55,29 +52,6 @@ public class PriceService {
this.dlqName = dlqName;
}
@Transactional
public BtcPriceModel createBtc(final String createdDate, final String type,
final float av_price,
final float h_price,
final float l_price,
final float o_price,
final float c_price,
final float volume ) {
final BtcPriceModel btcPrice = new BtcPriceModel();
btcPrice.setTimestamp(LocalDateTime.parse((createdDate)));
btcPrice.setType(type);
btcPrice.setAverage_price(av_price);
btcPrice.setHigh_price(h_price);
btcPrice.setLow_price(l_price);
btcPrice.setOpen_price(o_price);
btcPrice.setClose_price(c_price);
btcPrice.setVolume(volume);
return btcPrice;
// return this.btcPriceRepository.save(btcPrice);
}
@Transactional
public void createRecord(CryptoPriceModel cryptoPriceModel, String correlationId, TextMessage message) {
String syncId = randomUUID().toString();

View File

@ -14,7 +14,6 @@ public class SentimentModel {
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@Column(name = "timestamp",nullable = false)

View File

@ -33,8 +33,3 @@ type Query {
tweetsForDay(startDate: String, endDate: String):[sentimentModel],
tweetsForPeriod(startDate: String, endDate: String):[sentimentModel]
}
type Mutation {
createBtc(createdDate: String!, type: String!, average_price: Float!, high_price: Float, low_price: Float, open_price: Float, close_price: Float, volume: Float):BtcPrice
createTweet(createdDate: String!, rawTweet: String!, sentimentScore: Float!, positiveScore: Float, neutralScore: Float, negativeScore: Float, compoundScore: Float!):sentimentModel
}