@@ -2,7 +2,7 @@ mod common;
22mod mongo_raw;
33mod server;
44
5- use common:: { models:: World , random_id, random_ids } ;
5+ use common:: { models:: World , random_id} ;
66use mongo_raw:: database:: {
77 find_world_by_id, find_worlds, update_worlds, DatabaseConnection ,
88} ;
@@ -27,7 +27,7 @@ use mongodb::{
2727 options:: { ClientOptions , Compressor } ,
2828 Client ,
2929} ;
30- use rand:: { rngs:: SmallRng , thread_rng, Rng , SeedableRng } ;
30+ use rand:: { rngs:: SmallRng , thread_rng, SeedableRng } ;
3131
3232async fn db ( DatabaseConnection ( db) : DatabaseConnection ) -> impl IntoResponse {
3333 let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
@@ -48,9 +48,7 @@ async fn queries(
4848 let q = parse_params ( params) ;
4949
5050 let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
51- let ids = random_ids ( & mut rng, q) ;
52-
53- let worlds = find_worlds ( db, ids) . await ;
51+ let worlds = find_worlds ( db, & mut rng, q) . await ;
5452 let results = worlds. expect ( "worlds could not be retrieved" ) ;
5553
5654 ( StatusCode :: OK , Json ( results) )
@@ -64,16 +62,13 @@ async fn updates(
6462
6563 let mut rng = SmallRng :: from_rng ( & mut thread_rng ( ) ) . unwrap ( ) ;
6664
67- let ids = random_ids ( & mut rng, q) ;
68- let worlds = find_worlds ( db. clone ( ) , ids)
65+ let worlds = find_worlds ( db. clone ( ) , & mut rng, q)
6966 . await
7067 . expect ( "worlds could not be retrieved" ) ;
7168 let mut updated_worlds: Vec < World > = Vec :: with_capacity ( q) ;
7269
7370 for mut world in worlds {
74- let random_number = ( rng. gen :: < u32 > ( ) % 10_000 + 1 ) as i32 ;
75-
76- world. random_number = random_number;
71+ world. random_number = random_id ( & mut rng) ;
7772 updated_worlds. push ( world) ;
7873 }
7974
0 commit comments