From 6ae4d574753b17784edb29049a27b56875c935a1 Mon Sep 17 00:00:00 2001
From: Joachim Ansorg <github@ja-dev.eu>
Date: Sat, 3 Jun 2023 13:28:38 +0200
Subject: [PATCH] implement application

---
 .gitignore                                    |   3 +-
 .idea/copyright/AGPL_3_0.xml                  |   6 +
 .idea/copyright/profiles_settings.xml         |  47 ++
 .idea/gradle.xml                              |   3 +-
 .idea/kotlinc.xml                             |   2 +-
 .idea/modules.xml                             |   1 +
 .idea/modules/marketplace-stats.iml           |   8 +
 .idea/runConfigurations/Application.xml       |  11 +
 COPYING                                       | 661 ++++++++++++++++++
 README.md                                     |  15 +
 build.gradle.kts                              |  19 +-
 config-template.json                          |   4 +
 gradle.properties                             |   7 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../client/KtorMarketplaceClient.kt           |  12 +-
 .../ja}/marketplace/client/Marketplace.kt     |  14 +-
 .../marketplace/client/MarketplaceClient.kt   |   7 +-
 .../ja}/marketplace/client/YearMonthDay.kt    |  33 +-
 .../ja}/marketplace/client/serializers.kt     |   7 +-
 .../ja}/marketplace/client/types.kt           |  43 +-
 .../ja}/marketplace/churn/ChurnProcessor.kt   |   9 +-
 .../ja}/marketplace/churn/ChurnResult.kt      |   9 +-
 .../marketplace/churn/SimpleChurnProcessor.kt |  14 +-
 .../kotlin/dev/ja/marketplace/data/Amounts.kt |  21 +
 .../ja}/marketplace/data/DataTable.kt         |  17 +-
 .../ja}/marketplace/data/LicenseInfo.kt       |  25 +-
 .../marketplace/data/MarketplaceDataSink.kt   |  16 +
 .../data/MarketplaceDataSinkFactory.kt        |  12 +
 .../marketplace/data/PaymentAmountTracker.kt  |  39 ++
 .../dev/ja/marketplace/data/PluginData.kt     |  19 +
 .../dev/ja/marketplace/data/SaleCalculator.kt |  55 ++
 .../ja}/marketplace/data/SplitAmount.kt       |   9 +-
 .../dev/ja/marketplace/data/WithDateRange.kt  |  12 +
 .../data/currentWeek/CurrentWeekFactory.kt    |  17 +
 .../data/currentWeek/CurrentWeekTable.kt      |  45 +-
 .../data/customerType/CustomerTypeFactory.kt  |  16 +
 .../data/customerType/CustomerTypeTable.kt    |  17 +-
 .../data/customers/CustomerTable.kt           |  53 +-
 .../data/customers/CustomerTableFactory.kt    |  16 +-
 .../marketplace/data/licenses/LicenseTable.kt |  13 +-
 .../data/licenses/LicenseTableFactory.kt      |  17 +
 .../data/overview/CustomerTracker.kt          |  13 +-
 .../data/overview/OverviewTable.kt            |  89 ++-
 .../data/overview/OverviewTableFactory.kt     |  17 +
 .../data/topCountries/TopCountriesFactory.kt  |  16 +
 .../data/topCountries/TopCountriesTable.kt    |  21 +-
 .../TopTrialCountriesFactory.kt               |  16 +
 .../TopTrialCountriesTable.kt                 |  64 ++
 .../ja/marketplace/data/trials/TrialsTable.kt |  65 ++
 .../data/trials/TrialsTableFactory.kt         |  16 +
 .../dev => dev/ja}/marketplace/data/types.kt  |  11 +-
 .../data/yearSummary/YearlySummaryFactory.kt  |  16 +
 .../data/yearSummary/YearlySummaryTable.kt    |  68 ++
 .../marketplace/data/MarketplaceDataSink.kt   |  11 -
 .../data/MarketplaceDataSinkFactory.kt        |   7 -
 .../ja/dev/marketplace/data/WithDateRange.kt  |   7 -
 .../data/currentWeek/CurrentWeekFactory.kt    |  11 -
 .../data/customerType/CustomerTypeFactory.kt  |  11 -
 .../data/licenses/LicenseTableFactory.kt      |  11 -
 .../data/overview/OverviewTableFactory.kt     |  11 -
 .../data/topCountries/TopCountriesFactory.kt  |  11 -
 .../data/yearSummary/YearlySummaryFactory.kt  |  11 -
 .../data/yearSummary/YearlySummaryTable.kt    |  82 ---
 .../churn/SimpleChurnProcessorTest.kt         |  31 +-
 .../client/YearMonthDayRangeTest.kt           |   7 +-
 .../kotlin/dev/ja/marketplace/Application.kt  |  31 +
 .../dev/ja/marketplace/ApplicationConfig.kt   |  18 +
 .../DefaultPluginPageDefinition.kt            |  20 +-
 .../ja}/marketplace/MarketplaceStatsServer.kt |  44 +-
 .../ja}/marketplace/PluginDataLoader.kt       |  34 +-
 .../ja/marketplace/PluginPageDefinition.kt    |  10 +
 .../dev/marketplace/PluginPageDefinition.kt   |   5 -
 src/main/resources/js/sortable.min.css        |   1 +
 src/main/resources/js/sortable.min.js         |   2 +
 src/main/resources/styles/main.css            |   5 +
 src/main/resources/styles/print.css           |   5 +
 src/main/resources/templates/dataRowGroup.kte |  35 +-
 src/main/resources/templates/dataTable.kte    |  24 +-
 .../resources/templates/dataTableSection.kte  |  28 +-
 src/main/resources/templates/main.kte         |  32 +-
 src/main/resources/templates/render.kte       |   4 +-
 .../resources/templates/tableColumnsRow.kte   |   2 +-
 src/main/resources/templates/titleRow.kte     |   3 +-
 83 files changed, 1875 insertions(+), 407 deletions(-)
 create mode 100644 .idea/copyright/AGPL_3_0.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/modules/marketplace-stats.iml
 create mode 100644 .idea/runConfigurations/Application.xml
 create mode 100644 COPYING
 create mode 100644 README.md
 create mode 100644 config-template.json
 rename marketplace-client/src/main/kotlin/{ja/dev => dev/ja}/marketplace/client/KtorMarketplaceClient.kt (91%)
 rename marketplace-client/src/main/kotlin/{ja/dev => dev/ja}/marketplace/client/Marketplace.kt (56%)
 rename marketplace-client/src/main/kotlin/{ja/dev => dev/ja}/marketplace/client/MarketplaceClient.kt (89%)
 rename marketplace-client/src/main/kotlin/{ja/dev => dev/ja}/marketplace/client/YearMonthDay.kt (86%)
 rename marketplace-client/src/main/kotlin/{ja/dev => dev/ja}/marketplace/client/serializers.kt (92%)
 rename marketplace-client/src/main/kotlin/{ja/dev => dev/ja}/marketplace/client/types.kt (90%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/churn/ChurnProcessor.kt (51%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/churn/ChurnResult.kt (74%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/churn/SimpleChurnProcessor.kt (80%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/Amounts.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/DataTable.kt (81%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/LicenseInfo.kt (78%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSink.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSinkFactory.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PaymentAmountTracker.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PluginData.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SaleCalculator.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/SplitAmount.kt (87%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/WithDateRange.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekFactory.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/currentWeek/CurrentWeekTable.kt (58%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeFactory.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/customerType/CustomerTypeTable.kt (83%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/customers/CustomerTable.kt (56%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/customers/CustomerTableFactory.kt (53%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/licenses/LicenseTable.kt (89%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTableFactory.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/overview/CustomerTracker.kt (71%)
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/overview/OverviewTable.kt (70%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTableFactory.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesFactory.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/topCountries/TopCountriesTable.kt (76%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesFactory.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesTable.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTable.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTableFactory.kt
 rename marketplace-data/src/main/kotlin/{ja/dev => dev/ja}/marketplace/data/types.kt (73%)
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryFactory.kt
 create mode 100644 marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryTable.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSink.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSinkFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/WithDateRange.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTableFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTableFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryFactory.kt
 delete mode 100644 marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryTable.kt
 rename marketplace-data/src/test/kotlin/{ja/dev => dev/ja}/marketplace/churn/SimpleChurnProcessorTest.kt (62%)
 rename marketplace-data/src/test/kotlin/{ja/dev => dev/ja}/marketplace/client/YearMonthDayRangeTest.kt (91%)
 create mode 100644 src/main/kotlin/dev/ja/marketplace/Application.kt
 create mode 100644 src/main/kotlin/dev/ja/marketplace/ApplicationConfig.kt
 rename src/main/kotlin/{ja/dev => dev/ja}/marketplace/DefaultPluginPageDefinition.kt (69%)
 rename src/main/kotlin/{ja/dev => dev/ja}/marketplace/MarketplaceStatsServer.kt (64%)
 rename src/main/kotlin/{ja/dev => dev/ja}/marketplace/PluginDataLoader.kt (56%)
 create mode 100644 src/main/kotlin/dev/ja/marketplace/PluginPageDefinition.kt
 delete mode 100644 src/main/kotlin/ja/dev/marketplace/PluginPageDefinition.kt
 create mode 100644 src/main/resources/js/sortable.min.css
 create mode 100644 src/main/resources/js/sortable.min.js

diff --git a/.gitignore b/.gitignore
index e949d22..d05c527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 build/
 .gradle/
-jte-classes/
\ No newline at end of file
+jte-classes/
+/config.json
diff --git a/.idea/copyright/AGPL_3_0.xml b/.idea/copyright/AGPL_3_0.xml
new file mode 100644
index 0000000..3f74a50
--- /dev/null
+++ b/.idea/copyright/AGPL_3_0.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright (c) &amp;#36;originalComment.match(&quot;Copyright \(c\) (\d+)&quot;, 1, &quot;-&quot;, &quot;&amp;#36;today.year&quot;)&amp;#36;today.year Joachim Ansorg.&#10;SPDX-License-Identifier: AGPL-3.0-or-later" />
+    <option name="myName" value="AGPL 3.0" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..8a30f3e
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,47 @@
+<component name="CopyrightManager">
+  <settings default="AGPL 3.0">
+    <LanguageOptions name="BNF">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="BashPro Shell Script">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="CSS">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="DTD">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="Groovy">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="HTML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="JavaScript">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="Properties">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="SPI">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="SVG">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="TypeScript">
+      <option name="fileTypeOverride" value="1" />
+    </LanguageOptions>
+    <LanguageOptions name="XHTML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+    <LanguageOptions name="XML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3614b45..d043efa 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,8 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="gradleHome" value="/usr/share/java/gradle" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 217e5c5..fdf8d99 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
+    <option name="version" value="1.9.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index af01d7a..052a638 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/marketplace-stats.iml" filepath="$PROJECT_DIR$/.idea/modules/marketplace-stats.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/marketplace-stats.main.iml" filepath="$PROJECT_DIR$/.idea/modules/marketplace-stats.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/marketplace-data/marketplace-stats.marketplace-data.main.iml" filepath="$PROJECT_DIR$/.idea/modules/marketplace-data/marketplace-stats.marketplace-data.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/marketplace-data/marketplace-stats.marketplace-data.test.iml" filepath="$PROJECT_DIR$/.idea/modules/marketplace-data/marketplace-stats.marketplace-data.test.iml" />
diff --git a/.idea/modules/marketplace-stats.iml b/.idea/modules/marketplace-stats.iml
new file mode 100644
index 0000000..efcd7d9
--- /dev/null
+++ b/.idea/modules/marketplace-stats.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../.." dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/../../jte-classes" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Application.xml b/.idea/runConfigurations/Application.xml
new file mode 100644
index 0000000..d03ea8b
--- /dev/null
+++ b/.idea/runConfigurations/Application.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Application" type="JetRunConfigurationType" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="dev.ja.marketplace.Application" />
+    <module name="marketplace-stats.main" />
+    <option name="PROGRAM_PARAMETERS" value="$ProjectFileDir$/config.json" />
+    <shortenClasspath name="NONE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..bae94e1
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8046ad0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,15 @@
+# JetBrains Marketplace Statistics
+
+This software provides statistics for paid plugins on the [JetBrains Marketplace](https://plugins.jetbrains.com/).
+
+## Usage
+
+## Development
+
+## License
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE along with this program. If not, see <https://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index b06b880..c2c6202 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,13 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 val ktorVersion: String by project
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.8.21"
-    kotlin("plugin.serialization") version "1.8.21"
+    id("org.jetbrains.kotlin.jvm") version "1.9.0"
+    kotlin("plugin.serialization") version "1.9.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     application
 }
@@ -18,6 +23,8 @@ allprojects {
     }
 
     dependencies {
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0-RC")
+
         implementation("org.apache.logging.log4j:log4j-core:2.20.0")
         implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0")
 
@@ -68,4 +75,12 @@ project(":") {
     application {
         mainClass.set("dev.ja.marketplace.Application")
     }
+
+    tasks {
+        shadowJar {
+            archiveBaseName.set("marketplace-client-all")
+            archiveClassifier.set("")
+            archiveVersion.set("")
+        }
+    }
 }
diff --git a/config-template.json b/config-template.json
new file mode 100644
index 0000000..525d638
--- /dev/null
+++ b/config-template.json
@@ -0,0 +1,4 @@
+{
+  "pluginId": "123456",
+  "apiKey": "marketplace-api-key"
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 9a928e4..acf04e1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,9 @@
-ktorVersion=2.3.0
+#
+# Copyright (c) 2023 Joachim Ansorg.
+# SPDX-License-Identifier: AGPL-3.0-or-later
+#
+
+ktorVersion=2.3.3
 
 #Kotlin
 kotlin.code.style=official
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 42defcc..17a8ddc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/KtorMarketplaceClient.kt b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/KtorMarketplaceClient.kt
similarity index 91%
rename from marketplace-client/src/main/kotlin/ja/dev/marketplace/client/KtorMarketplaceClient.kt
rename to marketplace-client/src/main/kotlin/dev/ja/marketplace/client/KtorMarketplaceClient.kt
index 6d01ac2..04f9ad6 100644
--- a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/KtorMarketplaceClient.kt
+++ b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/KtorMarketplaceClient.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 import io.ktor.client.*
 import io.ktor.client.call.*
@@ -13,7 +18,6 @@ import io.ktor.serialization.kotlinx.json.*
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
-import kotlinx.datetime.Clock
 import kotlinx.serialization.json.Json
 
 class KtorMarketplaceClient(
@@ -58,7 +62,7 @@ class KtorMarketplaceClient(
     }
 
     override suspend fun salesInfo(plugin: PluginId): List<PluginSale> {
-        return salesInfo(plugin, Marketplace.Birthday.rangeTo(Clock.System.now()))
+        return salesInfo(plugin, Marketplace.Birthday.rangeTo(YearMonthDay.now()))
     }
 
     override suspend fun salesInfo(plugin: PluginId, range: YearMonthDayRange): List<PluginSale> {
@@ -71,7 +75,7 @@ class KtorMarketplaceClient(
     }
 
     override suspend fun trialsInfo(plugin: PluginId): List<PluginTrial> {
-        return trialsInfo(plugin, Marketplace.Birthday.rangeTo(Clock.System.now()))
+        return trialsInfo(plugin, Marketplace.Birthday.rangeTo(YearMonthDay.now()))
     }
 
     override suspend fun trialsInfo(plugin: PluginId, range: YearMonthDayRange): List<PluginTrial> {
diff --git a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/Marketplace.kt b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/Marketplace.kt
similarity index 56%
rename from marketplace-client/src/main/kotlin/ja/dev/marketplace/client/Marketplace.kt
rename to marketplace-client/src/main/kotlin/dev/ja/marketplace/client/Marketplace.kt
index d449ac7..f3c3c05 100644
--- a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/Marketplace.kt
+++ b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/Marketplace.kt
@@ -1,12 +1,18 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 import kotlinx.datetime.TimeZone
 
+val MarketplaceTimeZone = TimeZone.of("Europe/Berlin")
+
 object Marketplace {
-    val ServerTimeZone = TimeZone.of("Europe/Berlin")
-    val FeeChangeTimestamp = YearMonthDay(2020, 7, 1)
+    private val FeeChangeTimestamp = YearMonthDay(2020, 7, 1)
+
     val Birthday = YearMonthDay(2019, 6, 25)
-    val LifetimeRange = Birthday.rangeTo(YearMonthDay.now())
 
     fun feeAmount(date: YearMonthDay, amount: Amount): Amount {
         return when {
diff --git a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/MarketplaceClient.kt b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/MarketplaceClient.kt
similarity index 89%
rename from marketplace-client/src/main/kotlin/ja/dev/marketplace/client/MarketplaceClient.kt
rename to marketplace-client/src/main/kotlin/dev/ja/marketplace/client/MarketplaceClient.kt
index bfdb6d1..5960ddc 100644
--- a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/MarketplaceClient.kt
+++ b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/MarketplaceClient.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 interface MarketplaceClient {
     suspend fun pluginInfo(id: PluginId): PluginInfo
diff --git a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/YearMonthDay.kt b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/YearMonthDay.kt
similarity index 86%
rename from marketplace-client/src/main/kotlin/ja/dev/marketplace/client/YearMonthDay.kt
rename to marketplace-client/src/main/kotlin/dev/ja/marketplace/client/YearMonthDay.kt
index bcf2a82..13f9aeb 100644
--- a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/YearMonthDay.kt
+++ b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/YearMonthDay.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 import kotlinx.datetime.*
 import kotlinx.serialization.SerialName
@@ -10,7 +15,7 @@ import java.util.*
 
 @Serializable(with = YearMonthDateSerializer::class)
 data class YearMonthDay(val year: Int, val month: Int, val day: Int) : Comparable<YearMonthDay> {
-    private val instant = LocalDate(year, month, day).atStartOfDayIn(Marketplace.ServerTimeZone)
+    private val instant = LocalDate(year, month, day).atStartOfDayIn(MarketplaceTimeZone)
 
     fun rangeTo(end: YearMonthDay): YearMonthDayRange {
         return YearMonthDayRange(this, end)
@@ -30,9 +35,9 @@ data class YearMonthDay(val year: Int, val month: Int, val day: Int) : Comparabl
 
     fun add(years: Int, months: Int, days: Int): YearMonthDay {
         return of(
-            instant.plus(years, DateTimeUnit.YEAR, Marketplace.ServerTimeZone)
-                .plus(months, DateTimeUnit.MONTH, Marketplace.ServerTimeZone)
-                .plus(days, DateTimeUnit.DAY, Marketplace.ServerTimeZone)
+            instant.plus(years, DateTimeUnit.YEAR, MarketplaceTimeZone)
+                .plus(months, DateTimeUnit.MONTH, MarketplaceTimeZone)
+                .plus(days, DateTimeUnit.DAY, MarketplaceTimeZone)
         )
     }
 
@@ -58,7 +63,7 @@ data class YearMonthDay(val year: Int, val month: Int, val day: Int) : Comparabl
         }
 
         fun of(date: Instant): YearMonthDay {
-            return of(date.toLocalDateTime(Marketplace.ServerTimeZone))
+            return of(date.toLocalDateTime(MarketplaceTimeZone))
         }
     }
 }
@@ -94,10 +99,6 @@ data class YearMonthDayRange(
         }
     }
 
-    fun asIsoStringRange(): String {
-        return "${start.asIsoString()} - ${end.asIsoString()}"
-    }
-
     override fun toString(): String {
         return asIsoStringRange()
     }
@@ -129,10 +130,18 @@ data class YearMonthDayRange(
         return YearMonthDayRange(start.add(years, months, days), end.add(years, months, days))
     }
 
+    fun expandEnd(years: Int, months: Int, days: Int): YearMonthDayRange {
+        return YearMonthDayRange(start, end.add(years, months, days))
+    }
+
+    private fun asIsoStringRange(): String {
+        return "${start.asIsoString()} - ${end.asIsoString()}"
+    }
+
     companion object {
         fun currentWeek(): YearMonthDayRange {
-            val firstDayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek;
-            val firstOfWeek = java.time.LocalDate.now(Marketplace.ServerTimeZone.toJavaZoneId())
+            val firstDayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek
+            val firstOfWeek = java.time.LocalDate.now(MarketplaceTimeZone.toJavaZoneId())
                 .with(TemporalAdjusters.previousOrSame(firstDayOfWeek))
             val lastOfWeek = firstOfWeek.plusDays(6)
             return YearMonthDayRange(YearMonthDay.of(firstOfWeek), YearMonthDay.of(lastOfWeek))
diff --git a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/serializers.kt b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/serializers.kt
similarity index 92%
rename from marketplace-client/src/main/kotlin/ja/dev/marketplace/client/serializers.kt
rename to marketplace-client/src/main/kotlin/dev/ja/marketplace/client/serializers.kt
index cb82f97..c6389c6 100644
--- a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/serializers.kt
+++ b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/serializers.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.IntArraySerializer
diff --git a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/types.kt b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/types.kt
similarity index 90%
rename from marketplace-client/src/main/kotlin/ja/dev/marketplace/client/types.kt
rename to marketplace-client/src/main/kotlin/dev/ja/marketplace/client/types.kt
index b288864..f19cbb5 100644
--- a/marketplace-client/src/main/kotlin/ja/dev/marketplace/client/types.kt
+++ b/marketplace-client/src/main/kotlin/dev/ja/marketplace/client/types.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -21,6 +26,12 @@ fun Amount.withCurrency(currency: Currency): AmountWithCurrency {
     return AmountWithCurrency(this, currency)
 }
 
+interface WithAmounts {
+    val amount: Amount
+    val currency: Currency
+    val amountUSD: Amount
+}
+
 @Serializable
 data class PluginInfo(
     @SerialName("id")
@@ -190,8 +201,23 @@ data class PluginRating(
     @SerialName("meanRating")
     val meanRating: Double,
     @SerialName("votes")
-    val votes: Map<String, Int>,
-)
+    val votes: Map<Int, Int>,
+) {
+    val calculatedRatingValue: Double
+        get() {
+            return (weightedVotesSum + 2.0 * meanRating) / (votesSum + 2.0)
+        }
+
+    private val weightedVotesSum: Int
+        get() {
+            return votes.entries.sumOf { (weight, value) -> weight * value }
+        }
+
+    private val votesSum: Int
+        get() {
+            return votes.values.sum()
+        }
+}
 
 @Serializable
 data class PluginSale(
@@ -201,12 +227,12 @@ data class PluginSale(
     val date: YearMonthDay,
     @SerialName("amount")
     @Serializable(with = AmountSerializer::class)
-    val amount: Amount,
+    override val amount: Amount,
     @SerialName("amountUSD")
     @Serializable(with = AmountSerializer::class)
-    val amountUSD: Amount,
+    override val amountUSD: Amount,
     @SerialName("currency")
-    val currency: Currency,
+    override val currency: Currency,
     @SerialName("period")
     val licensePeriod: LicensePeriod,
     @SerialName("customer")
@@ -215,7 +241,7 @@ data class PluginSale(
     val reseller: ResellerInfo? = null,
     @SerialName("lineItems")
     val lineItems: List<PluginSaleItem>
-) : Comparable<PluginSale> {
+) : Comparable<PluginSale>, WithAmounts {
 
     override fun compareTo(other: PluginSale): Int {
         return date.compareTo(other.date)
@@ -338,4 +364,5 @@ data class PluginTrial(
     override fun compareTo(other: PluginTrial): Int {
         return date.compareTo(other.date)
     }
-}
\ No newline at end of file
+}
+
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/ChurnProcessor.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/ChurnProcessor.kt
similarity index 51%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/ChurnProcessor.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/ChurnProcessor.kt
index 357d4b7..914cc52 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/ChurnProcessor.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/ChurnProcessor.kt
@@ -1,6 +1,11 @@
-package ja.dev.marketplace.churn
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.YearMonthDayRange
+package dev.ja.marketplace.churn
+
+import dev.ja.marketplace.client.YearMonthDayRange
 
 interface ChurnProcessor<ID, T> {
     fun init()
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/ChurnResult.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/ChurnResult.kt
similarity index 74%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/ChurnResult.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/ChurnResult.kt
index 5e2a13a..cd52050 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/ChurnResult.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/ChurnResult.kt
@@ -1,6 +1,11 @@
-package ja.dev.marketplace.churn
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.data.asPercentageValue
+package dev.ja.marketplace.churn
+
+import dev.ja.marketplace.data.asPercentageValue
 
 data class ChurnResult<T>(
     val churnRate: Double,
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/SimpleChurnProcessor.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/SimpleChurnProcessor.kt
similarity index 80%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/SimpleChurnProcessor.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/SimpleChurnProcessor.kt
index fb0b90e..36cf833 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/churn/SimpleChurnProcessor.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/churn/SimpleChurnProcessor.kt
@@ -1,7 +1,12 @@
-package ja.dev.marketplace.churn
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.churn
 
-import ja.dev.marketplace.client.YearMonthDay
-import ja.dev.marketplace.client.YearMonthDayRange
+import dev.ja.marketplace.client.YearMonthDay
+import dev.ja.marketplace.client.YearMonthDayRange
 
 /**
  * Churn rate is calculated as "number of users lost in the date range / users at beginning of the date range".
@@ -9,6 +14,7 @@ import ja.dev.marketplace.client.YearMonthDayRange
 class SimpleChurnProcessor<T>(
     private val previouslyActiveMarkerDate: YearMonthDay,
     private val currentlyActiveMarkerDate: YearMonthDay,
+    private val graceTimeDays: Int,
 ) : ChurnProcessor<Int, T> {
     private val previousPeriodItems = mutableSetOf<Int>()
     private val activeItems = mutableSetOf<Int>()
@@ -22,7 +28,7 @@ class SimpleChurnProcessor<T>(
         }
 
         // valid before end, valid until end or later
-        if (currentlyActiveMarkerDate in validity) {
+        if (currentlyActiveMarkerDate in validity.expandEnd(0, 0, graceTimeDays)) {
             if (isAcceptedValue) {
                 activeItems += id
             } else {
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/Amounts.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/Amounts.kt
new file mode 100644
index 0000000..bc1fb47
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/Amounts.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.Amount
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.client.WithAmounts
+import java.math.BigDecimal
+
+data class Amounts(
+    override val amount: Amount,
+    override val currency: Currency,
+    override val amountUSD: Amount
+) : WithAmounts {
+    companion object {
+        fun zero(currency: Currency) = Amounts(BigDecimal.ZERO, currency, BigDecimal.ZERO)
+    }
+}
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/DataTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/DataTable.kt
similarity index 81%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/DataTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/DataTable.kt
index 9538636..1810147 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/DataTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/DataTable.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.data
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
 
 /**
  * Tabular data calculated based on the Marketplace data.
@@ -15,8 +20,10 @@ interface DataTable {
 
 interface DataTableRow {
     fun getValue(column: DataTableColumn): Any?
+    fun getSortValue(column: DataTableColumn): Long? = null
     fun getTooltip(column: DataTableColumn): String? = null
     val cssClass: String?
+    val htmlId: String?
 }
 
 interface DataRowGroup {
@@ -66,7 +73,9 @@ data class SimpleRowGroup(
 data class SimpleDateTableRow(
     val values: Map<DataTableColumn, Any?>,
     val tooltips: Map<DataTableColumn, String?> = emptyMap(),
-    override val cssClass: String? = null
+    override val cssClass: String? = null,
+    val sortValues: Map<DataTableColumn, Long?> = emptyMap(),
+    override val htmlId: String? = null,
 ) : DataTableRow {
     constructor(vararg values: Pair<DataTableColumn, Any?>) : this(values.toMap())
 
@@ -74,6 +83,10 @@ data class SimpleDateTableRow(
         return values[column]
     }
 
+    override fun getSortValue(column: DataTableColumn): Long? {
+        return sortValues[column]
+    }
+
     override fun getTooltip(column: DataTableColumn): String? {
         return tooltips[column]
     }
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/LicenseInfo.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/LicenseInfo.kt
similarity index 78%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/LicenseInfo.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/LicenseInfo.kt
index 3b91036..1ec5a0e 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/LicenseInfo.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/LicenseInfo.kt
@@ -1,7 +1,12 @@
-package ja.dev.marketplace.data
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
 
-import ja.dev.marketplace.client.*
-import java.math.BigDecimal
+import dev.ja.marketplace.client.*
+import dev.ja.marketplace.client.*
 import java.math.BigInteger
 
 typealias LicenseId = String
@@ -15,16 +20,16 @@ data class LicenseInfo(
     // dates, when this license is valid
     val validity: YearMonthDayRange,
     // amount of this particular license
-    val amount: Amount,
+    override val amount: Amount,
     // currency of Amount
-    val currency: Currency,
+    override val currency: Currency,
     // same as amount, but in USD
-    val amountUSD: Amount,
+    override val amountUSD: Amount,
     // the sale of this particular license purchase, which also contains the saleLineItem
     val sale: PluginSale,
     // the sale line item of this particular license purchase
     val saleLineItem: PluginSaleItem,
-) : WithDateRange, Comparable<LicenseInfo> {
+) : WithDateRange, WithAmounts, Comparable<LicenseInfo> {
 
     override val dateRange: YearMonthDayRange
         get() = validity
@@ -62,7 +67,11 @@ data class LicenseInfo(
                 }
 
                 if (licenses.sumOf { it.amountUSD }.toDouble() != sale.amountUSD.toDouble()) {
-                    println("Sum does not match: $sale. item sum: ${licenses.sumOf { it.amountUSD }.toDouble()}, total: ${sale.amountUSD.toDouble()}")
+                    println(
+                        "Sum does not match: $sale. item sum: ${
+                            licenses.sumOf { it.amountUSD }.toDouble()
+                        }, total: ${sale.amountUSD.toDouble()}"
+                    )
                 }
 
                 licenses.sorted()
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSink.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSink.kt
new file mode 100644
index 0000000..091e0a5
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSink.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.PluginSale
+
+interface MarketplaceDataSink {
+    fun init(data: PluginData) {}
+
+    fun process(sale: PluginSale) {}
+
+    fun process(licenseInfo: LicenseInfo)
+}
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSinkFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSinkFactory.kt
new file mode 100644
index 0000000..7074ef9
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/MarketplaceDataSinkFactory.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.MarketplaceClient
+
+interface MarketplaceDataSinkFactory {
+    fun createTableSink(client: MarketplaceClient): MarketplaceDataSink
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PaymentAmountTracker.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PaymentAmountTracker.kt
new file mode 100644
index 0000000..fbede76
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PaymentAmountTracker.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.Amount
+import dev.ja.marketplace.client.Marketplace
+import dev.ja.marketplace.client.YearMonthDay
+import dev.ja.marketplace.client.YearMonthDayRange
+import java.math.BigDecimal
+
+data class PaymentAmountTracker(val filterDateRange: YearMonthDayRange) {
+    private var _totalAmountUSD: Amount = BigDecimal.ZERO
+    private var _feesUSD: Amount = BigDecimal.ZERO
+
+    val totalAmountUSD: Amount
+        get() {
+            return _totalAmountUSD
+        }
+
+    val feesAmountUSD: Amount
+        get() {
+            return _feesUSD
+        }
+
+    val paidAmountUSD: Amount
+        get() {
+            return _totalAmountUSD - _feesUSD
+        }
+
+    fun add(paymentDate: YearMonthDay, amountUSD: Amount) {
+        if (paymentDate in filterDateRange) {
+            _totalAmountUSD += amountUSD
+            _feesUSD += Marketplace.feeAmount(paymentDate, amountUSD)
+        }
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PluginData.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PluginData.kt
new file mode 100644
index 0000000..4fd85de
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/PluginData.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.*
+import dev.ja.marketplace.client.*
+
+data class PluginData(
+    val pluginId: PluginId,
+    val pluginInfo: PluginInfo,
+    val pluginRating: PluginRating,
+    val sales: List<PluginSale>,
+    val licenses: List<LicenseInfo>,
+    val trials: List<PluginTrial>
+)
+
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SaleCalculator.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SaleCalculator.kt
new file mode 100644
index 0000000..48e019e
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SaleCalculator.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.PluginSaleItemDiscount
+import dev.ja.marketplace.client.WithAmounts
+import java.math.BigDecimal
+
+/**
+ *
+ */
+class SaleCalculator {
+    fun nextSale(licenseInfo: LicenseInfo): WithAmounts {
+        if (licenseInfo.saleLineItem.discountDescriptions.any { it.isFreeLicenseDiscount() }) {
+            return Amounts.zero(licenseInfo.currency)
+        }
+
+
+        val resellerDiscount = licenseInfo.saleLineItem.discountDescriptions
+            .filter { it.isResellerDiscount() }
+            .sumOf { it.percent ?: 0.0 }
+        val continuityDiscount = licenseInfo.saleLineItem.discountDescriptions
+            .firstOrNull { it.isContinuityDiscount() }
+            ?.percent
+        val nextContinuityDiscount = when (continuityDiscount) {
+            null -> 20.0
+            20.0 -> 40.0
+            else -> 40.0
+        }
+
+        val discountFactor = BigDecimal(1.0 * (1.0 - resellerDiscount / 100.0) * (1.0 - nextContinuityDiscount / 100.0))
+        return Amounts(
+            licenseInfo.amount * discountFactor,
+            licenseInfo.currency,
+            licenseInfo.amountUSD * discountFactor
+        )
+    }
+
+    companion object {
+        private fun PluginSaleItemDiscount.isFreeLicenseDiscount(): Boolean {
+            return this.percent == 100.0
+        }
+
+        private fun PluginSaleItemDiscount.isResellerDiscount(): Boolean {
+            return this.description.contains("Reseller discount for 3rd-party plugins")
+        }
+
+        private fun PluginSaleItemDiscount.isContinuityDiscount(): Boolean {
+            return this.description.contains("continuity discount")
+        }
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/SplitAmount.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SplitAmount.kt
similarity index 87%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/SplitAmount.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SplitAmount.kt
index 0519ca0..2498b2d 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/SplitAmount.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/SplitAmount.kt
@@ -1,6 +1,11 @@
-package ja.dev.marketplace.data
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
 
-import ja.dev.marketplace.client.Amount
+import dev.ja.marketplace.client.Amount
 import java.math.BigDecimal
 import java.math.RoundingMode
 
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/WithDateRange.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/WithDateRange.kt
new file mode 100644
index 0000000..666848e
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/WithDateRange.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
+
+import dev.ja.marketplace.client.YearMonthDayRange
+
+interface WithDateRange {
+    val dateRange: YearMonthDayRange
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekFactory.kt
new file mode 100644
index 0000000..aca7672
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekFactory.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.currentWeek
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.currentWeek.CurrentWeekTable
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class CurrentWeekFactory : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return CurrentWeekTable()
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekTable.kt
similarity index 58%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekTable.kt
index e5f547a..df65721 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/currentWeek/CurrentWeekTable.kt
@@ -1,8 +1,14 @@
-package ja.dev.marketplace.data.currentWeek
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.*
-import ja.dev.marketplace.client.Currency
-import ja.dev.marketplace.data.*
+package dev.ja.marketplace.data.currentWeek
+
+import dev.ja.marketplace.client.Amount
+import dev.ja.marketplace.data.*
+import dev.ja.marketplace.client.*
+import dev.ja.marketplace.client.Currency
 import java.math.BigDecimal
 import java.util.*
 
@@ -15,9 +21,9 @@ class CurrentWeekTable : SimpleDataTable("This week", cssClass = "small table-st
 
     override val columns: List<DataTableColumn> = listOf(columnDay, columnTotal)
 
-    override fun init() {
+    override fun init(data: PluginData) {
         dateRange.days().forEach {
-            data[it] = BigDecimal.ZERO
+            this.data[it] = BigDecimal.ZERO
         }
     }
 
@@ -33,24 +39,17 @@ class CurrentWeekTable : SimpleDataTable("This week", cssClass = "small table-st
         get() {
             val now = YearMonthDay.now()
             val rows = data.entries.map { (date, totalAmount) ->
-                object : DataTableRow {
-                    override val cssClass: String?
-                        get() {
-                            return when {
-                                date == now -> "today"
-                                date > now -> "future"
-                                else -> null
-                            }
-                        }
-
-                    override fun getValue(column: DataTableColumn): Any? {
-                        return when (column) {
-                            columnDay -> date
-                            columnTotal -> totalAmount.withCurrency(Currency.USD)
-                            else -> null
-                        }
+                SimpleDateTableRow(
+                    mapOf(
+                        columnDay to date,
+                        columnTotal to totalAmount.withCurrency(Currency.USD)
+                    ),
+                    cssClass = when {
+                        date == now -> "today"
+                        date > now -> "future"
+                        else -> null
                     }
-                }
+                )
             }
 
             return listOf(
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeFactory.kt
new file mode 100644
index 0000000..4affe2b
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeFactory.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.customerType
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class CustomerTypeFactory : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return CustomerTypeTable()
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeTable.kt
similarity index 83%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeTable.kt
index fe6cca0..f08e1de 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customerType/CustomerTypeTable.kt
@@ -1,10 +1,15 @@
-package ja.dev.marketplace.data.customerType
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.Amount
-import ja.dev.marketplace.client.Currency
-import ja.dev.marketplace.client.CustomerType
-import ja.dev.marketplace.client.withCurrency
-import ja.dev.marketplace.data.*
+package dev.ja.marketplace.data.customerType
+
+import dev.ja.marketplace.data.*
+import dev.ja.marketplace.client.Amount
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.client.CustomerType
+import dev.ja.marketplace.client.withCurrency
 import java.math.BigDecimal
 import java.util.*
 
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customers/CustomerTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customers/CustomerTable.kt
similarity index 56%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customers/CustomerTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customers/CustomerTable.kt
index fe38080..b63c039 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customers/CustomerTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customers/CustomerTable.kt
@@ -1,13 +1,23 @@
-package ja.dev.marketplace.data.customers
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.*
-import ja.dev.marketplace.client.LicenseId
-import ja.dev.marketplace.data.*
+package dev.ja.marketplace.data.customers
+
+import dev.ja.marketplace.client.Amount
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.client.CustomerInfo
+import dev.ja.marketplace.data.*
+import dev.ja.marketplace.client.*
+import dev.ja.marketplace.client.LicenseId
 
 class CustomerTable(val licenseFilter: (LicenseInfo) -> Boolean) :
     SimpleDataTable("Customers", cssClass = "section-wide"), MarketplaceDataSink {
     private val customers = mutableSetOf<CustomerInfo>()
     private val latestLicenseValid = mutableMapOf<CustomerInfo, YearMonthDay>()
+    private val customerSalesActive = mutableMapOf<CustomerInfo, Amount>()
+    private val customerSalesNext = mutableMapOf<CustomerInfo, Amount>()
     private val customerSales = mutableMapOf<CustomerInfo, Amount>()
     private val activeLicenses = mutableMapOf<CustomerInfo, MutableSet<LicenseId>>()
 
@@ -15,16 +25,36 @@ class CustomerTable(val licenseFilter: (LicenseInfo) -> Boolean) :
     private val columnName = DataTableColumn("customer-name", "Name")
     private val columnCountry = DataTableColumn("customer-country", "Country")
     private val columnType = DataTableColumn("customer-type", "Type")
-    private val columnSales = DataTableColumn("customer-type", "Total Sales", "num")
+    private val columnActiveSales = DataTableColumn("sales-active", "Act. Sales", "num")
+    private val columnNextSale = DataTableColumn("sales-next", "Next Sale", "num")
+    private val columnSales = DataTableColumn("sales-total", "Total Sales", "num")
     private val columnActiveLicenses = DataTableColumn("customer-licenses", "Active Licenses", "num")
     private val columnId = DataTableColumn("customer-id", "Cust. ID", "num")
 
+    private val salesCalculator = SaleCalculator()
+
     override val columns: List<DataTableColumn> = listOf(
-        columnValidUntil, columnName, columnCountry, columnType, columnSales, columnActiveLicenses, columnId
+        columnValidUntil,
+        columnName,
+        columnCountry,
+        columnType,
+        columnActiveSales,
+        columnNextSale,
+        columnSales,
+        columnActiveLicenses,
+        columnId
     )
 
     override fun process(licenseInfo: LicenseInfo) {
         val customer = licenseInfo.sale.customer
+
+        if (YearMonthDay.now() in licenseInfo.dateRange) {
+            customerSalesActive.merge(customer, licenseInfo.amountUSD) { a, b -> a + b }
+            customerSalesNext.merge(customer, licenseInfo.amountUSD) { a, _ ->
+                a + salesCalculator.nextSale(licenseInfo).amountUSD
+            }
+        }
+
         customerSales.merge(customer, licenseInfo.amountUSD) { a, b -> a + b }
         latestLicenseValid.merge(customer, licenseInfo.validity.end, ::maxOf)
         activeLicenses.computeIfAbsent(customer) { mutableSetOf() } += licenseInfo.id
@@ -50,11 +80,18 @@ class CustomerTable(val licenseFilter: (LicenseInfo) -> Boolean) :
                         columnName to customer.name,
                         columnCountry to customer.country,
                         columnType to customer.type,
-                        columnSales to customerSales[customer]!!.withCurrency(Currency.USD),
+                        columnActiveSales to customerSalesActive[customer]?.withCurrency(Currency.USD),
+                        columnNextSale to customerSalesNext[customer]?.withCurrency(Currency.USD),
+                        columnSales to customerSales[customer]?.withCurrency(Currency.USD),
                         columnActiveLicenses to activeLicenses[customer]!!.size,
                         columnValidUntil to latestValid
                     ),
-                    cssClass = cssClass
+                    cssClass = cssClass,
+                    sortValues = mapOf(
+                        columnActiveSales to customerSalesActive[customer]?.sortValue(),
+                        columnNextSale to customerSalesNext[customer]?.sortValue(),
+                        columnSales to customerSales[customer]?.sortValue(),
+                    ),
                 )
             }
             val footer = SimpleRowGroup(SimpleDateTableRow(columnName to "${sortedByValidity.size} customers"))
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customers/CustomerTableFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customers/CustomerTableFactory.kt
similarity index 53%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customers/CustomerTableFactory.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customers/CustomerTableFactory.kt
index 838b765..35df219 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customers/CustomerTableFactory.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/customers/CustomerTableFactory.kt
@@ -1,9 +1,15 @@
-package ja.dev.marketplace.data.customers
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.client.YearMonthDay
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
+package dev.ja.marketplace.data.customers
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.client.YearMonthDay
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.customers.CustomerTable
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
 
 class CustomerTableFactory : MarketplaceDataSinkFactory {
     override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTable.kt
similarity index 89%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTable.kt
index 37715cb..f091eb9 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTable.kt
@@ -1,8 +1,13 @@
-package ja.dev.marketplace.data.licenses
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.Currency
-import ja.dev.marketplace.client.withCurrency
-import ja.dev.marketplace.data.*
+package dev.ja.marketplace.data.licenses
+
+import dev.ja.marketplace.data.*
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.client.withCurrency
 
 class LicenseTable : SimpleDataTable("Licenses", "licenses", "section-wide"), MarketplaceDataSink {
     private val columnLicenseId = DataTableColumn("license-id", "License ID")
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTableFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTableFactory.kt
new file mode 100644
index 0000000..2817fd2
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/licenses/LicenseTableFactory.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.licenses
+
+import dev.ja.marketplace.data.licenses.LicenseTable
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class LicenseTableFactory : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return LicenseTable()
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/CustomerTracker.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/CustomerTracker.kt
similarity index 71%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/CustomerTracker.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/CustomerTracker.kt
index a271332..4848f16 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/CustomerTracker.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/CustomerTracker.kt
@@ -1,8 +1,13 @@
-package ja.dev.marketplace.data.overview
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.CustomerInfo
-import ja.dev.marketplace.client.YearMonthDayRange
-import ja.dev.marketplace.data.LicenseInfo
+package dev.ja.marketplace.data.overview
+
+import dev.ja.marketplace.client.CustomerInfo
+import dev.ja.marketplace.client.YearMonthDayRange
+import dev.ja.marketplace.data.LicenseInfo
 
 class CustomerTracker<T>(private val dateRange: YearMonthDayRange) {
     private val segmentedCustomers = mutableMapOf<T, MutableSet<CustomerInfo>>()
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTable.kt
similarity index 70%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTable.kt
index 246ace8..c4782f6 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTable.kt
@@ -1,25 +1,31 @@
-package ja.dev.marketplace.data.overview
-
-import ja.dev.marketplace.churn.ChurnProcessor
-import ja.dev.marketplace.churn.SimpleChurnProcessor
-import ja.dev.marketplace.client.*
-import ja.dev.marketplace.client.Currency
-import ja.dev.marketplace.data.*
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.overview
+
+import dev.ja.marketplace.churn.ChurnProcessor
+import dev.ja.marketplace.churn.SimpleChurnProcessor
+import dev.ja.marketplace.client.*
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.data.*
 import java.math.BigDecimal
 import java.util.*
 
-class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"), MarketplaceDataSink {
+class OverviewTable(private val graceTimeDays: Int = 7) : SimpleDataTable("Overview", "overview", "table-striped"),
+    MarketplaceDataSink {
     private data class MonthData(
         val year: Int,
         val month: Int,
         val customers: CustomerTracker<LicensePeriod>,
+        val amounts: PaymentAmountTracker,
         val churnAnnualLicenses: ChurnProcessor<Int, CustomerInfo>,
         val churnMonthlyLicenses: ChurnProcessor<Int, CustomerInfo>,
-        var amountUSD: Amount = BigDecimal.ZERO,
     ) {
         val isEmpty: Boolean
             get() {
-                return amountUSD.toDouble() == 0.0
+                return amounts.totalAmountUSD == BigDecimal.ZERO
             }
     }
 
@@ -35,10 +41,14 @@ class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"),
             }
     }
 
+    private lateinit var trialData: List<PluginTrial>
+
     private val years = TreeMap<Int, YearData>()
 
     private val columnYearMonth = DataTableColumn("month", null)
-    private val columnAmountUSD = DataTableColumn("sales", "Sales", "num")
+    private val columnAmountTotalUSD = DataTableColumn("sales", "Total Sales", "num")
+    private val columnAmountFeesUSD = DataTableColumn("sales", "Fees", "num")
+    private val columnAmountPaidUSD = DataTableColumn("sales", "Paid", "num")
     private val columnActiveCustomers = DataTableColumn(
         "customer-count", "Cust.", "num", tooltip = "Customers at the end of month"
     )
@@ -48,17 +58,25 @@ class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"),
     private val columnMonthlyChurn = DataTableColumn(
         "churn-monthly", "Monthly", "num num-percentage", tooltip = "Churn of monthly licenses"
     )
+    private val columnTrials = DataTableColumn(
+        "trials", "Trials", "num ", tooltip = "Number of new trials at the end of the month"
+    )
 
     override val columns: List<DataTableColumn> = listOf(
         columnYearMonth,
-        columnAmountUSD,
+        columnAmountTotalUSD,
+        columnAmountFeesUSD,
+        columnAmountPaidUSD,
         columnActiveCustomers,
         columnAnnualChurn,
-        columnMonthlyChurn
+        columnMonthlyChurn,
+        columnTrials,
     )
 
-    override fun init() {
+    override fun init(data: PluginData) {
         val now = YearMonthDay.now()
+        this.trialData = data.trials
+
         for (year in Marketplace.Birthday.year..now.year) {
             val monthRange = when (year) {
                 now.year -> 1..now.month
@@ -69,27 +87,37 @@ class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"),
                 val currentMonth = YearMonthDayRange.ofMonth(year, month)
                 val churnDate = currentMonth.end
                 val activeDate = churnDate.add(0, -1, 0)
-                val churnAnnualCustomers = SimpleChurnProcessor<CustomerInfo>(activeDate, churnDate)
+                val churnAnnualCustomers = SimpleChurnProcessor<CustomerInfo>(activeDate, churnDate, graceTimeDays)
                 churnAnnualCustomers.init()
 
-                val churnMonthlyCustomers = SimpleChurnProcessor<CustomerInfo>(activeDate, churnDate)
+                val churnMonthlyCustomers = SimpleChurnProcessor<CustomerInfo>(activeDate, churnDate, graceTimeDays)
                 churnMonthlyCustomers.init()
 
-                MonthData(year, month, CustomerTracker(currentMonth), churnAnnualCustomers, churnMonthlyCustomers)
+                val activeCustomerRange = when {
+                    YearMonthDay.now() in currentMonth -> currentMonth.copy(end = YearMonthDay.now())
+                    else -> currentMonth
+                }
+                MonthData(
+                    year,
+                    month,
+                    CustomerTracker(activeCustomerRange),
+                    PaymentAmountTracker(currentMonth),
+                    churnAnnualCustomers,
+                    churnMonthlyCustomers
+                )
             }
 
             // annual churn
-            val yearRange = YearMonthDayRange.ofYear(year)
-            val previousYear = YearMonthDayRange.ofYear(year - 1)
-            val actualYearRange = when (now) {
-                in yearRange -> YearMonthDayRange(YearMonthDay(year, 1, 1), now)
-                else -> yearRange
+            val churnDate = when (now.year) {
+                year -> now
+                else -> YearMonthDay(year, 12, 31)
             }
+            val activeDate = YearMonthDay(year - 1, 12, 31)
 
-            val churnAnnualCustomers = SimpleChurnProcessor<CustomerInfo>(previousYear.end, actualYearRange.end)
+            val churnAnnualCustomers = SimpleChurnProcessor<CustomerInfo>(activeDate, churnDate, graceTimeDays)
             churnAnnualCustomers.init()
 
-            val churnMonthlyCustomers = SimpleChurnProcessor<CustomerInfo>(previousYear.end, actualYearRange.end)
+            val churnMonthlyCustomers = SimpleChurnProcessor<CustomerInfo>(activeDate, churnDate, graceTimeDays)
             churnMonthlyCustomers.init()
 
             years[year] = YearData(year, churnAnnualCustomers, churnMonthlyCustomers, months)
@@ -97,7 +125,8 @@ class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"),
     }
 
     override fun process(sale: PluginSale) {
-        years[sale.date.year]!!.months[sale.date.month]!!.amountUSD += sale.amountUSD
+        val monthData = years[sale.date.year]!!.months[sale.date.month]!!
+        monthData.amounts.add(sale.date, sale.amountUSD)
     }
 
     override fun process(licenseInfo: LicenseInfo) {
@@ -161,13 +190,18 @@ class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"),
                         val monthlyCustomers = monthData.customers.segmentCustomerCount(LicensePeriod.Monthly)
                         val totalCustomers = monthData.customers.totalCustomerCount
 
+                        val trialCount = trialData.count { it.date.year == year && it.date.month == month }
+
                         SimpleDateTableRow(
                             values = mapOf(
                                 columnYearMonth to String.format("%02d-%02d", year, month),
                                 columnActiveCustomers to totalCustomers,
-                                columnAmountUSD to monthData.amountUSD.withCurrency(Currency.USD),
+                                columnAmountTotalUSD to monthData.amounts.totalAmountUSD.withCurrency(Currency.USD),
+                                columnAmountFeesUSD to monthData.amounts.feesAmountUSD.withCurrency(Currency.USD),
+                                columnAmountPaidUSD to monthData.amounts.paidAmountUSD.withCurrency(Currency.USD),
                                 columnAnnualChurn to annualChurnRate,
                                 columnMonthlyChurn to monthlyChurnRate,
+                                columnTrials to trialCount.let { if (it > 0) it else "—" },
                             ),
                             tooltips = mapOf(
                                 columnActiveCustomers to "$annualCustomers annual, $monthlyCustomers monthly",
@@ -187,7 +221,8 @@ class OverviewTable : SimpleDataTable("Overview", "overview", "table-striped"),
                             SimpleDateTableRow(
                                 values = mapOf(
                                     columnAnnualChurn to yearAnnualChurnResult.renderedChurnRate,
-                                    columnMonthlyChurn to yearMonthlyChurnResult.renderedChurnRate
+                                    columnMonthlyChurn to yearMonthlyChurnResult.renderedChurnRate,
+                                    columnTrials to trialData.count { it.date.year == year },
                                 ),
                                 tooltips = mapOf(
                                     columnAnnualChurn to yearAnnualChurnResult.churnRateTooltip,
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTableFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTableFactory.kt
new file mode 100644
index 0000000..ed7dfc0
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/overview/OverviewTableFactory.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.overview
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+import dev.ja.marketplace.data.overview.OverviewTable
+
+class OverviewTableFactory : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return OverviewTable()
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesFactory.kt
new file mode 100644
index 0000000..86a97e6
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesFactory.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.topCountries
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class TopCountriesFactory(private val maxCountries: Int = 10) : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return TopCountriesTable(maxCountries)
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesTable.kt
similarity index 76%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesTable.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesTable.kt
index 66a738e..6e74da4 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesTable.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topCountries/TopCountriesTable.kt
@@ -1,15 +1,22 @@
-package ja.dev.marketplace.data.topCountries
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.Amount
-import ja.dev.marketplace.client.Country
-import ja.dev.marketplace.client.Currency
-import ja.dev.marketplace.client.withCurrency
-import ja.dev.marketplace.data.*
+package dev.ja.marketplace.data.topCountries
+
+import dev.ja.marketplace.client.Amount
+import dev.ja.marketplace.client.Country
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.client.withCurrency
+import dev.ja.marketplace.data.*
 import java.math.BigDecimal
 import java.util.*
 
-class TopCountriesTable(private val maxItems: Int = 10) : SimpleDataTable("Top Countries", "top-countries"),
+class TopCountriesTable(private val maxItems: Int = 10) :
+    SimpleDataTable(if (maxItems != Int.MAX_VALUE) "Top Countries" else "Countries", "top-countries"),
     MarketplaceDataSink {
+
     private val columnCountry = DataTableColumn("country", null)
     private val columnSales = DataTableColumn("sales", null, "num")
     private val columnSalesPercentage = DataTableColumn("sales", "% of Sales", "num num-percentage")
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesFactory.kt
new file mode 100644
index 0000000..bdb8f16
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesFactory.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.topTrialCountries
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class TopTrialCountriesFactory(private val maxCountries: Int = 10) : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return TopTrialCountriesTable(maxCountries)
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesTable.kt
new file mode 100644
index 0000000..42b3dbc
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/topTrialCountries/TopTrialCountriesTable.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.topTrialCountries
+
+import dev.ja.marketplace.data.*
+import dev.ja.marketplace.client.Country
+import java.math.BigDecimal
+import java.util.*
+
+class TopTrialCountriesTable(private val maxItems: Int = 10) :
+    SimpleDataTable("Top Trial Countries", "top-trial-countries"),
+    MarketplaceDataSink {
+    private val columnCountry = DataTableColumn("country", null)
+    private val columnTrialCount = DataTableColumn("trials", null, "num")
+    private val columnTrialsPercentage = DataTableColumn("trials", "% of Trials", "num num-percentage")
+
+    private val data = TreeMap<Country, Int>()
+
+    override val columns: List<DataTableColumn> = listOf(columnCountry, columnTrialCount, columnTrialsPercentage)
+
+    override fun init(data: PluginData) {
+        data.trials.forEach { trial ->
+            if (trial.customer.country.isNotBlank()) {
+                this.data.merge(trial.customer.country, 1, Int::plus)
+            }
+        }
+    }
+
+    override fun process(licenseInfo: LicenseInfo) {
+        // empty
+    }
+
+    override val sections: List<DataTableSection>
+        get() {
+            val totalTrialCount = data.values.sumOf { it }
+            val rows = data.entries
+                .sortedByDescending { it.value }
+                .take(maxItems)
+                .map { (country, trialCount) ->
+                    SimpleDateTableRow(
+                        columnCountry to country,
+                        columnTrialCount to trialCount,
+                        columnTrialsPercentage to PercentageValue.of(
+                            BigDecimal(trialCount),
+                            BigDecimal(totalTrialCount)
+                        )
+                    )
+                }
+
+            return listOf(
+                SimpleTableSection(
+                    rows, footer = SimpleTableSection(
+                        SimpleDateTableRow(
+                            columnCountry to "${data.size} countries",
+                            columnTrialsPercentage to PercentageValue(BigDecimal(100.0))
+                        )
+                    )
+                )
+            )
+        }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTable.kt
new file mode 100644
index 0000000..1ac6322
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTable.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.trials
+
+import dev.ja.marketplace.client.Country
+import dev.ja.marketplace.client.PluginTrial
+import dev.ja.marketplace.client.YearMonthDay
+import dev.ja.marketplace.data.*
+import java.util.*
+
+class TrialsTable : SimpleDataTable("Trials", "trials"), MarketplaceDataSink {
+    private val columnDate = DataTableColumn("trial-date", "Date", "date")
+    private val columnRefId = DataTableColumn("trial-id", "ID", "num")
+    private val columnCustomer = DataTableColumn("trial-customer", "Customer")
+    private val columnCustomerType = DataTableColumn("trial-type", "Type")
+    private val columnCustomerCountry = DataTableColumn("trial-country", "Country")
+
+    private val trialData = TreeMap<YearMonthDay, List<PluginTrial>>()
+
+    override fun init(data: PluginData) {
+        data.trials.forEach {
+            trialData.merge(it.date, listOf(it)) { a, b -> a + b }
+        }
+    }
+
+    override fun process(licenseInfo: LicenseInfo) {
+        // empty
+    }
+
+    override val columns: List<DataTableColumn> = listOf(
+        columnDate,
+        columnCustomer,
+        columnCustomerType,
+        columnCustomerCountry,
+        columnRefId
+    )
+
+    override val sections: List<DataTableSection>
+        get() {
+            val today = YearMonthDay.now()
+
+            val rows = mutableListOf<SimpleDateTableRow>()
+            for ((day, trials) in trialData.entries.reversed()) {
+                var first = true
+                for (trial in trials) {
+                    rows += SimpleDateTableRow(
+                        values = mapOf(
+                            columnDate to if (first) day else null,
+                            columnRefId to trial.referenceId,
+                            columnCustomer to trial.customer.name,
+                            columnCustomerType to trial.customer.type,
+                            columnCustomerCountry to trial.customer.country.takeIf(Country::isNotBlank),
+                        ),
+                        htmlId = if (day == today) "today" else null,
+                    )
+
+                    first = false
+                }
+            }
+            return listOf(SimpleTableSection(rows))
+        }
+}
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTableFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTableFactory.kt
new file mode 100644
index 0000000..9db0f5d
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/trials/TrialsTableFactory.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.trials
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class TrialsTableFactory : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return TrialsTable()
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/types.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/types.kt
similarity index 73%
rename from marketplace-data/src/main/kotlin/ja/dev/marketplace/data/types.kt
rename to marketplace-data/src/main/kotlin/dev/ja/marketplace/data/types.kt
index 7cd25f9..53edad2 100644
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/types.kt
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/types.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.data
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data
 
 import java.math.BigDecimal
 import java.math.RoundingMode
@@ -19,4 +24,8 @@ fun Double.asPercentageValue(multiply: Boolean = true): PercentageValue? {
         multiply -> PercentageValue(BigDecimal.valueOf(this * 100.0))
         else -> PercentageValue(BigDecimal.valueOf(this))
     }
+}
+
+fun BigDecimal.sortValue(): Long {
+    return setScale(2, RoundingMode.HALF_UP).unscaledValue().toLong()
 }
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryFactory.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryFactory.kt
new file mode 100644
index 0000000..621a336
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryFactory.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.yearSummary
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.data.MarketplaceDataSink
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
+
+class YearlySummaryFactory : MarketplaceDataSinkFactory {
+    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
+        return YearlySummaryTable()
+    }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryTable.kt b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryTable.kt
new file mode 100644
index 0000000..1e311c4
--- /dev/null
+++ b/marketplace-data/src/main/kotlin/dev/ja/marketplace/data/yearSummary/YearlySummaryTable.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.data.yearSummary
+
+import dev.ja.marketplace.client.Currency
+import dev.ja.marketplace.client.PluginSale
+import dev.ja.marketplace.client.YearMonthDayRange
+import dev.ja.marketplace.client.withCurrency
+import dev.ja.marketplace.data.*
+import java.util.*
+
+class YearlySummaryTable : SimpleDataTable("Years", "years", "section-wide"), MarketplaceDataSink {
+    private val data = TreeMap<Int, YearSummary>()
+
+    private data class YearSummary(
+        val sales: PaymentAmountTracker,
+        var downloads: Int = 0,
+    )
+
+    override fun process(sale: PluginSale) {
+        val yearData = data.computeIfAbsent(sale.date.year) {
+            YearSummary(PaymentAmountTracker(YearMonthDayRange.ofYear(sale.date.year)))
+        }
+        yearData.sales.add(sale.date, sale.amountUSD)
+    }
+
+    override fun process(licenseInfo: LicenseInfo) {}
+
+    private val columnYear = DataTableColumn("year", null)
+    private val columnSalesTotal = DataTableColumn("sales", "Sales Total", "num")
+    private val columnSalesFees = DataTableColumn("fees", "Fees", "num")
+    private val columnSalesPaid = DataTableColumn("paid", "Paid", "num")
+
+    override val columns: List<DataTableColumn> = listOf(
+        columnYear,
+        columnSalesTotal,
+        columnSalesFees,
+        columnSalesPaid,
+    )
+
+    override val sections: List<DataTableSection>
+        get() {
+            val rows = data.entries.map { (year, value) ->
+                SimpleDateTableRow(
+                    columnYear to year,
+                    columnSalesTotal to value.sales.totalAmountUSD.withCurrency(Currency.USD),
+                    columnSalesFees to value.sales.feesAmountUSD.withCurrency(Currency.USD),
+                    columnSalesPaid to value.sales.paidAmountUSD.withCurrency(Currency.USD)
+                )
+            }
+
+            return listOf(
+                SimpleTableSection(
+                    rows, footer = SimpleTableSection(
+                        SimpleDateTableRow(
+                            columnSalesTotal to data.values.sumOf { it.sales.totalAmountUSD }
+                                .withCurrency(Currency.USD),
+                            columnSalesFees to data.values.sumOf { it.sales.feesAmountUSD }.withCurrency(Currency.USD),
+                            columnSalesPaid to data.values.sumOf { it.sales.paidAmountUSD }.withCurrency(Currency.USD),
+                        )
+                    )
+                )
+            )
+        }
+}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSink.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSink.kt
deleted file mode 100644
index 33a9c39..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSink.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data
-
-import ja.dev.marketplace.client.PluginSale
-
-interface MarketplaceDataSink {
-    fun init() {}
-
-    fun process(sale: PluginSale) {}
-
-    fun process(licenseInfo: LicenseInfo)
-}
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSinkFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSinkFactory.kt
deleted file mode 100644
index 4ebc4e0..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/MarketplaceDataSinkFactory.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package ja.dev.marketplace.data
-
-import ja.dev.marketplace.client.MarketplaceClient
-
-interface MarketplaceDataSinkFactory {
-    fun createTableSink(client: MarketplaceClient): MarketplaceDataSink
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/WithDateRange.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/WithDateRange.kt
deleted file mode 100644
index 0e68d7d..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/WithDateRange.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package ja.dev.marketplace.data
-
-import ja.dev.marketplace.client.YearMonthDayRange
-
-interface WithDateRange {
-    val dateRange: YearMonthDayRange
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekFactory.kt
deleted file mode 100644
index 57d373e..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/currentWeek/CurrentWeekFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data.currentWeek
-
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
-
-class CurrentWeekFactory: MarketplaceDataSinkFactory {
-    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
-        return CurrentWeekTable()
-    }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeFactory.kt
deleted file mode 100644
index 9ea8052..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/customerType/CustomerTypeFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data.customerType
-
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
-
-class CustomerTypeFactory : MarketplaceDataSinkFactory {
-    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
-        return CustomerTypeTable()
-    }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTableFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTableFactory.kt
deleted file mode 100644
index 01d3e19..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/licenses/LicenseTableFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data.licenses
-
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
-
-class LicenseTableFactory: MarketplaceDataSinkFactory {
-    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
-        return LicenseTable()
-    }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTableFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTableFactory.kt
deleted file mode 100644
index bbb37dd..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/overview/OverviewTableFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data.overview
-
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
-
-class OverviewTableFactory : MarketplaceDataSinkFactory {
-    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
-        return OverviewTable()
-    }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesFactory.kt
deleted file mode 100644
index 6793fb2..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/topCountries/TopCountriesFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data.topCountries
-
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
-
-class TopCountriesFactory(private val maxCountries: Int = 10) : MarketplaceDataSinkFactory {
-    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
-        return TopCountriesTable(maxCountries)
-    }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryFactory.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryFactory.kt
deleted file mode 100644
index be6a5b3..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryFactory.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ja.dev.marketplace.data.yearSummary
-
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.MarketplaceDataSink
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
-
-class YearlySummaryFactory : MarketplaceDataSinkFactory {
-    override fun createTableSink(client: MarketplaceClient): MarketplaceDataSink {
-        return YearlySummaryTable()
-    }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryTable.kt b/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryTable.kt
deleted file mode 100644
index 1834644..0000000
--- a/marketplace-data/src/main/kotlin/ja/dev/marketplace/data/yearSummary/YearlySummaryTable.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-package ja.dev.marketplace.data.yearSummary
-
-import ja.dev.marketplace.client.*
-import ja.dev.marketplace.client.Currency
-import ja.dev.marketplace.data.*
-import java.util.*
-
-class YearlySummaryTable : SimpleDataTable("Years", "years", "section-wide"), MarketplaceDataSink {
-    private val data = TreeMap<Int, YearSummary>()
-
-    private data class YearSummary(
-        val salesTotal: Amount = Amount(0),
-        val sales: Amount = Amount(0),
-        val fees: Amount = Amount(0),
-        val paid: Amount = Amount(0),
-        val downloads: Int = 0,
-    )
-
-    override fun process(sale: PluginSale) {
-        data.compute(sale.date.year) { _, value ->
-            val previous = value ?: YearSummary()
-            previous.copy(
-                salesTotal = previous.salesTotal + sale.amountUSD,
-            )
-        }
-    }
-
-    override fun process(licenseInfo: LicenseInfo) {
-        data.compute(licenseInfo.sale.date.year) { _, value ->
-            val totalAmount = licenseInfo.amountUSD
-            val feeAmount = Marketplace.feeAmount(licenseInfo.sale.date, totalAmount)
-            val paidAmount = totalAmount - feeAmount
-
-            val previous = value ?: YearSummary()
-            previous.copy(
-                sales = previous.sales + totalAmount,
-                fees = previous.fees + feeAmount,
-                paid = previous.paid + paidAmount,
-            )
-        }
-    }
-
-    private val columnYear = DataTableColumn("year", null)
-    private val columnSalesTotal = DataTableColumn("salesTotal", "Sales (OLD)", "num")
-    private val columnSales = DataTableColumn("sales", "Sales", "num")
-    private val columnFees = DataTableColumn("fees", "Fees", "num")
-    private val columnPaid = DataTableColumn("paid", "Paid Out", "num")
-
-    override val columns: List<DataTableColumn> = listOf(
-        columnYear,
-        columnSalesTotal,
-        columnSales,
-        columnFees,
-        columnPaid,
-    )
-
-    override val sections: List<DataTableSection>
-        get() {
-            val rows = data.entries.map { (year, value) ->
-                SimpleDateTableRow(
-                    columnYear to year,
-                    columnSalesTotal to value.salesTotal.withCurrency(Currency.USD),
-                    columnSales to value.sales.withCurrency(Currency.USD),
-                    columnFees to value.fees.withCurrency(Currency.USD),
-                    columnPaid to value.paid.withCurrency(Currency.USD)
-                )
-            }
-
-            return listOf(
-                SimpleTableSection(
-                    rows, footer = SimpleTableSection(
-                        SimpleDateTableRow(
-                            columnSalesTotal to data.values.sumOf(YearSummary::salesTotal).withCurrency(Currency.USD),
-                            columnSales to data.values.sumOf(YearSummary::sales).withCurrency(Currency.USD),
-                            columnFees to data.values.sumOf(YearSummary::fees).withCurrency(Currency.USD),
-                            columnPaid to data.values.sumOf(YearSummary::paid).withCurrency(Currency.USD),
-                        )
-                    )
-                )
-            )
-        }
-}
\ No newline at end of file
diff --git a/marketplace-data/src/test/kotlin/ja/dev/marketplace/churn/SimpleChurnProcessorTest.kt b/marketplace-data/src/test/kotlin/dev/ja/marketplace/churn/SimpleChurnProcessorTest.kt
similarity index 62%
rename from marketplace-data/src/test/kotlin/ja/dev/marketplace/churn/SimpleChurnProcessorTest.kt
rename to marketplace-data/src/test/kotlin/dev/ja/marketplace/churn/SimpleChurnProcessorTest.kt
index 2108c45..a9a9e50 100644
--- a/marketplace-data/src/test/kotlin/ja/dev/marketplace/churn/SimpleChurnProcessorTest.kt
+++ b/marketplace-data/src/test/kotlin/dev/ja/marketplace/churn/SimpleChurnProcessorTest.kt
@@ -1,30 +1,35 @@
-package ja.dev.marketplace.churn
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.YearMonthDay
-import ja.dev.marketplace.client.YearMonthDayRange
-import org.junit.jupiter.api.Assertions.assertEquals
+package dev.ja.marketplace.churn
+
+import dev.ja.marketplace.client.YearMonthDay
+import dev.ja.marketplace.client.YearMonthDayRange
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
 class SimpleChurnProcessorTest {
     @Test
     fun noChurn() {
-        val churnDate =YearMonthDay(2023, 5, 31)
-        val processor = SimpleChurnProcessor<String>(churnDate.add(0,-1,0), churnDate)
+        val churnDate = YearMonthDay(2023, 5, 31)
+        val processor = SimpleChurnProcessor<String>(churnDate.add(0, -1, 0), churnDate, 7)
         processor.init()
 
         processor.processValue(1, "a1", YearMonthDayRange(YearMonthDay(2023, 4, 10), YearMonthDay(2023, 5, 9)), true)
         processor.processValue(1, "a2", YearMonthDayRange(YearMonthDay(2023, 5, 10), YearMonthDay(2023, 6, 10)), true)
 
         val result = processor.getResult()
-        assertEquals(0, result.churnedItemCount)
-        assertEquals(1, result.activeItemCount)
-        assertEquals(0.0, result.churnRate)
+        Assertions.assertEquals(0, result.churnedItemCount)
+        Assertions.assertEquals(1, result.activeItemCount)
+        Assertions.assertEquals(0.0, result.churnRate)
     }
 
     @Test
     fun halfChurn() {
         val churnDate = YearMonthDay(2023, 5, 31)
-        val processor = SimpleChurnProcessor<String>(churnDate.add(0, -1, 0), churnDate)
+        val processor = SimpleChurnProcessor<String>(churnDate.add(0, -1, 0), churnDate, 7)
 
         processor.init()
         processor.processValue(1, "churned1", YearMonthDay(2023, 3, 10).rangeTo(YearMonthDay(2023, 4, 9)), true)
@@ -38,8 +43,8 @@ class SimpleChurnProcessorTest {
         processor.processValue(2, "a2", YearMonthDay(2023, 5, 10).rangeTo(YearMonthDay(2023, 6, 10)), true)
 
         val result = processor.getResult()
-        assertEquals(1, result.churnedItemCount)
-        assertEquals(1, result.activeItemCount)
-        assertEquals(0.5, result.churnRate)
+        Assertions.assertEquals(1, result.churnedItemCount)
+        Assertions.assertEquals(1, result.activeItemCount)
+        Assertions.assertEquals(0.5, result.churnRate)
     }
 }
\ No newline at end of file
diff --git a/marketplace-data/src/test/kotlin/ja/dev/marketplace/client/YearMonthDayRangeTest.kt b/marketplace-data/src/test/kotlin/dev/ja/marketplace/client/YearMonthDayRangeTest.kt
similarity index 91%
rename from marketplace-data/src/test/kotlin/ja/dev/marketplace/client/YearMonthDayRangeTest.kt
rename to marketplace-data/src/test/kotlin/dev/ja/marketplace/client/YearMonthDayRangeTest.kt
index 7110aeb..b3674a8 100644
--- a/marketplace-data/src/test/kotlin/ja/dev/marketplace/client/YearMonthDayRangeTest.kt
+++ b/marketplace-data/src/test/kotlin/dev/ja/marketplace/client/YearMonthDayRangeTest.kt
@@ -1,4 +1,9 @@
-package ja.dev.marketplace.client
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace.client
 
 import org.junit.jupiter.api.Test
 
diff --git a/src/main/kotlin/dev/ja/marketplace/Application.kt b/src/main/kotlin/dev/ja/marketplace/Application.kt
new file mode 100644
index 0000000..e6fd811
--- /dev/null
+++ b/src/main/kotlin/dev/ja/marketplace/Application.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace
+
+import dev.ja.marketplace.client.KtorMarketplaceClient
+import kotlinx.coroutines.runBlocking
+import kotlinx.serialization.json.Json
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.system.exitProcess
+
+object Application {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        if (args.isEmpty()) {
+            println("Usage: path/to/config.json")
+            exitProcess(1)
+        }
+
+        val config = Json.decodeFromString<ApplicationConfig>(Files.readString(Path.of(args[0])))
+        val client = KtorMarketplaceClient(config.marketplaceApiKey)
+
+        runBlocking {
+            val server = MarketplaceStatsServer(config.pluginId, client)
+            server.start()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/ja/marketplace/ApplicationConfig.kt b/src/main/kotlin/dev/ja/marketplace/ApplicationConfig.kt
new file mode 100644
index 0000000..438f8b8
--- /dev/null
+++ b/src/main/kotlin/dev/ja/marketplace/ApplicationConfig.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace
+
+import dev.ja.marketplace.client.PluginId
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ApplicationConfig(
+    @SerialName("pluginId")
+    val pluginId: PluginId,
+    @SerialName("apiKey")
+    val marketplaceApiKey: String
+)
\ No newline at end of file
diff --git a/src/main/kotlin/ja/dev/marketplace/DefaultPluginPageDefinition.kt b/src/main/kotlin/dev/ja/marketplace/DefaultPluginPageDefinition.kt
similarity index 69%
rename from src/main/kotlin/ja/dev/marketplace/DefaultPluginPageDefinition.kt
rename to src/main/kotlin/dev/ja/marketplace/DefaultPluginPageDefinition.kt
index 75eecfd..69d48b3 100644
--- a/src/main/kotlin/ja/dev/marketplace/DefaultPluginPageDefinition.kt
+++ b/src/main/kotlin/dev/ja/marketplace/DefaultPluginPageDefinition.kt
@@ -1,8 +1,14 @@
-package ja.dev.marketplace
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.data.DataTable
-import ja.dev.marketplace.data.MarketplaceDataSinkFactory
+package dev.ja.marketplace
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.client.YearMonthDay
+import dev.ja.marketplace.data.DataTable
+import dev.ja.marketplace.data.MarketplaceDataSinkFactory
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.toList
@@ -20,15 +26,17 @@ class DefaultPluginPageDefinition(
         val dataSinks = factories.map { it.createTableSink(client) }
             .asFlow()
             .onEach { table ->
-                table.init()
+                table.init(data)
                 data.sales.forEach(table::process)
                 data.licenses.forEach(table::process)
             }.toList()
 
         return mapOf(
+            "today" to YearMonthDay.now(),
             "plugin" to data.pluginInfo,
+            "rating" to data.pluginRating,
             "tables" to dataSinks.filterIsInstance<DataTable>(),
             "cssClass" to pageCssClasses,
         )
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/ja/dev/marketplace/MarketplaceStatsServer.kt b/src/main/kotlin/dev/ja/marketplace/MarketplaceStatsServer.kt
similarity index 64%
rename from src/main/kotlin/ja/dev/marketplace/MarketplaceStatsServer.kt
rename to src/main/kotlin/dev/ja/marketplace/MarketplaceStatsServer.kt
index 28e3319..ca8dd82 100644
--- a/src/main/kotlin/ja/dev/marketplace/MarketplaceStatsServer.kt
+++ b/src/main/kotlin/dev/ja/marketplace/MarketplaceStatsServer.kt
@@ -1,5 +1,21 @@
-package ja.dev.marketplace
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
+package dev.ja.marketplace
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.client.PluginId
+import dev.ja.marketplace.data.currentWeek.CurrentWeekFactory
+import dev.ja.marketplace.data.customers.ActiveCustomerTableFactory
+import dev.ja.marketplace.data.customers.CustomerTableFactory
+import dev.ja.marketplace.data.licenses.LicenseTableFactory
+import dev.ja.marketplace.data.overview.OverviewTableFactory
+import dev.ja.marketplace.data.topCountries.TopCountriesFactory
+import dev.ja.marketplace.data.topTrialCountries.TopTrialCountriesFactory
+import dev.ja.marketplace.data.trials.TrialsTableFactory
+import dev.ja.marketplace.data.yearSummary.YearlySummaryFactory
 import gg.jte.ContentType
 import gg.jte.TemplateEngine
 import gg.jte.resolve.ResourceCodeResolver
@@ -11,15 +27,6 @@ import io.ktor.server.netty.*
 import io.ktor.server.plugins.compression.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.client.PluginId
-import ja.dev.marketplace.data.currentWeek.CurrentWeekFactory
-import ja.dev.marketplace.data.customers.ActiveCustomerTableFactory
-import ja.dev.marketplace.data.customers.CustomerTableFactory
-import ja.dev.marketplace.data.licenses.LicenseTableFactory
-import ja.dev.marketplace.data.overview.OverviewTableFactory
-import ja.dev.marketplace.data.topCountries.TopCountriesFactory
-import ja.dev.marketplace.data.yearSummary.YearlySummaryFactory
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 
@@ -31,6 +38,7 @@ class MarketplaceStatsServer(pluginId: PluginId, client: MarketplaceClient) {
             YearlySummaryFactory(),
             CurrentWeekFactory(),
             TopCountriesFactory(),
+            TopTrialCountriesFactory(),
             OverviewTableFactory()
         )
     )
@@ -51,16 +59,26 @@ class MarketplaceStatsServer(pluginId: PluginId, client: MarketplaceClient) {
         client, dataLoader, listOf(ActiveCustomerTableFactory()), pageCssClasses = "wide"
     )
 
+    private val trialsPageData: PluginPageDefinition = DefaultPluginPageDefinition(
+        client, dataLoader, listOf(TrialsTableFactory()), pageCssClasses = "wide"
+    )
+
+    private val trialCountriesPageData: PluginPageDefinition = DefaultPluginPageDefinition(
+        client, dataLoader, listOf(TopTrialCountriesFactory(Int.MAX_VALUE))
+    )
+
     private val httpServer = embeddedServer(Netty, host = "127.0.0.1", port = 8080) {
         install(Compression)
         install(Jte) {
             templateEngine = TemplateEngine.create(ResourceCodeResolver("templates"), ContentType.Html).also {
                 it.setTrimControlStructures(true)
+                it.prepareForRendering("main.kte")
             }
         }
 
         routing {
             staticResources("/styles", "styles")
+            staticResources("/js", "js")
 
             get("/") {
                 call.respond(JteContent("main.kte", indexPageData.createTemplateParameters()))
@@ -77,6 +95,12 @@ class MarketplaceStatsServer(pluginId: PluginId, client: MarketplaceClient) {
             get("/customers/active") {
                 call.respond(JteContent("main.kte", activeCustomersPageData.createTemplateParameters()))
             }
+            get("/trials") {
+                call.respond(JteContent("main.kte", trialsPageData.createTemplateParameters()))
+            }
+            get("/trials/countries") {
+                call.respond(JteContent("main.kte", trialCountriesPageData.createTemplateParameters()))
+            }
         }
     }
 
diff --git a/src/main/kotlin/ja/dev/marketplace/PluginDataLoader.kt b/src/main/kotlin/dev/ja/marketplace/PluginDataLoader.kt
similarity index 56%
rename from src/main/kotlin/ja/dev/marketplace/PluginDataLoader.kt
rename to src/main/kotlin/dev/ja/marketplace/PluginDataLoader.kt
index 25f1c4c..a99a555 100644
--- a/src/main/kotlin/ja/dev/marketplace/PluginDataLoader.kt
+++ b/src/main/kotlin/dev/ja/marketplace/PluginDataLoader.kt
@@ -1,21 +1,18 @@
-package ja.dev.marketplace
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
 
-import ja.dev.marketplace.client.MarketplaceClient
-import ja.dev.marketplace.client.PluginId
-import ja.dev.marketplace.client.PluginInfo
-import ja.dev.marketplace.client.PluginSale
-import ja.dev.marketplace.data.LicenseInfo
+package dev.ja.marketplace
+
+import dev.ja.marketplace.client.MarketplaceClient
+import dev.ja.marketplace.client.PluginId
+import dev.ja.marketplace.data.LicenseInfo
+import dev.ja.marketplace.data.PluginData
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import java.util.concurrent.atomic.AtomicReference
 
-data class PluginData(
-    val pluginId: PluginId,
-    val pluginInfo: PluginInfo,
-    val sales: List<PluginSale>,
-    val licenses: List<LicenseInfo>
-)
-
 class PluginDataLoader(private val pluginId: PluginId, private val client: MarketplaceClient) {
     private val cachedData = AtomicReference<PluginData>()
 
@@ -34,10 +31,19 @@ class PluginDataLoader(private val pluginId: PluginId, private val client: Marke
     private suspend fun load(): PluginData {
         return coroutineScope {
             val pluginInfo = async { client.pluginInfo(pluginId) }
+            val pluginRating = async { client.pluginRating(pluginId) }
             val sales = async { client.salesInfo(pluginId) }
             val licenseInfo = async { LicenseInfo.create(sales.await()) }
+            val trials = async { client.trialsInfo(pluginId) }
 
-            PluginData(pluginId, pluginInfo.await(), sales.await(), licenseInfo.await())
+            PluginData(
+                pluginId,
+                pluginInfo.await(),
+                pluginRating.await(),
+                sales.await(),
+                licenseInfo.await(),
+                trials.await()
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/dev/ja/marketplace/PluginPageDefinition.kt b/src/main/kotlin/dev/ja/marketplace/PluginPageDefinition.kt
new file mode 100644
index 0000000..073085c
--- /dev/null
+++ b/src/main/kotlin/dev/ja/marketplace/PluginPageDefinition.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package dev.ja.marketplace
+
+interface PluginPageDefinition {
+    suspend fun createTemplateParameters(): Map<String, Any?>
+}
\ No newline at end of file
diff --git a/src/main/kotlin/ja/dev/marketplace/PluginPageDefinition.kt b/src/main/kotlin/ja/dev/marketplace/PluginPageDefinition.kt
deleted file mode 100644
index 5e4cbf6..0000000
--- a/src/main/kotlin/ja/dev/marketplace/PluginPageDefinition.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package ja.dev.marketplace
-
-interface PluginPageDefinition {
-    suspend fun createTemplateParameters(): Map<String, Any?>
-}
\ No newline at end of file
diff --git a/src/main/resources/js/sortable.min.css b/src/main/resources/js/sortable.min.css
new file mode 100644
index 0000000..a3d3b81
--- /dev/null
+++ b/src/main/resources/js/sortable.min.css
@@ -0,0 +1 @@
+.sortable th{cursor:pointer}.sortable th.no-sort{pointer-events:none}.sortable th::after,.sortable th::before{transition:color .1s ease-in-out;font-size:1.2em;color:rgba(0,0,0,0)}.sortable th::after{margin-left:3px;content:"▸"}.sortable th:hover::after{color:inherit}.sortable th.dir-d::after{color:inherit;content:"▾"}.sortable th.dir-u::after{color:inherit;content:"▴"}.sortable th.indicator-left::after{content:""}.sortable th.indicator-left::before{margin-right:3px;content:"▸"}.sortable th.indicator-left:hover::before{color:inherit}.sortable th.indicator-left.dir-d::before{color:inherit;content:"▾"}.sortable th.indicator-left.dir-u::before{color:inherit;content:"▴"}.sortable{--stripe-color: #e4e4e4;--th-color: #fff;--th-bg: #808080;--td-color: #000;--td-on-stripe-color: #000;border-spacing:0}.sortable tbody tr:nth-child(odd){background-color:var(--stripe-color);color:var(--td-on-stripe-color)}.sortable th{background:var(--th-bg);color:var(--th-color);font-weight:normal;text-align:left;text-transform:capitalize;vertical-align:baseline;white-space:nowrap}.sortable td{color:var(--td-color)}.sortable td,.sortable th{padding:10px}.sortable td:first-child,.sortable th:first-child{border-top-left-radius:4px}.sortable td:last-child,.sortable th:last-child{border-top-right-radius:4px}/*# sourceMappingURL=sortable.min.css.map */
diff --git a/src/main/resources/js/sortable.min.js b/src/main/resources/js/sortable.min.js
new file mode 100644
index 0000000..de6e93f
--- /dev/null
+++ b/src/main/resources/js/sortable.min.js
@@ -0,0 +1,2 @@
+document.addEventListener("click",function(c){try{function f(a,b){return a.nodeName===b?a:f(a.parentNode,b)}var x=c.shiftKey||c.altKey,d=f(c.target,"TH"),m=f(d,"TR"),g=f(m,"TABLE");function n(a,b){a.classList.remove("dir-d");a.classList.remove("dir-u");b&&a.classList.add(b)}function p(a){return x&&a.dataset.sortAlt||a.dataset.sort||a.textContent}if(g.classList.contains("sortable")){var q,e=m.cells,r=parseInt(d.dataset.sortTbr);for(c=0;c<e.length;c++)e[c]===d?q=parseInt(d.dataset.sortCol)||c:n(e[c],
+"");e="dir-d";if(d.classList.contains("dir-d")||g.classList.contains("asc")&&!d.classList.contains("dir-u"))e="dir-u";n(d,e);var t="dir-u"===e,v=function(a,b,h){var u=p((t?a:b).cells[h]);a=p((t?b:a).cells[h]);b=parseFloat(u)-parseFloat(a);return isNaN(b)?u.localeCompare(a):b};for(c=0;c<g.tBodies.length;c++){var k=g.tBodies[c],w=[].slice.call(k.rows,0);w.sort(function(a,b){var h=v(a,b,q);return 0!==h||isNaN(r)?h:v(a,b,r)});var l=k.cloneNode();l.append.apply(l,w);g.replaceChild(l,k)}}}catch(f){}});
diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css
index 9742766..973ddc7 100644
--- a/src/main/resources/styles/main.css
+++ b/src/main/resources/styles/main.css
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 /* Default font */
 @import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400&display=swap');
 /* Chinese fallback */
diff --git a/src/main/resources/styles/print.css b/src/main/resources/styles/print.css
index 62ec82c..267b1c8 100644
--- a/src/main/resources/styles/print.css
+++ b/src/main/resources/styles/print.css
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2023 Joachim Ansorg.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 .noprint {
     display: none;
 }
diff --git a/src/main/resources/templates/dataRowGroup.kte b/src/main/resources/templates/dataRowGroup.kte
index ad6254b..11e6163 100644
--- a/src/main/resources/templates/dataRowGroup.kte
+++ b/src/main/resources/templates/dataRowGroup.kte
@@ -1,22 +1,35 @@
-@import ja.dev.marketplace.data.DataRowGroup
-@import ja.dev.marketplace.data.DataTable
+@import dev.ja.marketplace.data.DataRowGroup
+@import dev.ja.marketplace.data.DataTable
 
 @param table: DataTable
 @param group: DataRowGroup
 @param cssClass: String?
+@param renderHeader: Boolean
 
 @for((rowIndex, row) in group.rows.withIndex())
     !{val rowClass = if (rowIndex == 0) row.cssClass ?: cssClass else row.cssClass}
-    <tr class="${rowClass}">
+    !{var tagName = if (renderHeader) "th" else "td"}
+    <tr class="${rowClass}" id="${row.htmlId}">
         @for((columnIndex, column) in table.columns.withIndex())
-            <th colspan="${column.columnSpan}" title="${row.getTooltip(column)}" class="${column.cssClass}" style="${column.cssStyle}">
-                !{val value = row.getValue(column)}
-                @if(value == null && rowIndex == 0 && columnIndex == 0 && group.title != null)
-                    <h2>${group.title}</h2>
-                @elseif (value != null)
-                    @template.render(value)
-                @endif
-            </th>
+            @if(renderHeader)
+                <th colspan="${column.columnSpan}" title="${row.getTooltip(column)}" class="${column.cssClass}" style="${column.cssStyle}">
+                    !{val value = row.getValue(column)}
+                    @if(value == null && rowIndex == 0 && columnIndex == 0 && group.title != null)
+                        <h2>${group.title}</h2>
+                    @elseif (value != null)
+                        @template.render(value)
+                    @endif
+                </th>
+            @else
+                <td colspan="${column.columnSpan}" title="${row.getTooltip(column)}" class="${column.cssClass}" style="${column.cssStyle}">
+                    !{val value = row.getValue(column)}
+                    @if(value == null && rowIndex == 0 && columnIndex == 0 && group.title != null)
+                        <h2>${group.title}</h2>
+                    @elseif (value != null)
+                        @template.render(value)
+                    @endif
+                </td>
+            @endif
         @endfor
     </tr>
 @endfor
diff --git a/src/main/resources/templates/dataTable.kte b/src/main/resources/templates/dataTable.kte
index a3a5001..9a65864 100644
--- a/src/main/resources/templates/dataTable.kte
+++ b/src/main/resources/templates/dataTable.kte
@@ -1,14 +1,28 @@
-@import ja.dev.marketplace.data.DataTable
-@import ja.dev.marketplace.data.DataTableColumn
-@import ja.dev.marketplace.data.DataTableSection
-@import ja.dev.marketplace.data.DataTableRow
+@import dev.ja.marketplace.data.DataTable
+@import dev.ja.marketplace.data.DataTableColumn
+@import dev.ja.marketplace.data.DataTableSection
+@import dev.ja.marketplace.data.DataTableRow
 
 @param table: DataTable
 
+!{val renderTableHeader = table.sections.size == 1}
 <table class="small table-striped ${table.cssClass}">
+    @if(renderTableHeader)
+        <thead>
+        @template.tableColumnsRow(table, title = table.title, cssClass = "row-border-bottom")
+        </thead>
+    @endif
     @for(section in table.sections)
         <tbody>
-        @template.dataTableSection(table = table, section = section, renderColumns = true, title = table.title)
+        @template.dataTableSection(table = table, section = section, renderColumns = true, renderHeader = !renderTableHeader, renderFooter = !renderTableHeader, title = table.title)
         </tbody>
     @endfor
+    @if(renderTableHeader)
+        !{val footer = table.sections[0].footer}
+        @if(footer != null)
+            <tfoot>
+            @template.dataRowGroup(table = table, group = footer, cssClass = "row-border-light-top", renderHeader = false)
+            </tfoot>
+        @endif
+    @endif
 </table>
\ No newline at end of file
diff --git a/src/main/resources/templates/dataTableSection.kte b/src/main/resources/templates/dataTableSection.kte
index 67cef87..9acb06e 100644
--- a/src/main/resources/templates/dataTableSection.kte
+++ b/src/main/resources/templates/dataTableSection.kte
@@ -1,27 +1,31 @@
-@import ja.dev.marketplace.data.DataTable
-@import ja.dev.marketplace.data.DataTableSection
+@import dev.ja.marketplace.data.DataTable
+@import dev.ja.marketplace.data.DataTableSection
 
 @param table: DataTable
 @param section: DataTableSection?
 @param renderColumns: Boolean
+@param renderHeader: Boolean
+@param renderFooter: Boolean
 @param title: String? = null
 
 @if(section != null)
     !{val header = section.header}
     !{val title = section.title ?: title}
-    @if(renderColumns)
-        @template.tableColumnsRow(table, title = title, cssClass = "row-border-bottom")
-    @endif
-    @if(header != null)
-        @template.dataRowGroup(table = table, group = header, cssClass = "row-border-bottom")
-    @elseif (!renderColumns && title != null)
-        @template.titleRow(columns = table.columns, title = title, cssClass = "row-border-bottom")
+    @if(renderHeader)
+        @if(renderColumns)
+            @template.tableColumnsRow(table, title = title, cssClass = "row-border-bottom")
+        @endif
+        @if(header != null)
+            @template.dataRowGroup(table = table, group = header, cssClass = "row-border-bottom", renderHeader = true)
+        @elseif (!renderColumns && title != null)
+            @template.titleRow(columns = table.columns, title = title, cssClass = "row-border-bottom")
+        @endif
     @endif
 
     @for(row in section.rows)
         <tr class="${row.cssClass}">
             @for(column in table.columns)
-                <td colspan="${column.columnSpan}" class="${column.cssClass}" title="${row.getTooltip(column)}">
+                <td colspan="${column.columnSpan}" class="${column.cssClass}" title="${row.getTooltip(column)}" data-sort="${row.getSortValue(column)}">
                     @template.render(row.getValue(column))
                 </td>
             @endfor
@@ -29,7 +33,7 @@
     @endfor
 
     !{val footer = section.footer}
-    @if(footer != null)
-        @template.dataRowGroup(table = table, group = footer, cssClass = "row-border-light-top")
+    @if(renderFooter && footer != null)
+        @template.dataRowGroup(table = table, group = footer, cssClass = "row-border-light-top", renderHeader = false)
     @endif
 @endif
diff --git a/src/main/resources/templates/main.kte b/src/main/resources/templates/main.kte
index 31b013a..3771beb 100644
--- a/src/main/resources/templates/main.kte
+++ b/src/main/resources/templates/main.kte
@@ -1,9 +1,13 @@
-@import ja.dev.marketplace.client.PluginInfo
-@import ja.dev.marketplace.client.PluginSale
-@import ja.dev.marketplace.data.DataTable
-@import ja.dev.marketplace.data.LicenseInfo
+@import dev.ja.marketplace.client.PluginInfo
+@import dev.ja.marketplace.client.PluginRating
+@import dev.ja.marketplace.client.PluginSale
+@import dev.ja.marketplace.client.YearMonthDay
+@import dev.ja.marketplace.data.DataTable
+@import dev.ja.marketplace.data.LicenseInfo
 
+@param today: YearMonthDay
 @param plugin: PluginInfo
+@param rating: PluginRating
 @param tables: List<DataTable>
 @param cssClass: String?
 
@@ -12,17 +16,25 @@
     <title>${plugin.name} Report</title>
     <link rel="stylesheet" type="text/css" href="/styles/main.css"/>
     <link rel="stylesheet" type="text/css" media="print" href="/styles/main.css"/>
+    <link href="/js/sortable.min.css" rel="stylesheet"/>
+    <script src="/js/sortable.min.js"></script>
 </head>
 <body class="${cssClass}">
 <h1>${plugin.name}</h1>
+<h2 class="subtitle">
+    @template.render(today)<br>
+    <span title="${rating.votes.size} ratings">★ @template.render(rating.calculatedRatingValue)</span>
+</h2>
 
-<div class="section section-wide">
-    <a href="/">Overview</a>,
-    <a href="/licenses">Licenses</a>,
-    <a href="/customers">Customers (all)</a>,
-    <a href="/customers/active">Customers (active)</a>,
+<h2 class="subtitle menu small">
+    <a href="/">Overview</a>
+    <a href="/licenses">Licenses</a>
+    <a href="/customers">Customers (all)</a>
+    <a href="/customers/active">Customers (active)</a>
     <a href="/countries">Countries</a>
-</div>
+    <a href="/trials">Trials</a>
+    <a href="/trials/countries">Trial (Countries)</a>
+</h2>
 
 @for(table in tables)
     @template.dataTable(table)
diff --git a/src/main/resources/templates/render.kte b/src/main/resources/templates/render.kte
index 4b7e82f..d43a2ec 100644
--- a/src/main/resources/templates/render.kte
+++ b/src/main/resources/templates/render.kte
@@ -1,6 +1,6 @@
 @import java.math.BigDecimal
-@import ja.dev.marketplace.client.AmountWithCurrency
-@import ja.dev.marketplace.data.PercentageValue
+@import dev.ja.marketplace.client.AmountWithCurrency
+@import dev.ja.marketplace.data.PercentageValue
 
 @param value: Any?
 
diff --git a/src/main/resources/templates/tableColumnsRow.kte b/src/main/resources/templates/tableColumnsRow.kte
index dd693c4..184f91a 100644
--- a/src/main/resources/templates/tableColumnsRow.kte
+++ b/src/main/resources/templates/tableColumnsRow.kte
@@ -1,4 +1,4 @@
-@import ja.dev.marketplace.data.DataTable
+@import dev.ja.marketplace.data.DataTable
 
 @param table: DataTable
 @param title: String?
diff --git a/src/main/resources/templates/titleRow.kte b/src/main/resources/templates/titleRow.kte
index ce73ff5..f954208 100644
--- a/src/main/resources/templates/titleRow.kte
+++ b/src/main/resources/templates/titleRow.kte
@@ -1,4 +1,4 @@
-@import ja.dev.marketplace.data.DataTableColumn
+@import dev.ja.marketplace.data.DataTableColumn
 
 @param columns: List<DataTableColumn>
 @param title: String?
@@ -9,4 +9,3 @@
         <th colspan="${columns.size}"><h2>${title}</h2></th>
     </tr>
 @endif
-1
\ No newline at end of file