From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 095F66A01A for ; Thu, 21 Jan 2021 16:51:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 079FC13D18 for ; Thu, 21 Jan 2021 16:51:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2C9E213CFE for ; Thu, 21 Jan 2021 16:51:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E2B2D460C1 for ; Thu, 21 Jan 2021 16:51:35 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Thu, 21 Jan 2021 16:51:04 +0100 Message-Id: <20210121155107.1971-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210121155107.1971-1-s.ivanov@proxmox.com> References: <20210121155107.1971-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.067 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [statistics.pm] Subject: [pmg-devel] [PATCH pmg-api v2 3/5] api: statistics: refactor detail calls X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 15:51:38 -0000 the API calls returning the detailed statistics for a particular email use much common code. This patch introduces a sub to be used in all detail api calls. Signed-off-by: Stoiko Ivanov --- src/PMG/API2/Statistics.pm | 82 ++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 48 deletions(-) diff --git a/src/PMG/API2/Statistics.pm b/src/PMG/API2/Statistics.pm index 064865d..72bfeb5 100644 --- a/src/PMG/API2/Statistics.pm +++ b/src/PMG/API2/Statistics.pm @@ -291,6 +291,37 @@ my $detail_return_properties = sub { return $prop; }; +sub get_detail_statistics { + my ($type, $param) =@_; + + my ($start, $end) = $extract_start_end->($param); + + my $stat = PMG::Statistic->new($start, $end); + my $rdb = PMG::RuleDB->new(); + + my $sorters = []; + if ($param->{orderby}) { + my $props = ['time', 'sender', 'bytes', 'blocked', 'spamlevel', 'virusinfo']; + $props->[1] = 'receiver' if $type eq 'sender'; + $sorters = $decode_orderby->($param->{orderby}, $props); + } + + my $res = []; + if ($type eq 'contact') { + $res = $stat->user_stat_contact_details( + $rdb, $param->{contact}, $userstat_limit, $sorters, $param->{filter}); + } elsif ($type eq 'sender') { + $res = $stat->user_stat_sender_details( + $rdb, $param->{sender}, $userstat_limit, $sorters, $param->{filter}); + } elsif ($type eq 'receiver') { + $res = $stat->user_stat_receiver_details( + $rdb, $param->{receiver}, $userstat_limit, $sorters, $param->{filter}); + } else { + die "invalid type provided (not 'contact', 'sender', 'receiver')\n"; + } + return $res; +} + __PACKAGE__->register_method ({ name => 'contactdetails', path => 'contact/{contact}', @@ -327,22 +358,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment->get(); - my $cinfo = $restenv->{cinfo}; - - my ($start, $end) = $extract_start_end->($param); - - my $stat = PMG::Statistic->new($start, $end); - my $rdb = PMG::RuleDB->new(); - - my $sorters = []; - if ($param->{orderby}) { - my $props = ['time', 'sender', 'bytes', 'blocked', 'spamlevel', 'virusinfo']; - $sorters = $decode_orderby->($param->{orderby}, $props); - } - - return $stat->user_stat_contact_details( - $rdb, $param->{contact}, $userstat_limit, $sorters, $param->{filter}); + return get_detail_statistics('contact', $param); }}); __PACKAGE__->register_method ({ @@ -445,22 +461,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment->get(); - my $cinfo = $restenv->{cinfo}; - - my ($start, $end) = $extract_start_end->($param); - - my $stat = PMG::Statistic->new($start, $end); - my $rdb = PMG::RuleDB->new(); - - my $sorters = []; - if ($param->{orderby}) { - my $props = ['time', 'receiver', 'bytes', 'blocked', 'spamlevel', 'virusinfo']; - $sorters = $decode_orderby->($param->{orderby}, $props); - } - - return $stat->user_stat_sender_details( - $rdb, $param->{sender}, $userstat_limit, $sorters, $param->{filter}); + return get_detail_statistics('sender', $param); }}); __PACKAGE__->register_method ({ @@ -571,22 +572,7 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $restenv = PMG::RESTEnvironment->get(); - my $cinfo = $restenv->{cinfo}; - - my ($start, $end) = $extract_start_end->($param); - - my $stat = PMG::Statistic->new($start, $end); - my $rdb = PMG::RuleDB->new(); - - my $sorters = []; - if ($param->{orderby}) { - my $props = ['time', 'sender', 'bytes', 'blocked', 'spamlevel', 'virusinfo']; - $sorters = $decode_orderby->($param->{orderby}, $props); - } - - return $stat->user_stat_receiver_details( - $rdb, $param->{receiver}, $userstat_limit, $sorters, $param->{filter}); + return get_detail_statistics('receiver', $param); }}); __PACKAGE__->register_method ({ -- 2.20.1