arami21 commited on
Commit
e265669
Β·
verified Β·
1 Parent(s): 1a922b2

Update src/main.rs

Browse files
Files changed (1) hide show
  1. src/main.rs +20 -32
src/main.rs CHANGED
@@ -2,13 +2,14 @@ use actix_cors::Cors;
2
  use actix_web::{App, HttpResponse, HttpServer, web};
3
  use config::AppConfig;
4
  use confik::{Configuration as _, EnvSource};
5
- use deadpool_postgres::{Pool, Runtime};
 
6
  use dotenvy::dotenv;
7
  use native_tls::TlsConnector;
8
  use postgres_native_tls::MakeTlsConnector;
9
  use std::thread;
10
- use std::env;
11
- use std::str::FromStr;
12
 
13
  mod config;
14
  mod db;
@@ -20,7 +21,6 @@ use crate::models::RsvpRequest;
20
 
21
  async fn health_check_handler(pool: web::Data<Pool>) -> Result<HttpResponse, MyError> {
22
  let client = pool.get().await.map_err(MyError::PoolError)?;
23
- // Query ringan "SELECT 1" untuk memastikan database hidup
24
  let stmt = client.prepare("SELECT 1").await.map_err(MyError::PGError)?;
25
  client
26
  .query_one(&stmt, &[])
@@ -30,10 +30,9 @@ async fn health_check_handler(pool: web::Data<Pool>) -> Result<HttpResponse, MyE
30
  Ok(HttpResponse::Ok().body("System Healthy & DB Connected"))
31
  }
32
 
33
- // 2. Get Guest by Slug (GET /guests/{slug})
34
  async fn get_guest_handler(
35
  pool: web::Data<Pool>,
36
- path: web::Path<String>, // Mengambil {slug} dari URL
37
  ) -> Result<HttpResponse, MyError> {
38
  let client = pool.get().await.map_err(MyError::PoolError)?;
39
  let slug = path.into_inner();
@@ -42,36 +41,32 @@ async fn get_guest_handler(
42
  Ok(HttpResponse::Ok().json(guest))
43
  }
44
 
45
- // 3. Submit RSVP (POST /rsvp)
46
  async fn submit_rsvp_handler(
47
  pool: web::Data<Pool>,
48
- form: web::Json<RsvpRequest>, // Mengambil JSON dari Body
49
  ) -> Result<HttpResponse, MyError> {
50
  let client = pool.get().await.map_err(MyError::PoolError)?;
51
-
52
- // form.0 atau form.into_inner() untuk mengambil struct aslinya
53
  let updated_guest = db::submit_rsvp(&client, form.into_inner()).await?;
54
  Ok(HttpResponse::Ok().json(updated_guest))
55
  }
56
 
57
- // 4. Get All Messages (GET /messages)
58
  async fn get_messages_handler(pool: web::Data<Pool>) -> Result<HttpResponse, MyError> {
59
  let client = pool.get().await.map_err(MyError::PoolError)?;
60
-
61
  let messages = db::get_messages(&client).await?;
62
  Ok(HttpResponse::Ok().json(messages))
63
  }
64
 
65
  #[actix_web::main]
66
  async fn main() -> std::io::Result<()> {
67
- // 1. Load .env file
68
  dotenv().ok();
69
 
 
70
  let config = AppConfig::builder()
71
  .override_with(EnvSource::new())
72
  .try_build()
73
- .expect("Gagal membaca konfigurasi. Cek .env anda!");
74
- // 1. Setup SSL (Wajib untuk Supabase)
 
75
  let tls_connector = TlsConnector::builder()
76
  .danger_accept_invalid_certs(true)
77
  .build()
@@ -90,7 +85,7 @@ async fn main() -> std::io::Result<()> {
90
  println!("πŸ”— Menghubungkan ke: ...@{}", safe_log);
91
 
92
  // =========================================================
93
- // PERBAIKAN UTAMA: CARA MEMBUAT POOL DARI STRING URL
94
  // =========================================================
95
 
96
  // Kita parse string URL menjadi Config tokio_postgres
@@ -103,6 +98,7 @@ async fn main() -> std::io::Result<()> {
103
  };
104
 
105
  // Gabungkan Config + SSL Connector + Manager Config
 
106
  let mgr = Manager::from_config(pg_config, connector, mgr_config);
107
 
108
  // Build Pool Akhirnya
@@ -112,30 +108,22 @@ async fn main() -> std::io::Result<()> {
112
  .expect("πŸ”₯ Gagal membuat Pool Database. Cek koneksi internet/URL!");
113
 
114
  println!("βœ… Pool Database Berhasil Dibuat!");
 
 
115
  let available_cores = thread::available_parallelism().unwrap().get();
116
- println!("--------------------------------------------------");
117
- println!("πŸ–₯️ CPU Cores Terdeteksi : {}", available_cores);
118
- println!("πŸ‘· Actix Workers (Threads): {}", available_cores);
119
- println!("πŸš€ Server berjalan di : http://{}", config.server_addr);
120
  println!("--------------------------------------------------");
121
 
122
- // 4. Jalankan HTTP Server
123
  HttpServer::new(move || {
124
- // Setup CORS (PENTING UNTUK FRONTEND)
125
- // .allow_any_origin() artinya semua website boleh akses (aman untuk development)
126
- // Nanti di production bisa diganti spesifik domain undangan anda.
127
  let cors = Cors::default()
128
- .allow_any_origin()
129
- // .allowed_origin("https://arami21-space.github.io")
130
- // .allowed_origin("http://localhost:3000")
131
- // .allowed_origin("http://127.0.0.1:3000")
132
  .allow_any_method()
133
  .allow_any_header();
134
 
135
  App::new()
136
- .wrap(cors) // Pasang CORS
137
- .app_data(web::Data::new(pool.clone())) // Inject Database Pool ke semua handler
138
- // --- DAFTAR ROUTE ---
139
  .route("/health", web::get().to(health_check_handler))
140
  .route("/guests/{slug}", web::get().to(get_guest_handler))
141
  .route("/rsvp", web::post().to(submit_rsvp_handler))
@@ -144,4 +132,4 @@ async fn main() -> std::io::Result<()> {
144
  .bind(config.server_addr.clone())?
145
  .run()
146
  .await
147
- }
 
2
  use actix_web::{App, HttpResponse, HttpServer, web};
3
  use config::AppConfig;
4
  use confik::{Configuration as _, EnvSource};
5
+ // PERBAIKAN DI SINI: Import Runtime dihapus (karena warning), ditambah Manager, ManagerConfig, RecyclingMethod
6
+ use deadpool_postgres::{Manager, ManagerConfig, Pool, RecyclingMethod};
7
  use dotenvy::dotenv;
8
  use native_tls::TlsConnector;
9
  use postgres_native_tls::MakeTlsConnector;
10
  use std::thread;
11
+ use std::env;
12
+ use std::str::FromStr;
13
 
14
  mod config;
15
  mod db;
 
21
 
22
  async fn health_check_handler(pool: web::Data<Pool>) -> Result<HttpResponse, MyError> {
23
  let client = pool.get().await.map_err(MyError::PoolError)?;
 
24
  let stmt = client.prepare("SELECT 1").await.map_err(MyError::PGError)?;
25
  client
26
  .query_one(&stmt, &[])
 
30
  Ok(HttpResponse::Ok().body("System Healthy & DB Connected"))
31
  }
32
 
 
33
  async fn get_guest_handler(
34
  pool: web::Data<Pool>,
35
+ path: web::Path<String>,
36
  ) -> Result<HttpResponse, MyError> {
37
  let client = pool.get().await.map_err(MyError::PoolError)?;
38
  let slug = path.into_inner();
 
41
  Ok(HttpResponse::Ok().json(guest))
42
  }
43
 
 
44
  async fn submit_rsvp_handler(
45
  pool: web::Data<Pool>,
46
+ form: web::Json<RsvpRequest>,
47
  ) -> Result<HttpResponse, MyError> {
48
  let client = pool.get().await.map_err(MyError::PoolError)?;
 
 
49
  let updated_guest = db::submit_rsvp(&client, form.into_inner()).await?;
50
  Ok(HttpResponse::Ok().json(updated_guest))
51
  }
52
 
 
53
  async fn get_messages_handler(pool: web::Data<Pool>) -> Result<HttpResponse, MyError> {
54
  let client = pool.get().await.map_err(MyError::PoolError)?;
 
55
  let messages = db::get_messages(&client).await?;
56
  Ok(HttpResponse::Ok().json(messages))
57
  }
58
 
59
  #[actix_web::main]
60
  async fn main() -> std::io::Result<()> {
 
61
  dotenv().ok();
62
 
63
+ // Config dasar untuk server address
64
  let config = AppConfig::builder()
65
  .override_with(EnvSource::new())
66
  .try_build()
67
+ .expect("Gagal membaca konfigurasi dasar!");
68
+
69
+ // 1. Setup SSL (Wajib untuk Supabase)
70
  let tls_connector = TlsConnector::builder()
71
  .danger_accept_invalid_certs(true)
72
  .build()
 
85
  println!("πŸ”— Menghubungkan ke: ...@{}", safe_log);
86
 
87
  // =========================================================
88
+ // PERBAIKAN UTAMA: MEMBUAT POOL SECARA MANUAL
89
  // =========================================================
90
 
91
  // Kita parse string URL menjadi Config tokio_postgres
 
98
  };
99
 
100
  // Gabungkan Config + SSL Connector + Manager Config
101
+ // Manager ini sekarang sudah kita import di baris atas, jadi tidak akan error lagi
102
  let mgr = Manager::from_config(pg_config, connector, mgr_config);
103
 
104
  // Build Pool Akhirnya
 
108
  .expect("πŸ”₯ Gagal membuat Pool Database. Cek koneksi internet/URL!");
109
 
110
  println!("βœ… Pool Database Berhasil Dibuat!");
111
+ // =========================================================
112
+
113
  let available_cores = thread::available_parallelism().unwrap().get();
114
+ println!("πŸ–₯️ CPU Cores : {}", available_cores);
115
+ println!("πŸš€ Server di : http://{}", config.server_addr);
 
 
116
  println!("--------------------------------------------------");
117
 
 
118
  HttpServer::new(move || {
 
 
 
119
  let cors = Cors::default()
120
+ .allowed_origin("https://arami21-space.github.io")
 
 
 
121
  .allow_any_method()
122
  .allow_any_header();
123
 
124
  App::new()
125
+ .wrap(cors)
126
+ .app_data(web::Data::new(pool.clone()))
 
127
  .route("/health", web::get().to(health_check_handler))
128
  .route("/guests/{slug}", web::get().to(get_guest_handler))
129
  .route("/rsvp", web::post().to(submit_rsvp_handler))
 
132
  .bind(config.server_addr.clone())?
133
  .run()
134
  .await
135
+ }