Refactor models

src/main/java/dev/kruhlmann/imgfloat/config/AuditLogDataSourceConfig.java

@@ -51,7 +51,7 @@ public class AuditLogDataSourceConfig {
     ) {
         return builder
             .dataSource(dataSource)
-            .packages("dev.kruhlmann.imgfloat.audit.model")
+            .packages("dev.kruhlmann.imgfloat.model.db.audit")
             .properties(hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings()))
             .persistenceUnit("audit")
             .build();

src/main/java/dev/kruhlmann/imgfloat/controller/AuditLogApiController.java

@@ -1,7 +1,7 @@
 package dev.kruhlmann.imgfloat.controller;
 
-import dev.kruhlmann.imgfloat.model.AuditLogEntryView;
-import dev.kruhlmann.imgfloat.model.AuditLogPageView;
+import dev.kruhlmann.imgfloat.model.api.response.AuditLogEntryView;
+import dev.kruhlmann.imgfloat.model.api.response.AuditLogPageView;
 import dev.kruhlmann.imgfloat.model.OauthSessionUser;
 import dev.kruhlmann.imgfloat.service.AuditLogService;
 import dev.kruhlmann.imgfloat.service.AuthorizationService;

src/main/java/dev/kruhlmann/imgfloat/controller/ChannelApiController.java

@@ -4,17 +4,17 @@ import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.FORBIDDEN;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 
-import dev.kruhlmann.imgfloat.model.AdminRequest;
-import dev.kruhlmann.imgfloat.model.AssetView;
-import dev.kruhlmann.imgfloat.model.CanvasSettingsRequest;
-import dev.kruhlmann.imgfloat.model.ChannelScriptSettingsRequest;
-import dev.kruhlmann.imgfloat.model.CodeAssetRequest;
+import dev.kruhlmann.imgfloat.model.api.request.AdminRequest;
+import dev.kruhlmann.imgfloat.model.api.response.AssetView;
+import dev.kruhlmann.imgfloat.model.api.request.CanvasSettingsRequest;
+import dev.kruhlmann.imgfloat.model.api.request.ChannelScriptSettingsRequest;
+import dev.kruhlmann.imgfloat.model.api.request.CodeAssetRequest;
 import dev.kruhlmann.imgfloat.model.OauthSessionUser;
-import dev.kruhlmann.imgfloat.model.PlaybackRequest;
-import dev.kruhlmann.imgfloat.model.ScriptAssetAttachmentView;
-import dev.kruhlmann.imgfloat.model.TransformRequest;
-import dev.kruhlmann.imgfloat.model.TwitchUserProfile;
-import dev.kruhlmann.imgfloat.model.VisibilityRequest;
+import dev.kruhlmann.imgfloat.model.api.request.PlaybackRequest;
+import dev.kruhlmann.imgfloat.model.api.response.ScriptAssetAttachmentView;
+import dev.kruhlmann.imgfloat.model.api.request.TransformRequest;
+import dev.kruhlmann.imgfloat.model.api.response.TwitchUserProfile;
+import dev.kruhlmann.imgfloat.model.api.request.VisibilityRequest;
 import dev.kruhlmann.imgfloat.service.AuthorizationService;
 import dev.kruhlmann.imgfloat.service.ChannelDirectoryService;
 import dev.kruhlmann.imgfloat.service.TwitchUserLookupService;

src/main/java/dev/kruhlmann/imgfloat/controller/RestExceptionHandler.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.controller;
 
-import dev.kruhlmann.imgfloat.model.ErrorResponse;
+import dev.kruhlmann.imgfloat.model.api.response.ErrorResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/dev/kruhlmann/imgfloat/controller/ScriptMarketplaceController.java

@@ -3,10 +3,10 @@ package dev.kruhlmann.imgfloat.controller;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 
-import dev.kruhlmann.imgfloat.model.AssetView;
+import dev.kruhlmann.imgfloat.model.api.response.AssetView;
 import dev.kruhlmann.imgfloat.model.OauthSessionUser;
-import dev.kruhlmann.imgfloat.model.ScriptMarketplaceEntry;
-import dev.kruhlmann.imgfloat.model.ScriptMarketplaceImportRequest;
+import dev.kruhlmann.imgfloat.model.api.response.ScriptMarketplaceEntry;
+import dev.kruhlmann.imgfloat.model.api.request.ScriptMarketplaceImportRequest;
 import dev.kruhlmann.imgfloat.service.AuthorizationService;
 import dev.kruhlmann.imgfloat.service.ChannelDirectoryService;
 import dev.kruhlmann.imgfloat.util.LogSanitizer;

src/main/java/dev/kruhlmann/imgfloat/controller/SettingsApiController.java

@@ -1,7 +1,7 @@
 package dev.kruhlmann.imgfloat.controller;
 
 import dev.kruhlmann.imgfloat.model.OauthSessionUser;
-import dev.kruhlmann.imgfloat.model.Settings;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Settings;
 import dev.kruhlmann.imgfloat.service.AuthorizationService;
 import dev.kruhlmann.imgfloat.service.SettingsService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java

@@ -5,7 +5,7 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.kruhlmann.imgfloat.model.OauthSessionUser;
-import dev.kruhlmann.imgfloat.model.Settings;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Settings;
 import dev.kruhlmann.imgfloat.service.AuthorizationService;
 import dev.kruhlmann.imgfloat.service.ChannelDirectoryService;
 import dev.kruhlmann.imgfloat.service.GitInfoService;

src/main/java/dev/kruhlmann/imgfloat/model/api/request/AdminRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 import jakarta.validation.constraints.NotBlank;
 

src/main/java/dev/kruhlmann/imgfloat/model/api/request/CanvasSettingsRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 import jakarta.validation.constraints.Positive;
 

src/main/java/dev/kruhlmann/imgfloat/model/api/request/ChannelScriptSettingsRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 public class ChannelScriptSettingsRequest {
 

src/main/java/dev/kruhlmann/imgfloat/model/api/request/CodeAssetRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 import jakarta.validation.constraints.NotBlank;
 

src/main/java/dev/kruhlmann/imgfloat/model/api/request/PlaybackRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 public class PlaybackRequest {
 

src/main/java/dev/kruhlmann/imgfloat/model/api/request/ScriptMarketplaceImportRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 import jakarta.validation.constraints.NotBlank;
 

src/main/java/dev/kruhlmann/imgfloat/model/api/request/TransformRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 import jakarta.validation.constraints.DecimalMax;
 import jakarta.validation.constraints.DecimalMin;

src/main/java/dev/kruhlmann/imgfloat/model/api/request/VisibilityRequest.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.request;
 
 public class VisibilityRequest {
 

src/main/java/dev/kruhlmann/imgfloat/model/api/response/AssetEvent.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

src/main/java/dev/kruhlmann/imgfloat/model/api/response/AssetPatch.java

@@ -1,9 +1,13 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import dev.kruhlmann.imgfloat.model.api.request.TransformRequest;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.AudioAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.VisualAsset;
+
 /**
- * Represents a partial update for an {@link Asset}. Only the fields that changed
+ * Represents a partial update for an {@link dev.kruhlmann.imgfloat.model.db.imgfloat.Asset}. Only the fields that changed
  * for a given operation are populated to reduce payload sizes sent over WebSocket.
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/dev/kruhlmann/imgfloat/model/api/response/AssetView.java

@@ -1,8 +1,14 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 import java.time.Instant;
 import java.util.List;
 
+import dev.kruhlmann.imgfloat.model.AssetType;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Asset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.AudioAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.VisualAsset;
+
 public record AssetView(
     String id,
     String broadcaster,

src/main/java/dev/kruhlmann/imgfloat/model/api/response/AuditLogEntryView.java

@@ -1,8 +1,9 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
-import dev.kruhlmann.imgfloat.audit.model.AuditLogEntry;
 import java.time.Instant;
 
+import dev.kruhlmann.imgfloat.model.db.audit.AuditLogEntry;
+
 public record AuditLogEntryView(String id, String actor, String action, String details, Instant createdAt) {
     public static AuditLogEntryView fromEntry(AuditLogEntry entry) {
         if (entry == null) {

src/main/java/dev/kruhlmann/imgfloat/model/api/response/AuditLogPageView.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 import java.util.List;
 

src/main/java/dev/kruhlmann/imgfloat/model/api/response/CanvasEvent.java

@@ -1,5 +1,6 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
+import dev.kruhlmann.imgfloat.model.api.request.CanvasSettingsRequest;
 public class CanvasEvent {
 
     public enum Type {

src/main/java/dev/kruhlmann/imgfloat/model/api/response/ErrorResponse.java

@@ -1,3 +1,3 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 public record ErrorResponse(int status, String message, String path) {}

src/main/java/dev/kruhlmann/imgfloat/model/api/response/ScriptAssetAttachmentView.java

@@ -1,5 +1,7 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
+import dev.kruhlmann.imgfloat.model.AssetType;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetAttachment;
 public record ScriptAssetAttachmentView(
     String id,
     String scriptAssetId,

src/main/java/dev/kruhlmann/imgfloat/model/api/response/ScriptMarketplaceEntry.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 public record ScriptMarketplaceEntry(
     String id,

src/main/java/dev/kruhlmann/imgfloat/model/api/response/TwitchUserProfile.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.api.response;
 
 /**
  * Minimal Twitch user details used for rendering avatars and display names.

src/main/java/dev/kruhlmann/imgfloat/model/db/audit/AuditLogEntry.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.audit.model;
+package dev.kruhlmann.imgfloat.model.db.audit;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/Asset.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -12,6 +12,8 @@ import java.time.Instant;
 import java.util.Locale;
 import java.util.UUID;
 
+import dev.kruhlmann.imgfloat.model.AssetType;
+
 @Entity
 @Table(name = "assets")
 public class Asset {

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/AudioAsset.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/Channel.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/MarketplaceScriptHeart.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/MarketplaceScriptHeartId.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import java.io.Serializable;
 import java.util.Objects;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/ScriptAsset.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
@@ -14,6 +14,8 @@ import jakarta.persistence.Transient;
 import java.util.ArrayList;
 import java.util.List;
 
+import dev.kruhlmann.imgfloat.model.api.response.ScriptAssetAttachmentView;
+
 @Entity
 @Table(name = "script_assets")
 public class ScriptAsset {

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/ScriptAssetAttachment.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -10,6 +10,8 @@ import jakarta.persistence.PreUpdate;
 import jakarta.persistence.Table;
 import java.util.UUID;
 
+import dev.kruhlmann.imgfloat.model.AssetType;
+
 @Entity
 @Table(name = "script_asset_attachments")
 public class ScriptAssetAttachment {

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/ScriptAssetFile.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -11,6 +11,8 @@ import jakarta.persistence.Table;
 import java.util.Locale;
 import java.util.UUID;
 
+import dev.kruhlmann.imgfloat.model.AssetType;
+
 @Entity
 @Table(name = "script_asset_files")
 public class ScriptAssetFile {

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/Settings.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/SystemAdministrator.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/dev/kruhlmann/imgfloat/model/db/imgfloat/VisualAsset.java

@@ -1,4 +1,4 @@
-package dev.kruhlmann.imgfloat.model;
+package dev.kruhlmann.imgfloat.model.db.imgfloat;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/dev/kruhlmann/imgfloat/repository/AssetRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.Asset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Asset;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/dev/kruhlmann/imgfloat/repository/AudioAssetRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.AudioAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.AudioAsset;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/dev/kruhlmann/imgfloat/repository/ChannelRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.Channel;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Channel;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/dev/kruhlmann/imgfloat/repository/MarketplaceScriptHeartRepository.java

@@ -1,7 +1,7 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.MarketplaceScriptHeart;
-import dev.kruhlmann.imgfloat.model.MarketplaceScriptHeartId;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.MarketplaceScriptHeart;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.MarketplaceScriptHeartId;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/dev/kruhlmann/imgfloat/repository/ScriptAssetAttachmentRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.ScriptAssetAttachment;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetAttachment;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/dev/kruhlmann/imgfloat/repository/ScriptAssetFileRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.ScriptAssetFile;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetFile;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/dev/kruhlmann/imgfloat/repository/ScriptAssetRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.ScriptAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAsset;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/dev/kruhlmann/imgfloat/repository/SettingsRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.Settings;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Settings;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SettingsRepository extends JpaRepository<Settings, Integer> {}

src/main/java/dev/kruhlmann/imgfloat/repository/SystemAdministratorRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.SystemAdministrator;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.SystemAdministrator;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/dev/kruhlmann/imgfloat/repository/VisualAssetRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository;
 
-import dev.kruhlmann.imgfloat.model.VisualAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.VisualAsset;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/dev/kruhlmann/imgfloat/repository/audit/AuditLogRepository.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.repository.audit;
 
-import dev.kruhlmann.imgfloat.audit.model.AuditLogEntry;
+import dev.kruhlmann.imgfloat.model.db.audit.AuditLogEntry;
 import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/dev/kruhlmann/imgfloat/service/AccountService.java

@@ -1,7 +1,7 @@
 package dev.kruhlmann.imgfloat.service;
 
-import dev.kruhlmann.imgfloat.model.Asset;
-import dev.kruhlmann.imgfloat.model.ScriptAssetFile;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Asset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetFile;
 import dev.kruhlmann.imgfloat.repository.AssetRepository;
 import dev.kruhlmann.imgfloat.repository.ChannelRepository;
 import dev.kruhlmann.imgfloat.repository.MarketplaceScriptHeartRepository;

src/main/java/dev/kruhlmann/imgfloat/service/AssetCleanupService.java

@@ -1,8 +1,8 @@
 package dev.kruhlmann.imgfloat.service;
 
-import dev.kruhlmann.imgfloat.model.Asset;
-import dev.kruhlmann.imgfloat.model.ScriptAssetAttachment;
-import dev.kruhlmann.imgfloat.model.ScriptAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Asset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetAttachment;
 import dev.kruhlmann.imgfloat.repository.AssetRepository;
 import dev.kruhlmann.imgfloat.repository.ScriptAssetAttachmentRepository;
 import dev.kruhlmann.imgfloat.repository.ScriptAssetRepository;

src/main/java/dev/kruhlmann/imgfloat/service/AuditLogService.java

@@ -1,7 +1,7 @@
 package dev.kruhlmann.imgfloat.service;
 
-import dev.kruhlmann.imgfloat.audit.model.AuditLogEntry;
-import dev.kruhlmann.imgfloat.model.AuditLogEntryView;
+import dev.kruhlmann.imgfloat.model.db.audit.AuditLogEntry;
+import dev.kruhlmann.imgfloat.model.api.response.AuditLogEntryView;
 import dev.kruhlmann.imgfloat.repository.audit.AuditLogRepository;
 import dev.kruhlmann.imgfloat.util.LogSanitizer;
 import java.util.List;

src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java

@@ -3,28 +3,28 @@ package dev.kruhlmann.imgfloat.service;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.PAYLOAD_TOO_LARGE;
 
-import dev.kruhlmann.imgfloat.model.Asset;
-import dev.kruhlmann.imgfloat.model.AssetEvent;
-import dev.kruhlmann.imgfloat.model.AssetPatch;
 import dev.kruhlmann.imgfloat.model.AssetType;
-import dev.kruhlmann.imgfloat.model.AssetView;
-import dev.kruhlmann.imgfloat.model.AudioAsset;
-import dev.kruhlmann.imgfloat.model.CanvasEvent;
-import dev.kruhlmann.imgfloat.model.CanvasSettingsRequest;
-import dev.kruhlmann.imgfloat.model.Channel;
-import dev.kruhlmann.imgfloat.model.ChannelScriptSettingsRequest;
-import dev.kruhlmann.imgfloat.model.CodeAssetRequest;
-import dev.kruhlmann.imgfloat.model.MarketplaceScriptHeart;
-import dev.kruhlmann.imgfloat.model.PlaybackRequest;
-import dev.kruhlmann.imgfloat.model.ScriptAsset;
-import dev.kruhlmann.imgfloat.model.ScriptAssetAttachment;
-import dev.kruhlmann.imgfloat.model.ScriptAssetAttachmentView;
-import dev.kruhlmann.imgfloat.model.ScriptAssetFile;
-import dev.kruhlmann.imgfloat.model.ScriptMarketplaceEntry;
-import dev.kruhlmann.imgfloat.model.Settings;
-import dev.kruhlmann.imgfloat.model.TransformRequest;
-import dev.kruhlmann.imgfloat.model.VisibilityRequest;
-import dev.kruhlmann.imgfloat.model.VisualAsset;
+import dev.kruhlmann.imgfloat.model.api.request.CanvasSettingsRequest;
+import dev.kruhlmann.imgfloat.model.api.request.ChannelScriptSettingsRequest;
+import dev.kruhlmann.imgfloat.model.api.request.CodeAssetRequest;
+import dev.kruhlmann.imgfloat.model.api.request.PlaybackRequest;
+import dev.kruhlmann.imgfloat.model.api.request.TransformRequest;
+import dev.kruhlmann.imgfloat.model.api.request.VisibilityRequest;
+import dev.kruhlmann.imgfloat.model.api.response.AssetEvent;
+import dev.kruhlmann.imgfloat.model.api.response.AssetPatch;
+import dev.kruhlmann.imgfloat.model.api.response.AssetView;
+import dev.kruhlmann.imgfloat.model.api.response.CanvasEvent;
+import dev.kruhlmann.imgfloat.model.api.response.ScriptAssetAttachmentView;
+import dev.kruhlmann.imgfloat.model.api.response.ScriptMarketplaceEntry;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Asset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.AudioAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Channel;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.MarketplaceScriptHeart;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetAttachment;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.ScriptAssetFile;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Settings;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.VisualAsset;
 import dev.kruhlmann.imgfloat.repository.AssetRepository;
 import dev.kruhlmann.imgfloat.repository.AudioAssetRepository;
 import dev.kruhlmann.imgfloat.repository.ChannelRepository;

src/main/java/dev/kruhlmann/imgfloat/service/EmoteSyncScheduler.java

@@ -1,7 +1,7 @@
 package dev.kruhlmann.imgfloat.service;
 
-import dev.kruhlmann.imgfloat.model.Channel;
-import dev.kruhlmann.imgfloat.model.Settings;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Channel;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Settings;
 import dev.kruhlmann.imgfloat.repository.ChannelRepository;
 import java.time.Duration;
 import java.time.Instant;

src/main/java/dev/kruhlmann/imgfloat/service/MarketplaceScriptSeedLoader.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.service;
 
-import dev.kruhlmann.imgfloat.model.ScriptMarketplaceEntry;
+import dev.kruhlmann.imgfloat.model.api.response.ScriptMarketplaceEntry;
 import dev.kruhlmann.imgfloat.service.media.AssetContent;
 import java.io.IOException;
 import java.net.URI;

src/main/java/dev/kruhlmann/imgfloat/service/SettingsService.java

@@ -2,9 +2,9 @@ package dev.kruhlmann.imgfloat.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import dev.kruhlmann.imgfloat.model.AudioAsset;
-import dev.kruhlmann.imgfloat.model.Settings;
-import dev.kruhlmann.imgfloat.model.VisualAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.AudioAsset;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.Settings;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.VisualAsset;
 import dev.kruhlmann.imgfloat.repository.AudioAssetRepository;
 import dev.kruhlmann.imgfloat.repository.SettingsRepository;
 import dev.kruhlmann.imgfloat.repository.VisualAssetRepository;

src/main/java/dev/kruhlmann/imgfloat/service/SystemAdministratorService.java

@@ -1,6 +1,6 @@
 package dev.kruhlmann.imgfloat.service;
 
-import dev.kruhlmann.imgfloat.model.SystemAdministrator;
+import dev.kruhlmann.imgfloat.model.db.imgfloat.SystemAdministrator;
 import dev.kruhlmann.imgfloat.repository.SystemAdministratorRepository;
 import java.util.List;
 import java.util.Locale;

src/main/java/dev/kruhlmann/imgfloat/service/TwitchUserLookupService.java

@@ -2,7 +2,7 @@ package dev.kruhlmann.imgfloat.service;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import dev.kruhlmann.imgfloat.model.TwitchUserProfile;
+import dev.kruhlmann.imgfloat.model.api.response.TwitchUserProfile;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;