Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
a423916
close #1-MVP Draft
maryarm May 24, 2021
e88d023
close #2-Add a rest endpoint for balance inquiry
maryarm May 26, 2021
2e47bd0
close #4, #5: disable ssl for realms, add demo smtp config
maryarm Jun 6, 2021
51bc96b
close #3: add nginx to docker-compose.yml
maryarm Jun 6, 2021
6540562
Fix #6, override adminUrl of keycloak for docker
maryarm Jun 11, 2021
f1725a3
Fix #7, replaced \r with "" in public.cert
maryarm Jul 17, 2021
8fbcb14
Fix #8, #9: add api module and change accountant module accordingly
maryarm Jul 17, 2021
5ae234b
close #13: cleaned up docker-compose.yml
maryarm Jul 17, 2021
90f152b
close #11: create order API implemented
Marchosiax Jul 28, 2021
a98c1c8
close #10: Added account info endpoint
Marchosiax Aug 2, 2021
78f070b
Add raw springfox swagger to api, wallet and matching gateway modules
ebrahimmfadae Aug 3, 2021
8e28670
close #15: Converted "mixchange" to "opex"
Marchosiax Aug 4, 2021
b0fbe08
Add authentication to swagger
ebrahimmfadae Aug 7, 2021
7dd4bd1
Add description to API swagger doc
ebrahimmfadae Aug 10, 2021
51b1932
Add description attributes to Wallet and MatchingGateway modules
ebrahimmfadae Aug 10, 2021
4f41961
Merge 'feature/1-MVP' with 'feature/iss#14-add_swagger_to_api'
ebrahimmfadae Aug 10, 2021
185d42b
Fix corrupted config files
ebrahimmfadae Aug 10, 2021
d7c6e3d
Merge pull request #18 from opexdev/feature/iss#14-add_swagger_to_api
ebrahimmfadae Aug 10, 2021
835760d
Extract swagger auth url to config file
ebrahimmfadae Aug 14, 2021
facd982
Fix swagger auth url in all modules
ebrahimmfadae Aug 14, 2021
53079a7
Closed #19: Add arch/logic to deposit crypto currencies
maryarm Aug 14, 2021
e38dd7c
Merge remote-tracking branch 'origin/feature/1-MVP' into feature/1-MVP
maryarm Aug 14, 2021
34e26e7
close #20: Configured CORS for opex.dev and localhost:3000
Marchosiax Aug 15, 2021
7e95404
Fix cors 401 error concerning issue #20
Marchosiax Aug 16, 2021
33b9125
close #22: Fixed ask-bid conversion mismatch
Marchosiax Aug 17, 2021
4e29389
Close #14, Extract swagger config (#24)
ebrahimmfadae Aug 17, 2021
0285f65
close #17: Add error handling mechanism. More errors will be handled …
Marchosiax Aug 21, 2021
6df58bc
Close #16, Add symbol mapper to map binance schema to ours (#30)
ebrahimmfadae Aug 22, 2021
ab30cf7
close #31: Added consul
Marchosiax Aug 23, 2021
4d3bc37
Merge branch 'feature/1-MVP' of github.com:opexdev/Back-end into feat…
Marchosiax Aug 23, 2021
b07ad7f
Close #35, Fix ID type of base class in SymbolMapRepository
ebrahimmfadae Aug 24, 2021
8b4095e
Fix #36- Remove AuthenticationConverter and use securityContext dire…
maryarm Aug 24, 2021
5407bb1
Fix #37-Add Filter To fix FormParam problem in WebFlux
maryarm Aug 24, 2021
b62c1e5
Fix #38-Add logs for received Rest calls and WebClients
maryarm Aug 24, 2021
2a10cb4
Fix #38-Modify poms for logging-handler
maryarm Aug 24, 2021
e57eaf2
Fix #40-For Throwable set response status to INTERNAL_SERVER_ERROR
maryarm Aug 24, 2021
8905ca3
Fix #41: Set all required properties in json file
maryarm Aug 24, 2021
e6c0b50
Fix #42: Change "date" type from LocalDateTime to Long
maryarm Aug 24, 2021
6841700
close #33: Order book API implemented
Marchosiax Aug 25, 2021
bff4ae4
close #34: Trade log API implemented
Marchosiax Aug 25, 2021
2eca365
close #39: Removed public.cert files
Marchosiax Aug 25, 2021
75ec741
close #44: Add CORS config for all endpoints
Marchosiax Aug 28, 2021
02ef0fc
close #45: Fix BigDecimal problem for API
Marchosiax Aug 28, 2021
dfa467d
Close #23, Complete db config for bc-persister-postgres (#46)
ebrahimmfadae Aug 29, 2021
a927212
close #43: Removed authentication for market API and fixed isBuyerMak…
Marchosiax Aug 29, 2021
401641d
close #49: Add 'code' to api OrderStatus
Marchosiax Aug 30, 2021
aa09093
close #47: Ticker API implemented for 24h, 7d, 1 month duration
Marchosiax Aug 31, 2021
564b171
close #49: Fixed, but needs more testing
Marchosiax Sep 1, 2021
e0b3994
close #52: Fixed
Marchosiax Sep 1, 2021
82fbbe3
close #53: Fixed saving issues
Marchosiax Sep 5, 2021
b55d0e3
close #53: Part of previous commit
Marchosiax Sep 5, 2021
4dbe224
Fixed #55: remove faulty setting of bestBidOrder in putInGTCQueue
maryarm Sep 6, 2021
930e642
Fix #56: used logger with param instead of println
maryarm Sep 6, 2021
ec82866
Close #25, Complete assign address service (#57)
ebrahimmfadae Sep 11, 2021
50e6312
close #54: Cancel order implemented
Marchosiax Sep 11, 2021
dc22603
Merge branch 'feature/1-MVP' of github.com:opexdev/OPEX-Core into fea…
Marchosiax Sep 11, 2021
47978c4
Regarding issue #54: Changed cancel order logic in order to use ouid …
Marchosiax Sep 12, 2021
49b6b85
Fix #60: Allow cors for all methods
Marchosiax Sep 14, 2021
9c52451
Close #59: Converted symbols
Marchosiax Sep 14, 2021
71bd99e
Close #26, Implement chain sync (#58)
ebrahimmfadae Sep 14, 2021
0110c8d
Close #28, Implement wallet sync (#63)
ebrahimmfadae Sep 15, 2021
593e399
Close #61: Price ticker implemented
Marchosiax Sep 15, 2021
0d3b583
Merge remote-tracking branch 'origin/feature/1-MVP' into feature/1-MVP
Marchosiax Sep 15, 2021
fdadc1b
Close #62: Exchange info implemented
Marchosiax Sep 18, 2021
124916b
Close #66: Add Jenkinsfile.deploy.groovy
maryarm Sep 18, 2021
0493177
Merge remote-tracking branch 'origin/feature/1-MVP' into feature/1-MVP
maryarm Sep 18, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
# BlueJ files
*.ctxt

# Idea folders
.idea

# Mobile Tools for Java (J2ME)
.mtj.tmp/

Expand Down
1 change: 1 addition & 0 deletions Accountant/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.iml
80 changes: 80 additions & 0 deletions Accountant/accountant-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# Created by .ignore support plugin (hsz.mobi)
### Kotlin template
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
.idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/modules
*.iml
*.ipr
.mvn/

# File-based project format
*.iws

# IntelliJ
out/

target/

.DS_Store




5 changes: 5 additions & 0 deletions Accountant/accountant-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM openjdk:8-jdk-alpine
VOLUME /tmp
ARG JAR_FILE=target/*.jar
COPY ${JAR_FILE} app.jar
ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]
200 changes: 200 additions & 0 deletions Accountant/accountant-app/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>co.nilin.opex</groupId>
<artifactId>accountant-app</artifactId>
<version>1.0-SNAPSHOT</version>
<name>accountant-app</name>
<description>Accountant app Opex</description>

<properties>
<java.version>1.8</java.version>
<kotlin.version>1.4.31</kotlin.version>
<accountant.version>${version}</accountant.version>
<utility.version>${version}</utility.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>accountant-core</artifactId>
<version>${accountant.version}</version>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>accountant-eventlistener-kafka</artifactId>
<version>${accountant.version}</version>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>accountant-submitter-kafka</artifactId>
<version>${accountant.version}</version>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>accountant-persister-postgres</artifactId>
<version>${accountant.version}</version>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>accountant-wallet-proxy</artifactId>
<version>${accountant.version}</version>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>error-handler</artifactId>
<version>${utility.version}</version>
</dependency>
<dependency>
<groupId>co.nilin.opex</groupId>
<artifactId>logging-handler</artifactId>
<version>${utility.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration>
<!-- Skips unit tests if the value of skip.unit.tests property is true -->
<skipTests>${skip.unit.tests}</skipTests>
<!-- Excludes integration tests when unit tests are run -->
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-test-source</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/java</source>
</sources>
</configuration>
</execution>
<execution>
<phase>compile</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<args>
<arg>-Xjsr305=strict</arg>
</args>
<compilerPlugins>
<plugin>spring</plugin>
</compilerPlugins>
<jvmTarget>1.8</jvmTarget>
</configuration>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-allopen</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<finalName>opex-accountant</finalName>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package co.nilin.opex.app

import co.nilin.opex.utility.error.EnableOpexErrorHandler
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.runApplication
import org.springframework.context.annotation.ComponentScan

@SpringBootApplication
@ComponentScan("co.nilin.opex")
@EnableOpexErrorHandler
class AccountantApp

fun main(args: Array<String>) {
runApplication<AccountantApp>(*args)
}
Loading