Merge pull request #86 from psu-libraries/missing-status-fix

Missing status fix

.gitignore

@@ -42,3 +42,4 @@ spec/examples.txt
 .env
 .cache
 .bash_history
+.envrc

app/importers/osp_data/osp_xml_builder.rb

@@ -124,7 +124,7 @@ def build_xml(batch)
                   end
                 end
                 xml.AMOUNT_REQUEST_ contract.requested, access: 'READ_ONLY'
-                if college_list.include?(faculty.college) && contract.status
+                if contract.status
                   xml.STATUS_ contract.status, access: 'READ_ONLY'
                 end
                 if contract.start_date
@@ -169,9 +169,4 @@ def build_xml(batch)
     end
     builder.to_xml
   end
-
-  def college_list
-    %w[AG ED CA LA BK SC AA UL BA BC CM LW EM GV HH IST MD NR UC
-       AB AL UE EN]
-  end
 end

config/activity_insight.yml

@@ -14,4 +14,38 @@ production:
     api_key: "<%= ENV.fetch('FAMS_S3_BUCKET_API_KEY') %>"
   lp_sftp:
     username: "<%= ENV.fetch('FAMS_LP_SFTP_USERNAME') %>"
-    host: "<%= ENV.fetch('FAMS_LP_SFTP_HOST') %>"
+    host: "<%= ENV.fetch('FAMS_LP_SFTP_HOST') %>"
+development:
+  main:
+    :username: "<%= ENV.fetch('FAMS_MAIN_USERNAME') %>"
+    :password: "<%= ENV.fetch('FAMS_MAIN_PASSWORD') %>"
+  webservices:
+    :username: "<%= ENV.fetch('FAMS_WEBSERVICES_USERNAME') %>"
+    :password: "<%= ENV.fetch('FAMS_WEBSERVICES_PASSWORD') %>"
+  backups_service:
+    :username: "<%= ENV.fetch('FAMS_BACKUPS_SERVICE_USERNAME') %>"
+    :password: "<%= ENV.fetch('FAMS_BACKUPS_SERVICE_PASSWORD') %>"
+  metadata_db:
+    :key: "<%= ENV.fetch('FAMS_METADATA_DB_KEY') %>"
+  s3_bucket:
+    api_key: "<%= ENV.fetch('FAMS_S3_BUCKET_API_KEY') %>"
+  lp_sftp:
+    username: "<%= ENV.fetch('FAMS_LP_SFTP_USERNAME') %>"
+    host: "<%= ENV.fetch('FAMS_LP_SFTP_HOST') %>"
+test:
+  main:
+    :username: fake
+    :password: fake
+  webservices:
+    :username: fake
+    :password: fake
+  backups_service:
+    :username: fake
+    :password: fake
+  metadata_db:
+    :key: fake
+  s3_bucket:
+    api_key: fake
+  lp_sftp:
+    username: fake
+    host: fake

config/integration_passcode.yml

@@ -1,2 +1,6 @@
 production:
+  :passcode: "<%= ENV.fetch('FAMS_PASSCODE') %>"
+development:
+  :passcode: "<%= ENV.fetch('FAMS_PASSCODE') %>"
+test:
   :passcode: "<%= ENV.fetch('FAMS_PASSCODE') %>"

docker-compose.yml

@@ -12,7 +12,18 @@ services:
     environment:
       # RAILS_ENV: production # The startup script defaults to development, change to production if need be
       MYSQL_HOST: db
-      MYSQL_PASSWORD: ai_integration 
+      MYSQL_PASSWORD: ai_integration
+      FAMS_PASSCODE: aisupport
+      FAMS_MAIN_USERNAME: ${FAMS_MAIN_USERNAME}
+      FAMS_MAIN_PASSWORD: ${FAMS_MAIN_PASSWORD}
+      FAMS_WEBSERVICES_USERNAME: ${FAMS_WEBSERVICES_USERNAME}
+      FAMS_WEBSERVICES_PASSWORD: ${FAMS_WEBSERVICES_PASSWORD}
+      FAMS_BACKUPS_SERVICE_USERNAME: ${FAMS_BACKUPS_SERVICE_USERNAME}
+      FAMS_BACKUPS_SERVICE_PASSWORD: ${FAMS_BACKUPS_SERVICE_PASSWORD}
+      FAMS_METADATA_DB_KEY: ${FAMS_METADATA_DB_KEY}
+      FAMS_S3_BUCKET_API_KEY: ${FAMS_S3_BUCKET_API_KEY}
+      FAMS_LP_SFTP_USERNAME: ${FAMS_LP_SFTP_USERNAME}
+      FAMS_LP_SFTP_HOST: ${FAMS_LP_SFTP_HOST}
     build: 
       args:
         UID: "${UID:-1001}"