Skip to content

Commit

Permalink
Fix TU
Browse files Browse the repository at this point in the history
  • Loading branch information
theo-chmbn committed Jul 20, 2023
1 parent fc357c2 commit f2a8578
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
6 changes: 5 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@
<artifactId>ojdbc8</artifactId>
<version>21.6.0.0.1</version>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,39 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;

import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Slf4j
@RestController
@RequestMapping("/api/v1/theses")
public class TheseController {

final SearchQueryBuilder searchQueryBuilder;
@Value("${google.recaptcha.key.site}")
private String recaptchaSite;
@Value("${google.recaptcha.key.secret}")
private String recaptchaSecret;
@Value("${google.recaptcha.key.threshold}")
private float threshold;
@Value("${spring.profiles.active}")
private String activeProfile;

@Value("${theses.mail}")
private String mailTheses;
@Value("${mail.ws}")
private String wsMailURL;

@Autowired
private JdbcTemplate jdbcTemplate;

@Autowired
private Environment env;

public TheseController(SearchQueryBuilder searchQueryBuilder) {
this.searchQueryBuilder = searchQueryBuilder;
}
Expand Down Expand Up @@ -92,7 +96,7 @@ public String signalerErreur(@RequestBody SignalerErreurDto json) throws Recaptc
*/
List to;

if (activeProfile == "prod" || activeProfile == "test") {
if (Arrays.asList(env.getActiveProfiles()).contains("prod") || Arrays.asList(env.getActiveProfiles()).contains("test")) {
to = getMailAddress(json.getEtabPpn(), json.getAppSource());
} else {
to = new ArrayList<>() {{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ es.personnes.recherche.indexname=aa
spring.mvc.throw-exception-if-no-handler-found=true
spring.web.resources.add-mappings=false
maxfacetsvalues=4000
spring.datasource.url=jdbc:mysql://localhost/test
spring.datasource.url=
spring.datasource.username=dbuser
spring.datasource.password=dbpass
google.recaptcha.key.site=XXX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.servlet.handler.HandlerMappingIntrospector;

import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
Expand Down

0 comments on commit f2a8578

Please sign in to comment.