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 DF27668D06 for ; Fri, 15 Jan 2021 10:47:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D6AE122DCF for ; Fri, 15 Jan 2021 10:46:48 +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 7229422DA6 for ; Fri, 15 Jan 2021 10:46:47 +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 37A57456B4 for ; Fri, 15 Jan 2021 10:46:47 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Fri, 15 Jan 2021 10:46:22 +0100 Message-Id: <20210115094626.25440-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115094626.25440-1-s.ivanov@proxmox.com> References: <20210115094626.25440-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.072 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 2/5] api: statistics: refactor return for 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: Fri, 15 Jan 2021 09:47:18 -0000 all api methods returning information for a particular sender, receiver or contact have similar returns. This commit pulls the common ones out into a hash for reusing them. Signed-off-by: Stoiko Ivanov --- src/PMG/API2/Statistics.pm | 90 ++++++++++++-------------------------- 1 file changed, 27 insertions(+), 63 deletions(-) diff --git a/src/PMG/API2/Statistics.pm b/src/PMG/API2/Statistics.pm index adc7650..0d12dd3 100644 --- a/src/PMG/API2/Statistics.pm +++ b/src/PMG/API2/Statistics.pm @@ -257,6 +257,30 @@ __PACKAGE__->register_method ({ return $res; }}); +my %detail_return_properties = ( + time => { + description => "Receive time stamp", + type => 'integer', + }, + bytes => { + description => "Mail traffic (Bytes).", + type => 'number', + }, + blocked => { + description => "Mail was blocked.", + type => 'boolean', + }, + spamlevel => { + description => "Spam score.", + type => 'number', + }, + virusinfo => { + description => "Virus name.", + type => 'string', + optional => 1, + }, +); + __PACKAGE__->register_method ({ name => 'contactdetails', path => 'contact/{contact}', @@ -283,31 +307,11 @@ __PACKAGE__->register_method ({ items => { type => "object", properties => { - time => { - description => "Receive time stamp", - type => 'integer', - }, + %detail_return_properties, sender => { description => "Sender email.", type => 'string', }, - bytes => { - description => "Mail traffic (Bytes).", - type => 'number', - }, - blocked => { - description => "Mail was blocked.", - type => 'boolean', - }, - spamlevel => { - description => "Spam score.", - type => 'number', - }, - virusinfo => { - description => "Virus name.", - type => 'string', - optional => 1, - }, }, }, }, @@ -422,31 +426,11 @@ __PACKAGE__->register_method ({ items => { type => "object", properties => { - time => { - description => "Receive time stamp", - type => 'integer', - }, + %detail_return_properties, receiver => { description => "Receiver email.", type => 'string', }, - bytes => { - description => "Mail traffic (Bytes).", - type => 'number', - }, - blocked => { - description => "Mail was blocked.", - type => 'boolean', - }, - spamlevel => { - description => "Spam score.", - type => 'number', - }, - virusinfo => { - description => "Virus name.", - type => 'string', - optional => 1, - }, }, }, }, @@ -569,31 +553,11 @@ __PACKAGE__->register_method ({ items => { type => "object", properties => { - time => { - description => "Receive time stamp", - type => 'integer', - }, + %detail_return_properties, sender => { description => "Sender email.", type => 'string', }, - bytes => { - description => "Mail traffic (Bytes).", - type => 'number', - }, - blocked => { - description => "Mail was blocked.", - type => 'boolean', - }, - spamlevel => { - description => "Spam score.", - type => 'number', - }, - virusinfo => { - description => "Virus name.", - type => 'string', - optional => 1, - }, }, }, }, -- 2.20.1