chore: Move message and notifications into tracker [DHIS2-20468] (#22584)

* chore: Move message and notifications into tracker [DHIS2-20468]

* Code review comments

Author: enricocolasante

…snapshot/IdentifiableObjectSnapshot.java …s/common/IdentifiableObjectSnapshot.javadhis-2/dhis-api/src/main/java/org/hisp/dhis/program/notification/template/snapshot/IdentifiableObjectSnapshot.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectSnapshot.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/notification/template/snapshot/IdentifiableObjectSnapshot.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectSnapshot.java

@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.program.notification.template.snapshot;
+package org.hisp.dhis.common;
 
 import java.io.Serializable;
 import lombok.Data;

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/UserInfoSnapshot.java

@@ -35,7 +35,7 @@
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.hisp.dhis.common.DxfNamespaces;
-import org.hisp.dhis.program.notification.template.snapshot.IdentifiableObjectSnapshot;
+import org.hisp.dhis.common.IdentifiableObjectSnapshot;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserDetails;
 

…cationTemplateOperationParamsMapper.java …cationTemplateOperationParamsMapper.javadhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/notification/ProgramNotificationTemplateOperationParamsMapper.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/notification/ProgramNotificationTemplateOperationParamsMapper.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/notification/ProgramNotificationTemplateOperationParamsMapper.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/notification/ProgramNotificationTemplateOperationParamsMapper.java

@@ -48,7 +48,6 @@
 import org.hisp.dhis.predictor.PredictorGroup;
 import org.hisp.dhis.program.ProgramExpression;
 import org.hisp.dhis.program.ProgramIndicatorGroup;
-import org.hisp.dhis.program.notification.ProgramNotificationInstance;
 import org.hisp.dhis.program.notification.ProgramNotificationTemplate;
 import org.hisp.dhis.report.Report;
 import org.hisp.dhis.security.acl.AclService;
@@ -197,16 +196,4 @@ public HibernateIdentifiableObjectStore<ProgramNotificationTemplate> programNoti
         aclService,
         true);
   }
-
-  @Bean("org.hisp.dhis.program.notification.ProgramNotificationInstanceStore")
-  public HibernateIdentifiableObjectStore<ProgramNotificationInstance>
-      programNotificationInstanceStore() {
-    return new HibernateIdentifiableObjectStore<>(
-        entityManager,
-        jdbcTemplate,
-        publisher,
-        ProgramNotificationInstance.class,
-        aclService,
-        true);
-  }
 }

dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/ApiTrackedEntityAuditService.java

@@ -27,10 +27,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.program.notification;
+package org.hisp.dhis.program;
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.hisp.dhis.program.notification.ProgramNotificationTemplate;
+import org.hisp.dhis.program.notification.ProgramNotificationTemplateOperationParams;
+import org.hisp.dhis.program.notification.ProgramNotificationTemplateOperationParamsMapper;
+import org.hisp.dhis.program.notification.ProgramNotificationTemplateQueryParams;
+import org.hisp.dhis.program.notification.ProgramNotificationTemplateService;
+import org.hisp.dhis.program.notification.ProgramNotificationTemplateStore;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;