fix DB settings
							parent
							
								
									5dcc36e954
								
							
						
					
					
						commit
						b50e4b4d7f
					
				
							
								
								
									
										15
									
								
								mailer.rb
								
								
								
								
							
							
						
						
									
										15
									
								
								mailer.rb
								
								
								
								
							| 
						 | 
					@ -14,13 +14,13 @@ require 'tempfile'
 | 
				
			||||||
# Load environment variables from.env file
 | 
					# Load environment variables from.env file
 | 
				
			||||||
Dotenv.load
 | 
					Dotenv.load
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DB_URL = ENV.fetch('DATABASE_URL')
 | 
					DB_URL = ENV.fetch('DATABASE_URL', nil)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DB_USER = ENV.fetch('DB_USER')
 | 
					DB_USER = ENV.fetch('DB_USER', nil)
 | 
				
			||||||
DB_PASSWORD = ENV.fetch('DB_PASSWORD')
 | 
					DB_PASSWORD = ENV.fetch('DB_PASSWORD', nil)
 | 
				
			||||||
DB_HOST = ENV.fetch('DB_HOST')
 | 
					DB_HOST = ENV.fetch('DB_HOST', nil)
 | 
				
			||||||
DB_PORT = ENV.fetch('DB_PORT')
 | 
					DB_PORT = ENV.fetch('DB_PORT', nil)
 | 
				
			||||||
DB_NAME = ENV.fetch('DB_NAME')
 | 
					DB_NAME = ENV.fetch('DB_NAME', nil)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SMTP_SERVER = ENV.fetch('SMTP_SERVER')
 | 
					SMTP_SERVER = ENV.fetch('SMTP_SERVER')
 | 
				
			||||||
SMTP_PORT = ENV.fetch('SMTP_PORT').to_i
 | 
					SMTP_PORT = ENV.fetch('SMTP_PORT').to_i
 | 
				
			||||||
| 
						 | 
					@ -37,8 +37,9 @@ Here are the titles that were listened to this week
 | 
				
			||||||
END
 | 
					END
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def fetch_titles_from_db()
 | 
					def fetch_titles_from_db()
 | 
				
			||||||
 | 
					  raise "Please set either DATABASE_URL or DB_USER..." if DB_USER.nil? && DB_URL.nil?
 | 
				
			||||||
  one_week_ago = Date.today - 7
 | 
					  one_week_ago = Date.today - 7
 | 
				
			||||||
  connection = DB_URL ? PG.connect(DB_URL) : PG.connect(:dbname => DB_NAME, :host => DB_HOST, :user => DB_USER, :password => DB_PASSWORD)
 | 
					  connection = !DB_URL.nil? ? PG.connect(DB_URL) : PG.connect(:dbname => DB_NAME, :host => DB_HOST, :user => DB_USER, :password => DB_PASSWORD)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  result = connection.exec_params("SELECT item_title FROM activities WHERE created_at >= $1 ORDER BY created_at DESC", [one_week_ago])
 | 
					  result = connection.exec_params("SELECT item_title FROM activities WHERE created_at >= $1 ORDER BY created_at DESC", [one_week_ago])
 | 
				
			||||||
  connection.close
 | 
					  connection.close
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue