Skip to content

Commit

Permalink
Fetch user id from submitter_db
Browse files Browse the repository at this point in the history
  • Loading branch information
ursm committed Jul 2, 2024
1 parent 22956e0 commit eea9967
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 34 deletions.
36 changes: 16 additions & 20 deletions api/app/models/database/dra.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,48 +50,44 @@ def validate(validation)

class Submitter
def submit(submission)
db = Sequel.connect(ENV.fetch('DRA_DATABASE_URL'))
submitter_db = Sequel.connect(ENV.fetch('SUBMITTER_DB_DATABASE_URL'))
drmdb = Sequel.connect(ENV.fetch('DRMDB_DATABASE_URL'))

user_id = 42
submitter_id = '42'
submitter_id = submission.validation.user.uid
user_id = submitter_db[:login].where(submitter_id:).get(:usr_id)

db.transaction auto_savepoint: true do
serial = nil
sub_id = nil
drmdb.transaction isolation: :serializable do
serial = (drmdb[:submission].where(submitter_id:).max(:serial) || 0) + 1

db.transaction isolation: :serializable do
serial = (db[:submission].where(submitter_id:).max(:serial) || 0) + 1

sub_id = db[:submission].insert(
usr_id: user_id,
submitter_id: ,
serial: ,
create_date: Date.current
)
end
sub_id = drmdb[:submission].insert(
usr_id: user_id,
submitter_id: ,
serial: ,
create_date: Date.current
)

submission_id = "#{submitter_id}-#{serial.to_s.rjust(4, '0')}"

db[:status_history].insert(
drmdb[:status_history].insert(
sub_id: ,
status: 100 # SubmissionStatus.NEW
)

db[:operation_history].insert(
drmdb[:operation_history].insert(
type: 3, # LogLevel.INFO
summary: 'Status update to new',
usr_id: user_id,
serial: ,
submitter_id:
)

ext_id = db[:ext_entity].insert(
ext_id = drmdb[:ext_entity].insert(
acc_type: 'DRA',
ref_name: submission_id,
status: 0 # ExtStatus.INPUTTING
)

db[:ext_permit].insert(
drmdb[:ext_permit].insert(
ext_id: ,
submitter_id:
)
Expand Down
File renamed without changes.
14 changes: 14 additions & 0 deletions api/db/dway/submitter_db/migrations/001_init.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Sequel.migration do
change do
create_table :login do
primary_key :usr_id, type: :bigint

text :submitter_id, null: false
text :password, null: false
integer :role, null: false, default: 0
boolean :usable, null: false, default: true
boolean :need_chgpasswd, default: true
timestamp :create_date, default: Sequel.lit("date_trunc('second'::text, now())")
end
end
end
14 changes: 0 additions & 14 deletions api/lib/tasks/dra.rake

This file was deleted.

18 changes: 18 additions & 0 deletions api/lib/tasks/dway.rake
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace :dway do
namespace :db do
desc 'Run migrations'
task :migrate, [:version] do |t, args|
require 'sequel/core'

Sequel.extension :migration

Sequel.connect ENV.fetch('DRMDB_DATABASE_URL') do |db|
Sequel::Migrator.run db, 'db/dway/drmdb/migrations', target: args[:version]&.to_i
end

Sequel.connect ENV.fetch('SUBMITTER_DB_DATABASE_URL') do |db|
Sequel::Migrator.run db, 'db/dway/submitter_db/migrations', target: args[:version]&.to_i
end
end
end
end

0 comments on commit eea9967

Please sign in to comment.