-
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/uvf
# Conflicts: # frontend/package-lock.json # frontend/src/components/CreateVault.vue # frontend/src/components/VaultDetails.vue
- Loading branch information
Showing
56 changed files
with
4,152 additions
and
3,189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
backend/src/main/java/org/cryptomator/hub/entities/events/SettingWotUpdateEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package org.cryptomator.hub.entities.events; | ||
|
|
||
| import jakarta.persistence.Column; | ||
| import jakarta.persistence.DiscriminatorValue; | ||
| import jakarta.persistence.Entity; | ||
| import jakarta.persistence.Table; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.Objects; | ||
|
|
||
| @Entity | ||
| @Table(name = "audit_event_setting_wot_update") | ||
| @DiscriminatorValue(SettingWotUpdateEvent.TYPE) | ||
| public class SettingWotUpdateEvent extends AuditEvent { | ||
|
|
||
| public static final String TYPE = "SETTING_WOT_UPDATE"; | ||
|
|
||
| @Column(name = "updated_by") | ||
| private String updatedBy; | ||
|
|
||
| @Column(name = "wot_max_depth") | ||
| private int wotMaxDepth; | ||
|
|
||
| @Column(name = "wot_id_verify_len") | ||
| private int wotIdVerifyLen; | ||
|
|
||
| public String getUpdatedBy() { | ||
| return updatedBy; | ||
| } | ||
|
|
||
| public void setUpdatedBy(String updatedBy) { | ||
| this.updatedBy = updatedBy; | ||
| } | ||
|
|
||
| public int getWotMaxDepth() { | ||
| return wotMaxDepth; | ||
| } | ||
|
|
||
| public void setWotMaxDepth(int wotMaxDepth) { | ||
| this.wotMaxDepth = wotMaxDepth; | ||
| } | ||
|
|
||
| public int getWotIdVerifyLen() { | ||
| return wotIdVerifyLen; | ||
| } | ||
|
|
||
| public void setWotIdVerifyLen(int wotIdVerifyLen) { | ||
| this.wotIdVerifyLen = wotIdVerifyLen; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| if (!super.equals(o)) return false; | ||
| SettingWotUpdateEvent that = (SettingWotUpdateEvent) o; | ||
| return wotMaxDepth == that.wotMaxDepth && wotIdVerifyLen == that.wotIdVerifyLen && Objects.equals(updatedBy, that.updatedBy); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(super.hashCode(), updatedBy, wotMaxDepth, wotIdVerifyLen); | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
...end/src/main/resources/org/cryptomator/hub/flyway/V17__Create_Audit_Event_Setting_WoT.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| CREATE TABLE "audit_event_setting_wot_update" | ||
| ( | ||
| "id" BIGINT NOT NULL, | ||
| "updated_by" VARCHAR(255) COLLATE "C" NOT NULL, | ||
| "wot_max_depth" INTEGER NOT NULL, | ||
| "wot_id_verify_len" INTEGER NOT NULL, | ||
| CONSTRAINT "AUDIT_EVENT_SETTING_WOT_UPDATE_PK" PRIMARY KEY ("id"), | ||
| CONSTRAINT "AUDIT_EVENT_SETTING_WOT_UPDATE_FK_AUDIT_EVENT" FOREIGN KEY ("id") REFERENCES "audit_event" ("id") ON DELETE CASCADE | ||
| ); |
Oops, something went wrong.