Skip to content
This repository has been archived by the owner on May 2, 2024. It is now read-only.

Add team invite creation and acceptance #530

Closed
wants to merge 19 commits into from
Closed
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
2 changes: 2 additions & 0 deletions api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ dependencies {
implementation 'org.apache.httpcomponents:httpclient:4.5.13'
implementation 'org.liquibase:liquibase-core:4.3.5'
implementation 'org.springdoc:springdoc-openapi-ui:1.5.9'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
// implementation 'com.nimbusds:oauth2-oidc-sdk'

// https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
Expand Down
16 changes: 5 additions & 11 deletions api/src/main/java/com/ford/labs/retroquest/E2ETestController.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
*/
package com.ford.labs.retroquest;

import com.ford.labs.retroquest.email_reset_token.EmailResetTokenService;
import com.ford.labs.retroquest.password_reset_token.PasswordResetTokenRepository;
import com.ford.labs.retroquest.security.JwtBuilder;
import com.ford.labs.retroquest.team.Team;
import com.ford.labs.retroquest.team.TeamRepository;
import com.ford.labs.retroquest.team.TeamService;
Expand All @@ -29,7 +27,9 @@
import org.springframework.context.annotation.Profile;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.transaction.Transactional;
import java.net.URISyntaxException;
Expand All @@ -46,12 +46,9 @@ public class E2ETestController {

private final TeamRepository teamRepository;

private final JwtBuilder jwtBuilder;

public E2ETestController(TeamService teamService, TeamRepository teamRepository, PasswordResetTokenRepository passwordResetTokenRepository, EmailResetTokenService emailResetTokenService, JwtBuilder jwtBuilder) {
public E2ETestController(TeamService teamService, TeamRepository teamRepository) {
this.teamService = teamService;
this.teamRepository = teamRepository;
this.jwtBuilder = jwtBuilder;
}

@PostMapping("/create-team-with-no-emails")
Expand All @@ -70,15 +67,12 @@ public ResponseEntity<String> createTeamWithNoEmailAddresses() {
teamService.generateColumns(teamWithNoEmail);
} else {
var teamToResave = teamAlreadyCreated.get();
teamToResave.setSecondaryEmail(null);
teamToResave.setEmail(null);
teamRepository.save(teamToResave);
}

var jwt = jwtBuilder.buildJwt(teamId);
var headers = new HttpHeaders();
headers.add(HttpHeaders.LOCATION, teamId);

return new ResponseEntity<>(jwt, headers, CREATED);
return new ResponseEntity<>(headers, CREATED);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package com.ford.labs.retroquest.board;

import com.ford.labs.retroquest.retro.Retro;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.ford.labs.retroquest.actionitem.ActionItemService;
import com.ford.labs.retroquest.column.Column;
import com.ford.labs.retroquest.column.ColumnService;
import com.ford.labs.retroquest.retro.Retro;
import com.ford.labs.retroquest.thought.ThoughtService;
import com.ford.labs.retroquest.websocket.WebsocketService;
import com.ford.labs.retroquest.websocket.events.WebsocketEndRetroEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class Column implements Serializable, Comparable<Column> {
private String title;

@NaturalId
private String teamId;
private String teamId; //TODO: Change this to a UUID

@Override
public int compareTo(Column o) {
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.ford.labs.retroquest.config;

import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
import java.time.LocalDateTime;
import java.sql.Timestamp;

@Converter(autoApply = true)
public class LocalDateTimeAttributeConverter implements AttributeConverter<LocalDateTime, Timestamp> {

@Override
public Timestamp convertToDatabaseColumn(LocalDateTime locDateTime) {
return locDateTime == null ? null : Timestamp.valueOf(locDateTime);
}

@Override
public LocalDateTime convertToEntityAttribute(Timestamp sqlTimestamp) {
return sqlTimestamp == null ? null : sqlTimestamp.toLocalDateTime();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
* limitations under the License.
*/

package com.ford.labs.retroquest;
package com.ford.labs.retroquest.config;

import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;

@Configuration
public class ApplicationConfig {
public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate(RestTemplateBuilder builder) {
return builder.build();
Expand Down
112 changes: 0 additions & 112 deletions api/src/main/java/com/ford/labs/retroquest/email/EmailController.java

This file was deleted.

Loading
Loading