Merge branch 'ci_tag_change' into 'main'

Tweaking tag and release name

See merge request kdeng00/icarus-models!27

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 stages:
   - build
   - test
+  - version
   - deploy
 
 build:
@@ -40,6 +41,30 @@ test_variable:
     rules:
         - if: '$CI_COMMIT_TAG'
 
+extract_version:
+  stage: version
+  image: alpine:latest
+  script:
+    - apk add --no-cache jq
+    - VERSION=$(grep 'version = "' Cargo.toml | awk -F'"' '{print $2}' | head -n 1)
+    - if [ $? -ne 0 ]; then echo "Error extracting version"; exit 1; fi
+    - echo "Extracted version is"
+    - echo "$VERSION"
+    - echo "VERSION=$VERSION" > version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+
+tag_release:
+  stage: deploy
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+  dependencies:
+    - extract_version
+  script:
+    - release-cli create --name "Release $CI_COMMIT_BRANCH-v$VERSION" --tag-name "$CI_COMMIT_BRANCH-v$VERSION"
+
 deploy:
   stage: deploy
   image: rust:1.85
@@ -53,3 +78,4 @@ deploy:
     - build
   rules:
     - if: '$CI_COMMIT_TAG'
+

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "icarus-models"
+version = "0.1.7"
+edition = "2024"
 description = "models used for the icarus project"
 license = "MIT"
-version = "0.1.6"
-edition = "2024"
 
 [dependencies]
 serde = { version = "1.0.218", features = ["derive"] }

src/constants.rs

@@ -2,3 +2,4 @@ pub const DEFAULT_MUSIC_EXTENSION: &str = FLAC_EXTENSION;
 pub const FLAC_EXTENSION: &str = ".flac";
 pub const WAV_EXTENSION: &str = ".wav";
 pub const MPTHREE_EXTENSION: &str = ".mp3";
+pub const JPG_EXTENSION: &str = ".jpg";

src/token.rs

@@ -11,6 +11,22 @@ pub struct Token {
     pub issued: i32,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AccessToken {
+    #[serde(alias = "user_id")]
+    pub user_id: i32,
+    #[serde(alias = "username")]
+    pub username: String,
+    #[serde(alias = "token")]
+    pub token: String,
+    #[serde(alias = "token_type")]
+    pub token_type: String,
+    #[serde(alias = "expiration")]
+    pub expiration: i32,
+    #[serde(alias = "message")]
+    pub message: String,
+}
+
 impl Default for Token {
     fn default() -> Self {
         Token {
@@ -23,6 +39,14 @@ impl Default for Token {
     }
 }
 
+impl AccessToken {
+    pub fn bearer_token(&self) -> String {
+        let mut token: String = String::from("Bearer ");
+        token += &self.token.clone();
+        return token;
+    }
+}
+
 impl Token {
     pub fn _to_json(&self) -> Result<String, serde_json::Error> {
         return serde_json::to_string_pretty(&self);