-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upload documents to google drive (UD3, UD6.1, UD6.2) #1327
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,43 @@ | ||
.upload-group .govuk-button { | ||
#file-upload { | ||
margin-bottom: 0; | ||
} | ||
|
||
.hidden-input { | ||
display: none; | ||
} | ||
|
||
.upload-progress { | ||
display: inline-block; | ||
position: relative; | ||
width: 18px; | ||
height: 18px; | ||
} | ||
.upload-progress div { | ||
box-sizing: border-box; | ||
display: block; | ||
position: absolute; | ||
width: 18px; | ||
height: 18px; | ||
margin: 0px; | ||
border: 3px solid green; | ||
border-radius: 50%; | ||
animation: spin 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite; | ||
border-color: green transparent transparent transparent; | ||
} | ||
.upload-progress div:nth-child(1) { | ||
animation-delay: -0.45s; | ||
} | ||
.upload-progress div:nth-child(2) { | ||
animation-delay: -0.3s; | ||
} | ||
.upload-progress div:nth-child(3) { | ||
animation-delay: -0.15s; | ||
} | ||
@keyframes spin { | ||
0% { | ||
transform: rotate(0deg); | ||
} | ||
100% { | ||
transform: rotate(360deg); | ||
} | ||
} |
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,4 @@ | ||
class Document < ApplicationRecord | ||
belongs_to :vacancy | ||
validates :name, :size, :content_type, :download_url, :google_drive_id, presence: true | ||
end |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
require 'google/apis/drive_v3' | ||
|
||
class DocumentUpload | ||
class MissingUploadPath < StandardError; end | ||
attr_accessor :drive_service, :upload_path, :name, :uploaded, :safe_download | ||
|
||
def initialize(opts = {}) | ||
raise MissingUploadPath if opts[:upload_path].nil? | ||
self.upload_path = opts[:upload_path] | ||
self.name = opts[:name] | ||
self.drive_service = Google::Apis::DriveV3::DriveService.new | ||
end | ||
|
||
def upload | ||
upload_hiring_staff_document | ||
set_public_permission_on_document | ||
google_drive_virus_check | ||
end | ||
|
||
def upload_hiring_staff_document | ||
self.uploaded = drive_service.create_file( | ||
{ alt: 'media', name: name }, | ||
fields: 'id, web_view_link, web_content_link, mime_type', | ||
upload_source: upload_path | ||
) | ||
end | ||
|
||
def set_public_permission_on_document | ||
drive_service.create_permission( | ||
uploaded.id, | ||
Google::Apis::DriveV3::Permission.new(type: 'anyone', role: 'reader') | ||
) | ||
end | ||
|
||
def google_drive_virus_check | ||
download_path = "#{uploaded.id}" | ||
begin | ||
drive_service.get_file( | ||
cpjmcquillan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
uploaded.id, | ||
acknowledge_abuse: false, | ||
download_dest: download_path | ||
) | ||
rescue Google::Apis::ClientError | ||
drive_service.delete_file(uploaded.id) | ||
self.safe_download = false | ||
else | ||
self.safe_download = true | ||
ensure | ||
File.delete(download_path) if File.exist?(download_path) | ||
end | ||
end | ||
end |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if there's a risk, in using a separate variable to track whether there are errors, that it will become decoupled from the actual state of
@documents_form.errors
which is partly determined by ActiveModel.could become (something like):
in order to have a single source of truth about whether there are errors. Maybe this is just a pattern I'm unaware of though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure, but I think this is because we don't validate whether we have a virus in the form model.
We wouldn't know if there was a virus unless Google tells us so the method is invoked depending on the response from Google.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the error is created on line 84:
Does that count as validating in the form model, for your purposes?