-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2818 from objectcomputing/develop
Update 0.8 from develop
- Loading branch information
Showing
68 changed files
with
2,992 additions
and
3,213 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...er/src/main/java/com/objectcomputing/checkins/notifications/social_media/SlackPoster.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package com.objectcomputing.checkins.notifications.social_media; | ||
|
|
||
| import com.objectcomputing.checkins.configuration.CheckInsConfiguration; | ||
| import io.micronaut.http.HttpRequest; | ||
| import io.micronaut.http.HttpResponse; | ||
| import io.micronaut.http.HttpStatus; | ||
| import io.micronaut.http.client.BlockingHttpClient; | ||
| import io.micronaut.http.client.HttpClient; | ||
|
|
||
| import jakarta.inject.Singleton; | ||
| import jakarta.inject.Inject; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Singleton | ||
| public class SlackPoster { | ||
| @Inject | ||
| private HttpClient slackClient; | ||
|
|
||
| @Inject | ||
| private CheckInsConfiguration configuration; | ||
|
|
||
| public HttpResponse post(String slackBlock) { | ||
| // See if we can have a webhook URL. | ||
| String slackWebHook = configuration.getApplication().getNotifications().getSlack().getWebhookUrl(); | ||
| if (slackWebHook != null) { | ||
| // POST it to Slack. | ||
| BlockingHttpClient client = slackClient.toBlocking(); | ||
| HttpRequest<String> request = HttpRequest.POST(slackWebHook, | ||
| slackBlock); | ||
| return client.exchange(request); | ||
| } | ||
| return HttpResponse.status(HttpStatus.GONE, | ||
| "Slack Webhook URL is not configured"); | ||
| } | ||
| } | ||
|
|
80 changes: 80 additions & 0 deletions
80
...er/src/main/java/com/objectcomputing/checkins/notifications/social_media/SlackSearch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package com.objectcomputing.checkins.notifications.social_media; | ||
|
|
||
| import com.objectcomputing.checkins.configuration.CheckInsConfiguration; | ||
| import com.slack.api.model.block.LayoutBlock; | ||
| import com.slack.api.Slack; | ||
| import com.slack.api.methods.MethodsClient; | ||
| import com.slack.api.model.Conversation; | ||
| import com.slack.api.methods.SlackApiException; | ||
| import com.slack.api.methods.request.conversations.ConversationsListRequest; | ||
| import com.slack.api.methods.response.conversations.ConversationsListResponse; | ||
| import com.slack.api.methods.request.users.UsersLookupByEmailRequest; | ||
| import com.slack.api.methods.response.users.UsersLookupByEmailResponse; | ||
|
|
||
| import jakarta.inject.Singleton; | ||
| import jakarta.inject.Inject; | ||
|
|
||
| import java.util.List; | ||
| import java.io.IOException; | ||
|
|
||
| import jnr.ffi.annotations.In; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| @Singleton | ||
| public class SlackSearch { | ||
| private static final Logger LOG = LoggerFactory.getLogger(SlackSearch.class); | ||
|
|
||
| private CheckInsConfiguration configuration; | ||
|
|
||
| public SlackSearch(CheckInsConfiguration checkInsConfiguration) { | ||
| this.configuration = checkInsConfiguration; | ||
| } | ||
|
|
||
| public String findChannelId(String channelName) { | ||
| String token = configuration.getApplication().getNotifications().getSlack().getBotToken(); | ||
| if (token != null) { | ||
| try { | ||
| MethodsClient client = Slack.getInstance().methods(token); | ||
| ConversationsListResponse response = client.conversationsList( | ||
| ConversationsListRequest.builder().build() | ||
| ); | ||
|
|
||
| if (response.isOk()) { | ||
| for (Conversation conversation: response.getChannels()) { | ||
| if (conversation.getName().equals(channelName)) { | ||
| return conversation.getId(); | ||
| } | ||
| } | ||
| } | ||
| } catch(IOException e) { | ||
| LOG.error("SlackSearch.findChannelId: " + e.toString()); | ||
| } catch(SlackApiException e) { | ||
| LOG.error("SlackSearch.findChannelId: " + e.toString()); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public String findUserId(String userEmail) { | ||
| String token = configuration.getApplication().getNotifications().getSlack().getBotToken(); | ||
| if (token != null) { | ||
| try { | ||
| MethodsClient client = Slack.getInstance().methods(token); | ||
| UsersLookupByEmailResponse response = client.usersLookupByEmail( | ||
| UsersLookupByEmailRequest.builder().email(userEmail).build() | ||
| ); | ||
|
|
||
| if (response.isOk()) { | ||
| return response.getUser().getId(); | ||
| } | ||
| } catch(IOException e) { | ||
| LOG.error("SlackSearch.findUserId: " + e.toString()); | ||
| } catch(SlackApiException e) { | ||
| LOG.error("SlackSearch.findUserId: " + e.toString()); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
177 changes: 177 additions & 0 deletions
177
server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesBaseImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| package com.objectcomputing.checkins.services.file; | ||
|
|
||
| import com.objectcomputing.checkins.services.checkindocument.CheckinDocument; | ||
| import com.objectcomputing.checkins.services.checkindocument.CheckinDocumentServices; | ||
| import com.objectcomputing.checkins.services.checkins.CheckIn; | ||
| import com.objectcomputing.checkins.services.checkins.CheckInServices; | ||
| import com.objectcomputing.checkins.services.memberprofile.MemberProfile; | ||
| import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices; | ||
| import com.objectcomputing.checkins.services.memberprofile.MemberProfileUtils; | ||
| import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices; | ||
|
|
||
| import io.micronaut.core.annotation.Nullable; | ||
| import io.micronaut.http.multipart.CompletedFileUpload; | ||
|
|
||
| import jakarta.inject.Singleton; | ||
| import jakarta.validation.constraints.NotNull; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import java.util.UUID; | ||
| import java.util.function.Function; | ||
|
|
||
| import static com.objectcomputing.checkins.services.validate.PermissionsValidation.NOT_AUTHORIZED_MSG; | ||
|
|
||
| @Singleton | ||
| abstract public class FileServicesBaseImpl implements FileServices { | ||
| private static final Logger LOG = LoggerFactory.getLogger(FileServicesBaseImpl.class); | ||
|
|
||
| protected final CheckInServices checkInServices; | ||
| protected final CheckinDocumentServices checkinDocumentServices; | ||
| protected final MemberProfileServices memberProfileServices; | ||
| protected final CurrentUserServices currentUserServices; | ||
|
|
||
| public FileServicesBaseImpl(CheckInServices checkInServices, | ||
| CheckinDocumentServices checkinDocumentServices, | ||
| MemberProfileServices memberProfileServices, | ||
| CurrentUserServices currentUserServices) { | ||
| this.checkInServices = checkInServices; | ||
| this.checkinDocumentServices = checkinDocumentServices; | ||
| this.memberProfileServices = memberProfileServices; | ||
| this.currentUserServices = currentUserServices; | ||
| } | ||
|
|
||
| abstract protected void getCheckinDocuments( | ||
| Set<FileInfoDTO> result, Set<CheckinDocument> checkinDocuments) throws IOException; | ||
| abstract protected void downloadSingleFile( | ||
| String docId, FileOutputStream myWriter) throws IOException; | ||
| abstract protected FileInfoDTO uploadSingleFile( | ||
| CompletedFileUpload file, String directoryName, | ||
| Function<String, CheckinDocument> consumer) throws IOException; | ||
| abstract protected void deleteSingleFile(String docId) throws IOException; | ||
|
|
||
| @Override | ||
| public Set<FileInfoDTO> findFiles(@Nullable UUID checkInID) { | ||
| boolean isAdmin = currentUserServices.isAdmin(); | ||
| validate(checkInID == null && !isAdmin, NOT_AUTHORIZED_MSG); | ||
|
|
||
| try { | ||
| Set<FileInfoDTO> result = new HashSet<>(); | ||
| if (checkInID == null && isAdmin) { | ||
| getCheckinDocuments(result, Collections.emptySet()); | ||
| } else if (checkInID != null) { | ||
| validate(!checkInServices.accessGranted(checkInID, currentUserServices.getCurrentUser().getId()), | ||
| "You are not authorized to perform this operation"); | ||
|
|
||
| // If there aren't any documents, do not call | ||
| // getCheckinDocument. It assumes that an empty set means | ||
| // that it should attempt to get all documents. And, in this | ||
| // case, we just want an empty result set. | ||
| Set<CheckinDocument> checkinDocuments = checkinDocumentServices.read(checkInID); | ||
| if (!checkinDocuments.isEmpty()) { | ||
| getCheckinDocuments(result, checkinDocuments); | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| } catch (IOException e) { | ||
| LOG.error("Error occurred while retrieving files.", e); | ||
| throw new FileRetrievalException(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public java.io.File downloadFiles(@NotNull String uploadDocId) { | ||
| MemberProfile currentUser = currentUserServices.getCurrentUser(); | ||
| boolean isAdmin = currentUserServices.isAdmin(); | ||
|
|
||
| CheckinDocument cd = checkinDocumentServices.getFindByUploadDocId(uploadDocId); | ||
| validate(cd == null, String.format("Unable to find record with id %s", uploadDocId)); | ||
|
|
||
| CheckIn associatedCheckin = checkInServices.read(cd.getCheckinsId()); | ||
|
|
||
| if(!isAdmin) { | ||
| validate((!currentUser.getId().equals(associatedCheckin.getTeamMemberId()) && !currentUser.getId().equals(associatedCheckin.getPdlId())), NOT_AUTHORIZED_MSG); | ||
| } | ||
| try { | ||
| java.io.File file = java.io.File.createTempFile("tmp", ".txt"); | ||
| file.deleteOnExit(); | ||
| try( | ||
| FileOutputStream myWriter = new FileOutputStream(file) | ||
| ) { | ||
| downloadSingleFile(uploadDocId, myWriter); | ||
| return file; | ||
| } catch (IOException e) { | ||
| LOG.error("Error occurred while retrieving files.", e); | ||
| throw new FileRetrievalException(e.getMessage()); | ||
| } | ||
| } catch(IOException e) { | ||
| LOG.error("Error occurred while attempting to create a temporary file.", e); | ||
| throw new FileRetrievalException(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public FileInfoDTO uploadFile(@NotNull UUID checkInID, @NotNull CompletedFileUpload file) { | ||
| MemberProfile currentUser = currentUserServices.getCurrentUser(); | ||
| boolean isAdmin = currentUserServices.isAdmin(); | ||
| validate((file.getFilename() == null || file.getFilename().equals("")), "Please select a valid file before uploading."); | ||
|
|
||
| CheckIn checkIn = checkInServices.read(checkInID); | ||
| validate(checkIn == null, "Unable to find checkin record with id %s", checkInID); | ||
| if(!isAdmin) { | ||
| validate((!currentUser.getId().equals(checkIn.getTeamMemberId()) && !currentUser.getId().equals(checkIn.getPdlId())), "You are not authorized to perform this operation"); | ||
| validate(checkIn.isCompleted(), NOT_AUTHORIZED_MSG); | ||
| } | ||
|
|
||
| // create folder for each team member | ||
| final String directoryName = MemberProfileUtils.getFullName(memberProfileServices.getById(checkIn.getTeamMemberId())); | ||
|
|
||
| try { | ||
| return uploadSingleFile(file, directoryName, | ||
| (fileId) -> { | ||
| //create record in checkin-document service | ||
| CheckinDocument cd = new CheckinDocument(checkInID, fileId); | ||
| checkinDocumentServices.save(cd); | ||
| return cd; | ||
| }); | ||
| } catch (IOException e) { | ||
| LOG.error("Unexpected error processing file upload.", e); | ||
| throw new FileRetrievalException(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean deleteFile(@NotNull String uploadDocId) { | ||
| MemberProfile currentUser = currentUserServices.getCurrentUser(); | ||
| boolean isAdmin = currentUserServices.isAdmin(); | ||
|
|
||
| CheckinDocument cd = checkinDocumentServices.getFindByUploadDocId(uploadDocId); | ||
| validate(cd == null, String.format("Unable to find record with id %s", uploadDocId)); | ||
|
|
||
| CheckIn associatedCheckin = checkInServices.read(cd.getCheckinsId()); | ||
| if(!isAdmin) { | ||
| validate((!currentUser.getId().equals(associatedCheckin.getTeamMemberId()) && !currentUser.getId().equals(associatedCheckin.getPdlId())), NOT_AUTHORIZED_MSG); | ||
| } | ||
|
|
||
| try { | ||
| deleteSingleFile(uploadDocId); | ||
| checkinDocumentServices.deleteByUploadDocId(uploadDocId); | ||
| return true; | ||
| } catch (IOException e) { | ||
| LOG.error("Error occurred while deleting files.", e); | ||
| throw new FileRetrievalException(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| protected void validate(boolean isError, String message, Object... args) { | ||
| if(isError) { | ||
| throw new FileRetrievalException(String.format(message, args)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.