Addresses database comments

- Adds a default on expires_at datetime
- Modifies deploy tokens views to handle default expires at value
- Use datetime_with_timezone where possible
- Remove unused scopes

1 files changed, 16 insertions, 1 deletions

diff --git a/app/services/deploy_tokens/create_service.rb b/app/services/deploy_tokens/create_service.rb
index a5d31dd9fa5..e623d94b444 100644
--- a/app/services/deploy_tokens/create_service.rb
+++ b/app/services/deploy_tokens/create_service.rb
@@ -1,7 +1,22 @@
 module DeployTokens
   class CreateService < BaseService
     def execute
-      @project.deploy_tokens.build(params).tap(&:save)
+      @project.deploy_tokens.create(deploy_token_params)
+    end
+
+    private
+
+    def deploy_token_params
+      params[:expires_at] = expires_at_date
+      params
+    end
+
+    def expires_at_date
+      params[:expires_at].present? ? default_expires_at : params[:expires_at]
+    end
+
+    def default_expires_at
+      DeployToken::FUTURE_DATE
     end
   end
 end