|
@@ -2,16 +2,11 @@
|
|
|
|
|
|
use Illuminate\Http\Request;
|
|
|
|
|
|
-function update_world(&$world, $key) {
|
|
|
- $world->randomNumber = mt_rand(1, 10000);
|
|
|
-}
|
|
|
-
|
|
|
-function compare_fortunes($f1, $f2) {
|
|
|
- return strcmp ($f1->message, $f2->message);
|
|
|
-}
|
|
|
+require_once __DIR__.'/Models/World.php';
|
|
|
+require_once __DIR__.'/Models/Fortune.php';
|
|
|
|
|
|
$app->get("plaintext", function() use ($app) {
|
|
|
- return response("Hello, World!")->header("Content-Type", "text/plain; charset=utf-8");
|
|
|
+ return response("Hello, World!")->header("Content-Type", "text/plain");
|
|
|
});
|
|
|
|
|
|
$app->get("json", function() use ($app) {
|
|
@@ -20,12 +15,12 @@ $app->get("json", function() use ($app) {
|
|
|
|
|
|
$app->get("db", function() use ($app) {
|
|
|
$id = mt_rand(1, 10000);
|
|
|
- $results = DB::select('select * from world where id = ?', [$id]);
|
|
|
- return response()->json($results[0]);
|
|
|
+ $result = World::find($id);
|
|
|
+ return response()->json($result);
|
|
|
});
|
|
|
|
|
|
$app->get("queries", function(Request $request) {
|
|
|
- $query_count = $request->input("queries");
|
|
|
+ $query_count = $request->input("queries");
|
|
|
if ($query_count < 1) {
|
|
|
$query_count = 1;
|
|
|
}
|
|
@@ -37,15 +32,15 @@ $app->get("queries", function(Request $request) {
|
|
|
|
|
|
for ($i = 0; $i < $query_count; $i++) {
|
|
|
$id = mt_rand(1, 10000);
|
|
|
- $world = DB::select("select * from world where id= ?", [$id]);
|
|
|
- $worlds[] = $world[0];
|
|
|
+ $world = World::find($id);
|
|
|
+ $worlds[] = $world;
|
|
|
}
|
|
|
|
|
|
return response()->json($worlds);
|
|
|
});
|
|
|
|
|
|
-$app->get("updates/{queries}", function($queries) use($app) {
|
|
|
- $query_count = $queries;
|
|
|
+$app->get("updates", function(Request $request) {
|
|
|
+ $query_count = $request->input("queries");
|
|
|
if ($query_count < 1) {
|
|
|
$query_count = 1;
|
|
|
}
|
|
@@ -57,21 +52,21 @@ $app->get("updates/{queries}", function($queries) use($app) {
|
|
|
|
|
|
for ($i = 0; $i < $query_count; $i++) {
|
|
|
$id = mt_rand(1, 10000);
|
|
|
- $world = DB::select("select * from world where id= ?", [$id]);
|
|
|
- $worlds[] = $world[0];
|
|
|
+ $world = World::find($id);
|
|
|
+ $world->randomNumber = mt_rand(1, 10000);
|
|
|
+ $world->save();
|
|
|
+ $worlds[] = $world;
|
|
|
}
|
|
|
|
|
|
- array_walk($worlds, "update_world");
|
|
|
-
|
|
|
return response()->json($worlds);
|
|
|
});
|
|
|
|
|
|
$app->get("fortune", function() use ($app) {
|
|
|
- $fortunes = DB::select("select * from fortune");
|
|
|
- $new_fortune = new stdClass;
|
|
|
- $new_fortune->id = 0;
|
|
|
- $new_fortune->message = "Additional fortune added at request time.";
|
|
|
+ $fortunes = Fortune::all()->toArray();
|
|
|
+ $new_fortune = array("id" => 0, "message" => "Additional fortune added at request time.");
|
|
|
$fortunes[] = $new_fortune;
|
|
|
- usort($fortunes, "compare_fortunes");
|
|
|
+ $fortunes = array_sort($fortunes, function($value) {
|
|
|
+ return $value["message"];
|
|
|
+ });
|
|
|
return view("fortune", ["fortunes" => $fortunes]);
|
|
|
});
|