implement avg buildtime field in header
This commit is contained in:
		@@ -9,9 +9,12 @@ use rocket::{get, State};
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
use crate::api::types::input::ListStats;
 | 
					use crate::api::types::input::ListStats;
 | 
				
			||||||
use rocket_okapi::openapi;
 | 
					use rocket_okapi::openapi;
 | 
				
			||||||
use sea_orm::PaginatorTrait;
 | 
					use sea_orm::prelude::Expr;
 | 
				
			||||||
 | 
					use sea_orm::sea_query::Function::Avg;
 | 
				
			||||||
 | 
					use sea_orm::sea_query::{Func, QueryStatement};
 | 
				
			||||||
use sea_orm::{ColumnTrait, QueryFilter};
 | 
					use sea_orm::{ColumnTrait, QueryFilter};
 | 
				
			||||||
use sea_orm::{DatabaseConnection, EntityTrait};
 | 
					use sea_orm::{DatabaseConnection, EntityTrait};
 | 
				
			||||||
 | 
					use sea_orm::{DbBackend, FromQueryResult, PaginatorTrait, QuerySelect, Statement, TryGetableMany};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#[openapi(tag = "stats")]
 | 
					#[openapi(tag = "stats")]
 | 
				
			||||||
#[get("/stats")]
 | 
					#[get("/stats")]
 | 
				
			||||||
@@ -49,6 +52,24 @@ async fn get_stats(db: &DatabaseConnection) -> anyhow::Result<ListStats> {
 | 
				
			|||||||
        .await?
 | 
					        .await?
 | 
				
			||||||
        .try_into()?;
 | 
					        .try_into()?;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    #[derive(Debug, FromQueryResult)]
 | 
				
			||||||
 | 
					    struct BuildTimeStruct {
 | 
				
			||||||
 | 
					        avg_build_time: f64,
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    let unique: BuildTimeStruct = BuildTimeStruct::find_by_statement(Statement::from_sql_and_values(
 | 
				
			||||||
 | 
					        DbBackend::Sqlite,
 | 
				
			||||||
 | 
					        r#"SELECT AVG((builds.end_time - builds.start_time)) AS avg_build_time
 | 
				
			||||||
 | 
					        FROM builds
 | 
				
			||||||
 | 
					        WHERE builds.end_time IS NOT NULL AND builds.status = 1;"#,
 | 
				
			||||||
 | 
					        [],
 | 
				
			||||||
 | 
					    ))
 | 
				
			||||||
 | 
					        .one(db)
 | 
				
			||||||
 | 
					        .await?
 | 
				
			||||||
 | 
					        .ok_or(anyhow::anyhow!("No Average build time"))?;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    let avg_build_time: u32 = unique.avg_build_time as u32;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Count total packages
 | 
					    // Count total packages
 | 
				
			||||||
    let total_packages: u32 = Packages::find().count(db).await?.try_into()?;
 | 
					    let total_packages: u32 = Packages::find().count(db).await?.try_into()?;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,6 @@
 | 
				
			|||||||
import 'package:aurcache/components/dashboard/quick_info_tile.dart';
 | 
					import 'package:aurcache/components/dashboard/quick_info_tile.dart';
 | 
				
			||||||
import 'package:aurcache/utils/file_formatter.dart';
 | 
					import 'package:aurcache/utils/file_formatter.dart';
 | 
				
			||||||
 | 
					import 'package:aurcache/utils/time_formatter.dart';
 | 
				
			||||||
import 'package:flutter/material.dart';
 | 
					import 'package:flutter/material.dart';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import '../../constants/color_constants.dart';
 | 
					import '../../constants/color_constants.dart';
 | 
				
			||||||
@@ -61,7 +62,7 @@ class QuickInfoBanner extends StatelessWidget {
 | 
				
			|||||||
          color: const Color(0xFF00F260),
 | 
					          color: const Color(0xFF00F260),
 | 
				
			||||||
          icon: Icons.timelapse,
 | 
					          icon: Icons.timelapse,
 | 
				
			||||||
          title: "Average Build Time",
 | 
					          title: "Average Build Time",
 | 
				
			||||||
          subtitle: stats.avg_build_time.toString()),
 | 
					          subtitle: stats.avg_build_time.readableDuration()),
 | 
				
			||||||
    ];
 | 
					    ];
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,8 @@ class Build {
 | 
				
			|||||||
  final int pkg_id;
 | 
					  final int pkg_id;
 | 
				
			||||||
  final String version;
 | 
					  final String version;
 | 
				
			||||||
  final int status;
 | 
					  final int status;
 | 
				
			||||||
  final int? start_time, end_time;
 | 
					  final DateTime? end_time;
 | 
				
			||||||
 | 
					  final DateTime start_time;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Build(
 | 
					  Build(
 | 
				
			||||||
      {required this.id,
 | 
					      {required this.id,
 | 
				
			||||||
@@ -16,12 +17,18 @@ class Build {
 | 
				
			|||||||
      required this.status});
 | 
					      required this.status});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  factory Build.fromJson(Map<String, dynamic> json) {
 | 
					  factory Build.fromJson(Map<String, dynamic> json) {
 | 
				
			||||||
 | 
					    final startTime =
 | 
				
			||||||
 | 
					        DateTime.fromMillisecondsSinceEpoch(json["start_time"] * 1000);
 | 
				
			||||||
 | 
					    final endTime = json["end_time"] != null
 | 
				
			||||||
 | 
					        ? DateTime.fromMillisecondsSinceEpoch((json["end_time"] as int) * 1000)
 | 
				
			||||||
 | 
					        : null;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return Build(
 | 
					    return Build(
 | 
				
			||||||
      id: json["id"] as int,
 | 
					      id: json["id"] as int,
 | 
				
			||||||
      pkg_id: json["pkg_id"] as int,
 | 
					      pkg_id: json["pkg_id"] as int,
 | 
				
			||||||
      status: json["status"] as int,
 | 
					      status: json["status"] as int,
 | 
				
			||||||
      start_time: json["start_time"] as int?,
 | 
					      start_time: startTime,
 | 
				
			||||||
      end_time: json["end_time"] as int?,
 | 
					      end_time: endTime,
 | 
				
			||||||
      pkg_name: json["pkg_name"] as String,
 | 
					      pkg_name: json["pkg_name"] as String,
 | 
				
			||||||
      version: json["version"] as String,
 | 
					      version: json["version"] as String,
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,17 +2,17 @@ class Stats {
 | 
				
			|||||||
  final int total_builds,
 | 
					  final int total_builds,
 | 
				
			||||||
      failed_builds,
 | 
					      failed_builds,
 | 
				
			||||||
      avg_queue_wait_time,
 | 
					      avg_queue_wait_time,
 | 
				
			||||||
      avg_build_time,
 | 
					 | 
				
			||||||
      repo_storage_size,
 | 
					      repo_storage_size,
 | 
				
			||||||
      active_builds,
 | 
					      active_builds,
 | 
				
			||||||
      total_packages;
 | 
					      total_packages;
 | 
				
			||||||
 | 
					  final Duration avg_build_time;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  factory Stats.fromJson(Map<String, dynamic> json) {
 | 
					  factory Stats.fromJson(Map<String, dynamic> json) {
 | 
				
			||||||
    return Stats(
 | 
					    return Stats(
 | 
				
			||||||
      total_builds: json["total_builds"] as int,
 | 
					      total_builds: json["total_builds"] as int,
 | 
				
			||||||
      failed_builds: json["failed_builds"] as int,
 | 
					      failed_builds: json["failed_builds"] as int,
 | 
				
			||||||
      avg_queue_wait_time: json["avg_queue_wait_time"] as int,
 | 
					      avg_queue_wait_time: json["avg_queue_wait_time"] as int,
 | 
				
			||||||
      avg_build_time: json["avg_build_time"] as int,
 | 
					      avg_build_time: Duration(seconds: json["avg_build_time"]),
 | 
				
			||||||
      repo_storage_size: json["repo_storage_size"] as int,
 | 
					      repo_storage_size: json["repo_storage_size"] as int,
 | 
				
			||||||
      active_builds: json["active_builds"] as int,
 | 
					      active_builds: json["active_builds"] as int,
 | 
				
			||||||
      total_packages: json["total_packages"] as int,
 | 
					      total_packages: json["total_packages"] as int,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -70,9 +70,6 @@ class _BuildScreenState extends State<BuildScreen> {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  Widget _buildTopBar(Build buildData, BuildContext context) {
 | 
					  Widget _buildTopBar(Build buildData, BuildContext context) {
 | 
				
			||||||
    final start_time =
 | 
					 | 
				
			||||||
        DateTime.fromMillisecondsSinceEpoch((buildData.start_time ?? 0) * 1000);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    return Container(
 | 
					    return Container(
 | 
				
			||||||
      color: secondaryColor,
 | 
					      color: secondaryColor,
 | 
				
			||||||
      child: Padding(
 | 
					      child: Padding(
 | 
				
			||||||
@@ -117,7 +114,7 @@ class _BuildScreenState extends State<BuildScreen> {
 | 
				
			|||||||
                const SizedBox(
 | 
					                const SizedBox(
 | 
				
			||||||
                  width: 10,
 | 
					                  width: 10,
 | 
				
			||||||
                ),
 | 
					                ),
 | 
				
			||||||
                Text("triggered ${start_time.readableDuration()}")
 | 
					                Text("triggered ${buildData.start_time.readableDuration()}")
 | 
				
			||||||
              ],
 | 
					              ],
 | 
				
			||||||
            ),
 | 
					            ),
 | 
				
			||||||
            Row(
 | 
					            Row(
 | 
				
			||||||
@@ -246,18 +243,12 @@ class _BuildScreenState extends State<BuildScreen> {
 | 
				
			|||||||
              title: "Finished",
 | 
					              title: "Finished",
 | 
				
			||||||
              textRight: buildData.end_time == null
 | 
					              textRight: buildData.end_time == null
 | 
				
			||||||
                  ? "Not yet"
 | 
					                  ? "Not yet"
 | 
				
			||||||
                  : DateTime.fromMillisecondsSinceEpoch(
 | 
					                  : buildData.end_time!.readableDuration(),
 | 
				
			||||||
                          buildData.end_time! * 1000)
 | 
					 | 
				
			||||||
                      .readableDuration(),
 | 
					 | 
				
			||||||
            ),
 | 
					            ),
 | 
				
			||||||
            SideCard(
 | 
					            SideCard(
 | 
				
			||||||
              title: "Duration",
 | 
					              title: "Duration",
 | 
				
			||||||
              textRight: (buildData.end_time != null
 | 
					              textRight: (buildData.end_time ?? DateTime.now())
 | 
				
			||||||
                      ? DateTime.fromMillisecondsSinceEpoch(
 | 
					                  .difference(buildData.start_time)
 | 
				
			||||||
                          buildData.end_time! * 1000)
 | 
					 | 
				
			||||||
                      : DateTime.now())
 | 
					 | 
				
			||||||
                  .difference(DateTime.fromMillisecondsSinceEpoch(
 | 
					 | 
				
			||||||
                      buildData.start_time! * 1000))
 | 
					 | 
				
			||||||
                  .readableDuration(),
 | 
					                  .readableDuration(),
 | 
				
			||||||
            ),
 | 
					            ),
 | 
				
			||||||
          ],
 | 
					          ],
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -168,6 +168,30 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dev"
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "4.0.2"
 | 
					    version: "4.0.2"
 | 
				
			||||||
 | 
					  leak_tracker:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: leak_tracker
 | 
				
			||||||
 | 
					      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
 | 
				
			||||||
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "10.0.0"
 | 
				
			||||||
 | 
					  leak_tracker_flutter_testing:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: leak_tracker_flutter_testing
 | 
				
			||||||
 | 
					      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
 | 
				
			||||||
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "2.0.1"
 | 
				
			||||||
 | 
					  leak_tracker_testing:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: leak_tracker_testing
 | 
				
			||||||
 | 
					      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
 | 
				
			||||||
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "2.0.1"
 | 
				
			||||||
  lints:
 | 
					  lints:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -188,26 +212,26 @@ packages:
 | 
				
			|||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: matcher
 | 
					      name: matcher
 | 
				
			||||||
      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
 | 
					      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
 | 
				
			||||||
      url: "https://pub.dev"
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.12.16"
 | 
					    version: "0.12.16+1"
 | 
				
			||||||
  material_color_utilities:
 | 
					  material_color_utilities:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: material_color_utilities
 | 
					      name: material_color_utilities
 | 
				
			||||||
      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
 | 
					      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
 | 
				
			||||||
      url: "https://pub.dev"
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.5.0"
 | 
					    version: "0.8.0"
 | 
				
			||||||
  meta:
 | 
					  meta:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: meta
 | 
					      name: meta
 | 
				
			||||||
      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
 | 
					      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
 | 
				
			||||||
      url: "https://pub.dev"
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.10.0"
 | 
					    version: "1.11.0"
 | 
				
			||||||
  nested:
 | 
					  nested:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -220,10 +244,10 @@ packages:
 | 
				
			|||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
      name: path
 | 
					      name: path
 | 
				
			||||||
      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
 | 
					      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
 | 
				
			||||||
      url: "https://pub.dev"
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "1.8.3"
 | 
					    version: "1.9.0"
 | 
				
			||||||
  path_parsing:
 | 
					  path_parsing:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
@@ -413,6 +437,14 @@ packages:
 | 
				
			|||||||
      url: "https://pub.dev"
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
    source: hosted
 | 
					    source: hosted
 | 
				
			||||||
    version: "0.4.0+2"
 | 
					    version: "0.4.0+2"
 | 
				
			||||||
 | 
					  vm_service:
 | 
				
			||||||
 | 
					    dependency: transitive
 | 
				
			||||||
 | 
					    description:
 | 
				
			||||||
 | 
					      name: vm_service
 | 
				
			||||||
 | 
					      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
 | 
				
			||||||
 | 
					      url: "https://pub.dev"
 | 
				
			||||||
 | 
					    source: hosted
 | 
				
			||||||
 | 
					    version: "13.0.0"
 | 
				
			||||||
  web:
 | 
					  web:
 | 
				
			||||||
    dependency: transitive
 | 
					    dependency: transitive
 | 
				
			||||||
    description:
 | 
					    description:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user