Compare commits

..

No commits in common. "c62c5a20b3039e0416559f5312bd0b2eeadb5477" and "80ee003fc9663ebe7d571c6c1e6f0a99c1bb4d7d" have entirely different histories.

7 changed files with 6 additions and 23 deletions

View File

@ -3,10 +3,7 @@ package com.mediamanager.model;
import jakarta.persistence.*; import jakarta.persistence.*;
@Entity @Entity
@Table( @Table(name = "trackhasartist")
name = "trackhasartist",
uniqueConstraints = @UniqueConstraint(columnNames = {"fk_track_id", "fk_artist_id"})
)
public class TrackHasArtist { public class TrackHasArtist {
@Id @Id

View File

@ -3,10 +3,7 @@ package com.mediamanager.model;
import jakarta.persistence.*; import jakarta.persistence.*;
@Entity @Entity
@Table( @Table(name = "trackhascomposer")
name = "trackhascomposer",
uniqueConstraints = @UniqueConstraint(columnNames = {"fk_track_id", "fk_composer_id"})
)
public class TrackHasComposer { public class TrackHasComposer {
@Id @Id

View File

@ -3,8 +3,7 @@ package com.mediamanager.model;
import jakarta.persistence.*; import jakarta.persistence.*;
@Entity @Entity
@Table(name = "trackhasgenre", @Table(name = "trackhasgenre")
uniqueConstraints = @UniqueConstraint(columnNames = {"fk_track_id", "fk_genre_id"}))
public class TrackHasGenre { public class TrackHasGenre {
@Id @Id

View File

@ -59,4 +59,4 @@ public class DeleteTrackHasArtistHandler implements ActionHandler {
.setPayload(deleteResponse.toByteString()); .setPayload(deleteResponse.toByteString());
} }
} }
} }

View File

@ -59,4 +59,4 @@ public class DeleteTrackHasComposerHandler implements ActionHandler {
.setPayload(deleteResponse.toByteString()); .setPayload(deleteResponse.toByteString());
} }
} }
} }

View File

@ -59,4 +59,4 @@ public class DeleteTrackHasGenreHandler implements ActionHandler {
.setPayload(deleteResponse.toByteString()); .setPayload(deleteResponse.toByteString());
} }
} }
} }

View File

@ -32,10 +32,6 @@ public class GetTrackHasGenreByIdHandler implements ActionHandler {
TrackHasGenreMessages.GetTrackHasGenreByIdRequest.parseFrom(requestPayload); TrackHasGenreMessages.GetTrackHasGenreByIdRequest.parseFrom(requestPayload);
int id = getByIdRequest.getId(); int id = getByIdRequest.getId();
if (id <= 0) {
throw new IllegalArgumentException("ID must be greater than 0");
}
Optional<TrackHasGenre> trackHasGenreOpt = trackHasGenreService.getTrackHasGenreById(id); Optional<TrackHasGenre> trackHasGenreOpt = trackHasGenreService.getTrackHasGenreById(id);
if (trackHasGenreOpt.isEmpty()){ if (trackHasGenreOpt.isEmpty()){
@ -49,13 +45,7 @@ public class GetTrackHasGenreByIdHandler implements ActionHandler {
.setTrackhasgenre(trackHasGenreProto) .setTrackhasgenre(trackHasGenreProto)
.build(); .build();
return TransportProtocol.Response.newBuilder() return TransportProtocol.Response.newBuilder()
.setStatusCode(200)
.setPayload(getByIdResponse.toByteString()); .setPayload(getByIdResponse.toByteString());
} catch (IllegalArgumentException e) {
logger.error("Validation error", e);
return TransportProtocol.Response.newBuilder()
.setStatusCode(400)
.setPayload(ByteString.copyFromUtf8("Validation error: " + e.getMessage()));
} catch (Exception e) { } catch (Exception e) {
logger.error("Error getting track has genre by ID", e); logger.error("Error getting track has genre by ID", e);
return TransportProtocol.Response.newBuilder() return TransportProtocol.Response.newBuilder()